|
 |
08fe9e8 |
diff --git a/compat.c b/compat.c
|
|
|
08fe9e8 |
index 2709dc5..7412a54 100644
|
|
|
08fe9e8 |
--- a/compat.c
|
|
|
08fe9e8 |
+++ b/compat.c
|
|
|
08fe9e8 |
@@ -167,6 +167,7 @@ compat_datafellows(const char *version)
|
|
|
08fe9e8 |
SSH_BUG_SCANNER },
|
|
|
08fe9e8 |
{ "Probe-*",
|
|
|
08fe9e8 |
SSH_BUG_PROBE },
|
|
|
08fe9e8 |
+ { "Cisco-*", SSH_BUG_MAX4096DH },
|
|
|
08fe9e8 |
{ NULL, 0 }
|
|
|
08fe9e8 |
};
|
|
|
08fe9e8 |
|
|
|
08fe9e8 |
diff --git a/compat.h b/compat.h
|
|
|
08fe9e8 |
index a6c3f3d..d8def7d 100644
|
|
|
08fe9e8 |
--- a/compat.h
|
|
|
08fe9e8 |
+++ b/compat.h
|
|
|
08fe9e8 |
@@ -60,6 +60,7 @@
|
|
|
08fe9e8 |
#define SSH_NEW_OPENSSH 0x04000000
|
|
|
08fe9e8 |
#define SSH_BUG_DYNAMIC_RPORT 0x08000000
|
|
|
08fe9e8 |
#define SSH_BUG_CURVE25519PAD 0x10000000
|
|
|
08fe9e8 |
+#define SSH_BUG_MAX4096DH 0x20000000
|
|
|
08fe9e8 |
|
|
|
08fe9e8 |
void enable_compat13(void);
|
|
|
08fe9e8 |
void enable_compat20(void);
|
|
|
08fe9e8 |
diff --git a/kexgexc.c b/kexgexc.c
|
|
|
08fe9e8 |
index 355b7ba..0a91bdd 100644
|
|
|
08fe9e8 |
--- a/kexgexc.c
|
|
|
08fe9e8 |
+++ b/kexgexc.c
|
|
|
08fe9e8 |
@@ -58,20 +58,37 @@ kexgex_client(Kex *kex)
|
|
|
08fe9e8 |
int min, max, nbits;
|
|
|
08fe9e8 |
DH *dh;
|
|
|
08fe9e8 |
|
|
|
08fe9e8 |
+ min = DH_GRP_MIN;
|
|
|
08fe9e8 |
+ max = DH_GRP_MAX;
|
|
|
08fe9e8 |
+
|
|
|
08fe9e8 |
+ /* Servers with MAX4096DH need a preferred size (nbits) <= 4096.
|
|
|
08fe9e8 |
+ * We need to also ensure that min < nbits < max */
|
|
|
08fe9e8 |
+
|
|
|
08fe9e8 |
+ if (datafellows & SSH_BUG_MAX4096DH) {
|
|
|
08fe9e8 |
+ /* The largest min for these servers is 4096 */
|
|
|
08fe9e8 |
+ min = MIN(min, 4096);
|
|
|
08fe9e8 |
+ }
|
|
|
08fe9e8 |
+
|
|
|
08fe9e8 |
nbits = dh_estimate(kex->dh_need * 8);
|
|
|
08fe9e8 |
+ nbits = MIN(nbits, max);
|
|
|
08fe9e8 |
+ nbits = MAX(nbits, min);
|
|
|
08fe9e8 |
+
|
|
|
08fe9e8 |
+ if (datafellows & SSH_BUG_MAX4096DH) {
|
|
|
08fe9e8 |
+ /* Cannot have a nbits > 4096 for these servers */
|
|
|
08fe9e8 |
+ nbits = MIN(nbits, 4096);
|
|
|
08fe9e8 |
+ /* nbits has to be powers of two */
|
|
|
08fe9e8 |
+ if (nbits == 3072)
|
|
|
08fe9e8 |
+ nbits = 4096;
|
|
|
08fe9e8 |
+ }
|
|
|
08fe9e8 |
|
|
|
08fe9e8 |
if (datafellows & SSH_OLD_DHGEX) {
|
|
|
08fe9e8 |
/* Old GEX request */
|
|
|
08fe9e8 |
packet_start(SSH2_MSG_KEX_DH_GEX_REQUEST_OLD);
|
|
|
08fe9e8 |
packet_put_int(nbits);
|
|
|
08fe9e8 |
- min = DH_GRP_MIN;
|
|
|
08fe9e8 |
- max = DH_GRP_MAX;
|
|
|
08fe9e8 |
|
|
|
08fe9e8 |
debug("SSH2_MSG_KEX_DH_GEX_REQUEST_OLD(%u) sent", nbits);
|
|
|
08fe9e8 |
} else {
|
|
|
08fe9e8 |
/* New GEX request */
|
|
|
08fe9e8 |
- min = DH_GRP_MIN;
|
|
|
08fe9e8 |
- max = DH_GRP_MAX;
|
|
|
08fe9e8 |
packet_start(SSH2_MSG_KEX_DH_GEX_REQUEST);
|
|
|
08fe9e8 |
packet_put_int(min);
|
|
|
08fe9e8 |
packet_put_int(nbits);
|