summaryrefslogtreecommitdiff
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 22888d587..e566bb4e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,10 @@
34 [channels.c serverloop.c] 34 [channels.c serverloop.c]
35 don't send fake dummy packets on CR (\r) 35 don't send fake dummy packets on CR (\r)
36 bugreport from yyua@cs.sfu.ca via solar@@openwall.com 36 bugreport from yyua@cs.sfu.ca via solar@@openwall.com
37 - markus@cvs.openbsd.org 2001/09/17 21:09:47
38 [compat.c]
39 more versions suffering the SSH_BUG_DEBUG bug;
40 3.0.x reported by dbutts@maddog.storability.com
37 41
3820010917 4220010917
39 - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds 43 - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds
@@ -6494,4 +6498,4 @@
6494 - Wrote replacements for strlcpy and mkdtemp 6498 - Wrote replacements for strlcpy and mkdtemp
6495 - Released 1.0pre1 6499 - Released 1.0pre1
6496 6500
6497$Id: ChangeLog,v 1.1538 2001/09/18 05:53:12 mouring Exp $ 6501$Id: ChangeLog,v 1.1539 2001/09/18 05:55:10 mouring Exp $
diff --git a/compat.c b/compat.c
index 77bba28a2..61a79914c 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.51 2001/06/25 08:25:37 markus Exp $"); 26RCSID("$OpenBSD: compat.c,v 1.52 2001/09/17 21:09:47 markus Exp $");
27 27
28#ifdef HAVE_LIBPCRE 28#ifdef HAVE_LIBPCRE
29# include <pcreposix.h> 29# include <pcreposix.h>
@@ -105,9 +105,11 @@ compat_datafellows(const char *version)
105 SSH_BUG_PKAUTH|SSH_BUG_PKOK| 105 SSH_BUG_PKAUTH|SSH_BUG_PKOK|
106 SSH_BUG_RSASIGMD5|SSH_BUG_OPENFAILURE| 106 SSH_BUG_RSASIGMD5|SSH_BUG_OPENFAILURE|
107 SSH_BUG_DERIVEKEY }, 107 SSH_BUG_DERIVEKEY },
108 { "^2\\.[23]\\.0", SSH_BUG_HMAC|SSH_BUG_RSASIGMD5 }, 108 { "^2\\.[23]\\.0", SSH_BUG_HMAC|SSH_BUG_DEBUG|
109 { "^2\\.3\\.", SSH_BUG_RSASIGMD5 }, 109 SSH_BUG_RSASIGMD5 },
110 { "^2\\.[2-9]\\.", 0 }, 110 { "^2\\.3\\.", SSH_BUG_DEBUG|SSH_BUG_RSASIGMD5 },
111 { "^2\\.[2-9]\\.", SSH_BUG_DEBUG },
112 { "^3\\.0\\.", SSH_BUG_DEBUG },
111 { "^2\\.4$", SSH_OLD_SESSIONID }, /* Van Dyke */ 113 { "^2\\.4$", SSH_OLD_SESSIONID }, /* Van Dyke */
112 { "^3\\.0 SecureCRT", SSH_OLD_SESSIONID }, 114 { "^3\\.0 SecureCRT", SSH_OLD_SESSIONID },
113 { "^1\\.7 SecureFX", SSH_OLD_SESSIONID }, 115 { "^1\\.7 SecureFX", SSH_OLD_SESSIONID },