diff options
author | Damien Miller <djm@mindrot.org> | 2004-06-15 10:30:09 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2004-06-15 10:30:09 +1000 |
commit | f675fc4948b2ec2c9ff86bcdd58e00947f0e319b (patch) | |
tree | babb42f0a29e7b24284a731cb894454d8f80fc97 /monitor.c | |
parent | 7cf17eb78c71ba16ec39bb1a6a8640885071a307 (diff) |
- djm@cvs.openbsd.org 2004/06/13 12:53:24
[dh.c dh.h kex.c kex.h kexdhc.c kexdhs.c monitor.c myproposal.h]
[ssh-keyscan.c sshconnect2.c sshd.c]
implement diffie-hellman-group14-sha1 kex method (trivial extension to
existing diffie-hellman-group1-sha1); ok markus@
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor.c,v 1.57 2004/05/11 19:01:43 deraadt Exp $"); | 28 | RCSID("$OpenBSD: monitor.c,v 1.58 2004/06/13 12:53:24 djm Exp $"); |
29 | 29 | ||
30 | #include <openssl/dh.h> | 30 | #include <openssl/dh.h> |
31 | 31 | ||
@@ -1546,6 +1546,7 @@ mm_get_kex(Buffer *m) | |||
1546 | fatal("mm_get_get: internal error: bad session id"); | 1546 | fatal("mm_get_get: internal error: bad session id"); |
1547 | kex->we_need = buffer_get_int(m); | 1547 | kex->we_need = buffer_get_int(m); |
1548 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; | 1548 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; |
1549 | kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; | ||
1549 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; | 1550 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; |
1550 | kex->server = 1; | 1551 | kex->server = 1; |
1551 | kex->hostkey_type = buffer_get_int(m); | 1552 | kex->hostkey_type = buffer_get_int(m); |