diff options
Diffstat (limited to 'kex.h')
-rw-r--r-- | kex.h | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.33 2003/02/16 17:09:57 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 | }; |
@@ -137,6 +139,9 @@ u_char * | |||
137 | kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int, | 139 | kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int, |
138 | int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *); | 140 | int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *); |
139 | 141 | ||
142 | void | ||
143 | derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]); | ||
144 | |||
140 | #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) | 145 | #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) |
141 | void dump_digest(char *, u_char *, int); | 146 | void dump_digest(char *, u_char *, int); |
142 | #endif | 147 | #endif |