summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-05 06:08:19 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-05 06:08:19 +0000
commit5de86cc73681bbbf6cb15e04c8c38ad1a03243d0 (patch)
treef102074fb5162ef7e83eb3e5f11564662be17188
parent6a5cde0eb77b3e08a2d3dc25be37a4053d5105d9 (diff)
- markus@cvs.openbsd.org 2001/02/27 11:00:11
[compat.c] support SSH-2.0-2.1 ; from Christophe_Moret@hp.com
-rw-r--r--ChangeLog5
-rw-r--r--compat.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b05e4768..3850ba31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,9 @@
- markus@cvs.openbsd.org 2001/02/27 10:35:27
[packet.c]
fix random padding
+ - markus@cvs.openbsd.org 2001/02/27 11:00:11
+ [compat.c]
+ support SSH-2.0-2.1 ; from Christophe_Moret@hp.com
20010304
- (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4247,4 +4250,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.867 2001/03/05 06:07:00 mouring Exp $
+$Id: ChangeLog,v 1.868 2001/03/05 06:08:19 mouring Exp $
diff --git a/compat.c b/compat.c
index 82f3df8c..da1f623b 100644
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.35 2001/02/19 09:53:31 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.36 2001/02/27 11:00:11 markus Exp $");
#ifdef HAVE_LIBPCRE
# include <pcreposix.h>
@@ -74,6 +74,8 @@ compat_datafellows(const char *version)
{ "MindTerm", 0 },
{ "^2\\.1\\.0", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
SSH_OLD_SESSIONID|SSH_BUG_DEBUG },
+ { "^2\\.1 ", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
+ SSH_OLD_SESSIONID|SSH_BUG_DEBUG },
{ "^2\\.0\\.1[3-9]", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
SSH_BUG_PKSERVICE|SSH_BUG_X11FWD },