diff options
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index da8c8229c..7a8c77b67 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.57 2001/03/27 17:46:49 provos Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.58 2001/03/28 21:59:40 provos Exp $"); |
27 | 27 | ||
28 | #include <openssl/bn.h> | 28 | #include <openssl/bn.h> |
29 | #include <openssl/md5.h> | 29 | #include <openssl/md5.h> |
@@ -440,6 +440,12 @@ ssh_dhgex_client(Kex *kex, char *host, struct sockaddr *hostaddr, | |||
440 | memset(kbuf, 0, klen); | 440 | memset(kbuf, 0, klen); |
441 | xfree(kbuf); | 441 | xfree(kbuf); |
442 | 442 | ||
443 | if (datafellows & SSH_OLD_DHGEX) { | ||
444 | /* These values are not included in the hash */ | ||
445 | min = -1; | ||
446 | max = -1; | ||
447 | } | ||
448 | |||
443 | /* calc and verify H */ | 449 | /* calc and verify H */ |
444 | hash = kex_hash_gex( | 450 | hash = kex_hash_gex( |
445 | client_version_string, | 451 | client_version_string, |
@@ -447,7 +453,8 @@ ssh_dhgex_client(Kex *kex, char *host, struct sockaddr *hostaddr, | |||
447 | buffer_ptr(client_kexinit), buffer_len(client_kexinit), | 453 | buffer_ptr(client_kexinit), buffer_len(client_kexinit), |
448 | buffer_ptr(server_kexinit), buffer_len(server_kexinit), | 454 | buffer_ptr(server_kexinit), buffer_len(server_kexinit), |
449 | server_host_key_blob, sbloblen, | 455 | server_host_key_blob, sbloblen, |
450 | nbits, dh->p, dh->g, | 456 | min, nbits, max, |
457 | dh->p, dh->g, | ||
451 | dh->pub_key, | 458 | dh->pub_key, |
452 | dh_server_pub, | 459 | dh_server_pub, |
453 | shared_secret | 460 | shared_secret |