summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--compat.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b05e47689..3850ba316 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,9 @@
55 - markus@cvs.openbsd.org 2001/02/27 10:35:27 55 - markus@cvs.openbsd.org 2001/02/27 10:35:27
56 [packet.c] 56 [packet.c]
57 fix random padding 57 fix random padding
58 - markus@cvs.openbsd.org 2001/02/27 11:00:11
59 [compat.c]
60 support SSH-2.0-2.1 ; from Christophe_Moret@hp.com
58 61
5920010304 6220010304
60 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. 63 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4247,4 +4250,4 @@
4247 - Wrote replacements for strlcpy and mkdtemp 4250 - Wrote replacements for strlcpy and mkdtemp
4248 - Released 1.0pre1 4251 - Released 1.0pre1
4249 4252
4250$Id: ChangeLog,v 1.867 2001/03/05 06:07:00 mouring Exp $ 4253$Id: ChangeLog,v 1.868 2001/03/05 06:08:19 mouring Exp $
diff --git a/compat.c b/compat.c
index 82f3df8c5..da1f623bc 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.35 2001/02/19 09:53:31 markus Exp $"); 26RCSID("$OpenBSD: compat.c,v 1.36 2001/02/27 11:00:11 markus Exp $");
27 27
28#ifdef HAVE_LIBPCRE 28#ifdef HAVE_LIBPCRE
29# include <pcreposix.h> 29# include <pcreposix.h>
@@ -74,6 +74,8 @@ compat_datafellows(const char *version)
74 { "MindTerm", 0 }, 74 { "MindTerm", 0 },
75 { "^2\\.1\\.0", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| 75 { "^2\\.1\\.0", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
76 SSH_OLD_SESSIONID|SSH_BUG_DEBUG }, 76 SSH_OLD_SESSIONID|SSH_BUG_DEBUG },
77 { "^2\\.1 ", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
78 SSH_OLD_SESSIONID|SSH_BUG_DEBUG },
77 { "^2\\.0\\.1[3-9]", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| 79 { "^2\\.0\\.1[3-9]", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
78 SSH_OLD_SESSIONID|SSH_BUG_DEBUG| 80 SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
79 SSH_BUG_PKSERVICE|SSH_BUG_X11FWD }, 81 SSH_BUG_PKSERVICE|SSH_BUG_X11FWD },