summaryrefslogtreecommitdiff
path: root/compat.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2005-05-25 11:01:01 +0000
committerColin Watson <cjwatson@debian.org>2005-05-25 11:01:01 +0000
commite88de75a1a236779a10e8ccbcc51d25308be8840 (patch)
tree7495477a2a7d0cac17a9fcded020b6ea816182ef /compat.c
parent30a0f9443782cd9d7308acd09430bf586186aa55 (diff)
parent5d05471f6657646d1d6500c7c43134462c407ee6 (diff)
Merge 4.0p1 to the trunk.
Diffstat (limited to 'compat.c')
-rw-r--r--compat.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/compat.c b/compat.c
index 2fdebe7fa..4086e853e 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.70 2003/11/02 11:01:03 markus Exp $"); 26RCSID("$OpenBSD: compat.c,v 1.71 2005/03/01 10:09:52 djm Exp $");
27 27
28#include "buffer.h" 28#include "buffer.h"
29#include "packet.h" 29#include "packet.h"
@@ -62,24 +62,28 @@ compat_datafellows(const char *version)
62 "OpenSSH_2.1*," 62 "OpenSSH_2.1*,"
63 "OpenSSH_2.2*", SSH_OLD_SESSIONID|SSH_BUG_BANNER| 63 "OpenSSH_2.2*", SSH_OLD_SESSIONID|SSH_BUG_BANNER|
64 SSH_OLD_DHGEX|SSH_BUG_NOREKEY| 64 SSH_OLD_DHGEX|SSH_BUG_NOREKEY|
65 SSH_BUG_EXTEOF}, 65 SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR},
66 { "OpenSSH_2.3.0*", SSH_BUG_BANNER|SSH_BUG_BIGENDIANAES| 66 { "OpenSSH_2.3.0*", SSH_BUG_BANNER|SSH_BUG_BIGENDIANAES|
67 SSH_OLD_DHGEX|SSH_BUG_NOREKEY| 67 SSH_OLD_DHGEX|SSH_BUG_NOREKEY|
68 SSH_BUG_EXTEOF}, 68 SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR},
69 { "OpenSSH_2.3.*", SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX| 69 { "OpenSSH_2.3.*", SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX|
70 SSH_BUG_NOREKEY|SSH_BUG_EXTEOF}, 70 SSH_BUG_NOREKEY|SSH_BUG_EXTEOF|
71 SSH_OLD_FORWARD_ADDR},
71 { "OpenSSH_2.5.0p1*," 72 { "OpenSSH_2.5.0p1*,"
72 "OpenSSH_2.5.1p1*", 73 "OpenSSH_2.5.1p1*",
73 SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX| 74 SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX|
74 SSH_BUG_NOREKEY|SSH_BUG_EXTEOF}, 75 SSH_BUG_NOREKEY|SSH_BUG_EXTEOF|
76 SSH_OLD_FORWARD_ADDR},
75 { "OpenSSH_2.5.0*," 77 { "OpenSSH_2.5.0*,"
76 "OpenSSH_2.5.1*," 78 "OpenSSH_2.5.1*,"
77 "OpenSSH_2.5.2*", SSH_OLD_DHGEX|SSH_BUG_NOREKEY| 79 "OpenSSH_2.5.2*", SSH_OLD_DHGEX|SSH_BUG_NOREKEY|
78 SSH_BUG_EXTEOF}, 80 SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR},
79 { "OpenSSH_2.5.3*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF}, 81 { "OpenSSH_2.5.3*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF|
82 SSH_OLD_FORWARD_ADDR},
80 { "OpenSSH_2.*," 83 { "OpenSSH_2.*,"
81 "OpenSSH_3.0*," 84 "OpenSSH_3.0*,"
82 "OpenSSH_3.1*", SSH_BUG_EXTEOF}, 85 "OpenSSH_3.1*", SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR},
86 { "OpenSSH_3.*", SSH_OLD_FORWARD_ADDR },
83 { "Sun_SSH_1.0*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF}, 87 { "Sun_SSH_1.0*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
84 { "OpenSSH*", 0 }, 88 { "OpenSSH*", 0 },
85 { "*MindTerm*", 0 }, 89 { "*MindTerm*", 0 },