summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-03-07 12:59:02 +1100
committerDamien Miller <djm@mindrot.org>2002-03-07 12:59:02 +1100
commit4e431d4b8eb6f013c73e9c06c8d9b111507692c4 (patch)
tree637ce3504df30b230c12e8f8b65cc01eafaf1a46
parent6d6c5d202f28608c4962c9c50b394b2a37fc1343 (diff)
- markus@cvs.openbsd.org 2002/03/06 00:24:39
[compat.c] compat.c
-rw-r--r--ChangeLog5
-rw-r--r--compat.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b65e663a..1b203ac8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
- markus@cvs.openbsd.org 2002/03/06 00:23:27
[compat.c dh.c]
undo
+ - markus@cvs.openbsd.org 2002/03/06 00:24:39
+ [compat.c]
+ compat.c
20020305
- stevesk@cvs.openbsd.org 2002/03/02 09:34:42
@@ -7807,4 +7810,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1910 2002/03/07 01:58:42 djm Exp $
+$Id: ChangeLog,v 1.1911 2002/03/07 01:59:02 djm Exp $
diff --git a/compat.c b/compat.c
index 90654707..74d5ed85 100644
--- a/compat.c
+++ b/compat.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved.
+ * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.60 2002/03/06 00:23:27 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.61 2002/03/06 00:24:39 markus Exp $");
#include "buffer.h"
#include "packet.h"
@@ -73,8 +73,8 @@ compat_datafellows(const char *version)
{ "OpenSSH_2.5.0*,"
"OpenSSH_2.5.1*,"
"OpenSSH_2.5.2*", SSH_OLD_DHGEX|SSH_BUG_NOREKEY },
- { "OpenSSH_2.5.3*",
- SSH_BUG_NOREKEY },
+ { "OpenSSH_2.5.3*", SSH_BUG_NOREKEY },
+ { "Sun_SSH_1.0*", SSH_BUG_NOREKEY },
{ "OpenSSH*", 0 },
{ "*MindTerm*", 0 },
{ "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|