summaryrefslogtreecommitdiff
path: root/compat.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2015-05-26 23:23:40 +0000
committerDamien Miller <djm@mindrot.org>2015-05-27 13:47:19 +1000
commitb282fec1aa05246ed3482270eb70fc3ec5f39a00 (patch)
tree16ad568c149a219d84be1a954e52f093ebb762aa /compat.c
parent3e91b4e8b0dc2b4b7e7d42cf6e8994a32e4cb55e (diff)
downloadopenssh-git-b282fec1aa05246ed3482270eb70fc3ec5f39a00.tar.gz
upstream commit
Cap DH-GEX group size at 4kbits for Cisco implementations. Some of them will choke when asked for preferred sizes >4k instead of returning the 4k group that they do have. bz#2209, ok djm@ Upstream-ID: 54b863a19713446b7431f9d06ad0532b4fcfef8d
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 337bbe01..0631024f 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.93 2015/05/06 04:07:18 dtucker Exp $ */
+/* $OpenBSD: compat.c,v 1.94 2015/05/26 23:23:40 dtucker Exp $ */
/*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
*
@@ -152,6 +152,7 @@ compat_datafellows(const char *version)
"1.2.22*", SSH_BUG_IGNOREMSG },
{ "1.3.2*", /* F-Secure */
SSH_BUG_IGNOREMSG },
+ { "Cisco-1.*", SSH_BUG_DHGEX_LARGE },
{ "*SSH Compatible Server*", /* Netscreen */
SSH_BUG_PASSWORDPAD },
{ "*OSU_0*,"