summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--compat.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0cc84157d..7bb8eaa5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 [clientloop.c kex.c kex.h serverloop.c sshconnect2.c sshd.c] 9 [clientloop.c kex.c kex.h serverloop.c sshconnect2.c sshd.c]
10 enable server side rekeying + some rekey related clientup. 10 enable server side rekeying + some rekey related clientup.
11 todo: we should not send any non-KEX messages after we send KEXINIT 11 todo: we should not send any non-KEX messages after we send KEXINIT
12 - markus@cvs.openbsd.org 2001/04/04 15:50:55
13 [compat.c]
14 f-secure 1.3.2 does not handle IGNORE; from milliondl@ornl.gov
12 15
1320010404 1620010404
14 - OpenBSD CVS Sync 17 - OpenBSD CVS Sync
@@ -4848,4 +4851,4 @@
4848 - Wrote replacements for strlcpy and mkdtemp 4851 - Wrote replacements for strlcpy and mkdtemp
4849 - Released 1.0pre1 4852 - Released 1.0pre1
4850 4853
4851$Id: ChangeLog,v 1.1056 2001/04/04 17:57:54 mouring Exp $ 4854$Id: ChangeLog,v 1.1057 2001/04/04 23:43:26 mouring Exp $
diff --git a/compat.c b/compat.c
index 686016f82..4dfab90ce 100644
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: compat.c,v 1.42 2001/03/27 17:46:49 provos Exp $"); 26RCSID("$OpenBSD: compat.c,v 1.43 2001/04/04 15:50:55 markus Exp $");
27 27
28#ifdef HAVE_LIBPCRE 28#ifdef HAVE_LIBPCRE
29# include <pcreposix.h> 29# include <pcreposix.h>
@@ -101,6 +101,7 @@ compat_datafellows(const char *version)
101 { "^1\\.7 SecureFX", SSH_OLD_SESSIONID }, 101 { "^1\\.7 SecureFX", SSH_OLD_SESSIONID },
102 { "^1\\.2\\.1[89]", SSH_BUG_IGNOREMSG }, 102 { "^1\\.2\\.1[89]", SSH_BUG_IGNOREMSG },
103 { "^1\\.2\\.2[012]", SSH_BUG_IGNOREMSG }, 103 { "^1\\.2\\.2[012]", SSH_BUG_IGNOREMSG },
104 { "^1\\.3\\.2", SSH_BUG_IGNOREMSG }, /* f-secure */
104 { "^SSH Compatible Server", /* Netscreen */ 105 { "^SSH Compatible Server", /* Netscreen */
105 SSH_BUG_PASSWORDPAD }, 106 SSH_BUG_PASSWORDPAD },
106 { "^OSU_0", SSH_BUG_PASSWORDPAD }, 107 { "^OSU_0", SSH_BUG_PASSWORDPAD },