summaryrefslogtreecommitdiff
path: root/compat.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-05-17 13:04:02 +0100
committerColin Watson <cjwatson@debian.org>2012-05-17 13:04:02 +0100
commitdd5ed53e20d218607260916a6b04d1c8c5b3d88f (patch)
treec59b4dbcc610f10700945f885adf3bddc2542c26 /compat.c
parent8241a65bf12ac53c1b7304bba7ce739aad80b8b8 (diff)
parentb9bc38990c5eb5d99e28ca5af6d3491fd4a0060a (diff)
merge 6.0p1
Diffstat (limited to 'compat.c')
-rw-r--r--compat.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/compat.c b/compat.c
index df3541df7..0dc089fd6 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: compat.c,v 1.78 2008/09/11 14:22:37 markus Exp $ */ 1/* $OpenBSD: compat.c,v 1.79 2011/09/23 07:45:05 markus Exp $ */
2/* 2/*
3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -92,6 +92,7 @@ compat_datafellows(const char *version)
92 { "OpenSSH_3.*", SSH_OLD_FORWARD_ADDR }, 92 { "OpenSSH_3.*", SSH_OLD_FORWARD_ADDR },
93 { "Sun_SSH_1.0*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF}, 93 { "Sun_SSH_1.0*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
94 { "OpenSSH_4*", 0 }, 94 { "OpenSSH_4*", 0 },
95 { "OpenSSH_5*", SSH_NEW_OPENSSH|SSH_BUG_DYNAMIC_RPORT},
95 { "OpenSSH*", SSH_NEW_OPENSSH }, 96 { "OpenSSH*", SSH_NEW_OPENSSH },
96 { "*MindTerm*", 0 }, 97 { "*MindTerm*", 0 },
97 { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| 98 { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|