summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-09-18 05:55:10 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-09-18 05:55:10 +0000
commit3b4d42c24006f7123f68168ef1287ad8b5d395a3 (patch)
tree42a71d78d82deadd0a3166cfd15a11792ff58ee8
parent6d218f404f9f6e5167626851ffb73a82f7881461 (diff)
- markus@cvs.openbsd.org 2001/09/17 21:09:47
[compat.c] more versions suffering the SSH_BUG_DEBUG bug; 3.0.x reported by dbutts@maddog.storability.com
-rw-r--r--ChangeLog6
-rw-r--r--compat.c10
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 22888d58..e566bb4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,10 @@
[channels.c serverloop.c]
don't send fake dummy packets on CR (\r)
bugreport from yyua@cs.sfu.ca via solar@@openwall.com
+ - markus@cvs.openbsd.org 2001/09/17 21:09:47
+ [compat.c]
+ more versions suffering the SSH_BUG_DEBUG bug;
+ 3.0.x reported by dbutts@maddog.storability.com
20010917
- (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds
@@ -6494,4 +6498,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1538 2001/09/18 05:53:12 mouring Exp $
+$Id: ChangeLog,v 1.1539 2001/09/18 05:55:10 mouring Exp $
diff --git a/compat.c b/compat.c
index 77bba28a..61a79914 100644
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.51 2001/06/25 08:25:37 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.52 2001/09/17 21:09:47 markus Exp $");
#ifdef HAVE_LIBPCRE
# include <pcreposix.h>
@@ -105,9 +105,11 @@ compat_datafellows(const char *version)
SSH_BUG_PKAUTH|SSH_BUG_PKOK|
SSH_BUG_RSASIGMD5|SSH_BUG_OPENFAILURE|
SSH_BUG_DERIVEKEY },
- { "^2\\.[23]\\.0", SSH_BUG_HMAC|SSH_BUG_RSASIGMD5 },
- { "^2\\.3\\.", SSH_BUG_RSASIGMD5 },
- { "^2\\.[2-9]\\.", 0 },
+ { "^2\\.[23]\\.0", SSH_BUG_HMAC|SSH_BUG_DEBUG|
+ SSH_BUG_RSASIGMD5 },
+ { "^2\\.3\\.", SSH_BUG_DEBUG|SSH_BUG_RSASIGMD5 },
+ { "^2\\.[2-9]\\.", SSH_BUG_DEBUG },
+ { "^3\\.0\\.", SSH_BUG_DEBUG },
{ "^2\\.4$", SSH_OLD_SESSIONID }, /* Van Dyke */
{ "^3\\.0 SecureCRT", SSH_OLD_SESSIONID },
{ "^1\\.7 SecureFX", SSH_OLD_SESSIONID },