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 /kex.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 'kex.c')
-rw-r--r-- | kex.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kex.c,v 1.58 2004/05/09 01:26:48 djm Exp $"); | 26 | RCSID("$OpenBSD: kex.c,v 1.59 2004/06/13 12:53:24 djm Exp $"); |
27 | 27 | ||
28 | #include <openssl/crypto.h> | 28 | #include <openssl/crypto.h> |
29 | 29 | ||
@@ -293,6 +293,8 @@ choose_kex(Kex *k, char *client, char *server) | |||
293 | fatal("no kex alg"); | 293 | fatal("no kex alg"); |
294 | if (strcmp(k->name, KEX_DH1) == 0) { | 294 | if (strcmp(k->name, KEX_DH1) == 0) { |
295 | k->kex_type = KEX_DH_GRP1_SHA1; | 295 | k->kex_type = KEX_DH_GRP1_SHA1; |
296 | } else if (strcmp(k->name, KEX_DH14) == 0) { | ||
297 | k->kex_type = KEX_DH_GRP14_SHA1; | ||
296 | } else if (strcmp(k->name, KEX_DHGEX) == 0) { | 298 | } else if (strcmp(k->name, KEX_DHGEX) == 0) { |
297 | k->kex_type = KEX_DH_GEX_SHA1; | 299 | k->kex_type = KEX_DH_GEX_SHA1; |
298 | } else | 300 | } else |