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.h | |
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.h')
-rw-r--r-- | kex.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.34 2004/05/21 08:43:03 markus Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.35 2004/06/13 12:53:24 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -32,6 +32,7 @@ | |||
32 | #include "key.h" | 32 | #include "key.h" |
33 | 33 | ||
34 | #define KEX_DH1 "diffie-hellman-group1-sha1" | 34 | #define KEX_DH1 "diffie-hellman-group1-sha1" |
35 | #define KEX_DH14 "diffie-hellman-group14-sha1" | ||
35 | #define KEX_DHGEX "diffie-hellman-group-exchange-sha1" | 36 | #define KEX_DHGEX "diffie-hellman-group-exchange-sha1" |
36 | 37 | ||
37 | enum kex_init_proposals { | 38 | enum kex_init_proposals { |
@@ -56,6 +57,7 @@ enum kex_modes { | |||
56 | 57 | ||
57 | enum kex_exchange { | 58 | enum kex_exchange { |
58 | KEX_DH_GRP1_SHA1, | 59 | KEX_DH_GRP1_SHA1, |
60 | KEX_DH_GRP14_SHA1, | ||
59 | KEX_DH_GEX_SHA1, | 61 | KEX_DH_GEX_SHA1, |
60 | KEX_MAX | 62 | KEX_MAX |
61 | }; | 63 | }; |