diff options
Diffstat (limited to 'kex.h')
-rw-r--r-- | kex.h | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.38 2005/11/04 05:15:59 djm Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.44 2006/08/03 03:34:42 deraadt 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. |
@@ -26,14 +26,13 @@ | |||
26 | #ifndef KEX_H | 26 | #ifndef KEX_H |
27 | #define KEX_H | 27 | #define KEX_H |
28 | 28 | ||
29 | #include <signal.h> | ||
29 | #include <openssl/evp.h> | 30 | #include <openssl/evp.h> |
30 | #include "buffer.h" | ||
31 | #include "cipher.h" | ||
32 | #include "key.h" | ||
33 | 31 | ||
34 | #define KEX_DH1 "diffie-hellman-group1-sha1" | 32 | #define KEX_DH1 "diffie-hellman-group1-sha1" |
35 | #define KEX_DH14 "diffie-hellman-group14-sha1" | 33 | #define KEX_DH14 "diffie-hellman-group14-sha1" |
36 | #define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1" | 34 | #define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1" |
35 | #define KEX_DHGEX_SHA256 "diffie-hellman-group-exchange-sha256" | ||
37 | 36 | ||
38 | #define COMP_NONE 0 | 37 | #define COMP_NONE 0 |
39 | #define COMP_ZLIB 1 | 38 | #define COMP_ZLIB 1 |
@@ -63,7 +62,9 @@ enum kex_exchange { | |||
63 | KEX_DH_GRP1_SHA1, | 62 | KEX_DH_GRP1_SHA1, |
64 | KEX_DH_GRP14_SHA1, | 63 | KEX_DH_GRP14_SHA1, |
65 | KEX_DH_GEX_SHA1, | 64 | KEX_DH_GEX_SHA1, |
65 | KEX_DH_GEX_SHA256, | ||
66 | KEX_GSS_GRP1_SHA1, | 66 | KEX_GSS_GRP1_SHA1, |
67 | KEX_GSS_GRP14_SHA1, | ||
67 | KEX_GSS_GEX_SHA1, | 68 | KEX_GSS_GEX_SHA1, |
68 | KEX_MAX | 69 | KEX_MAX |
69 | }; | 70 | }; |
@@ -114,7 +115,7 @@ struct Kex { | |||
114 | int kex_type; | 115 | int kex_type; |
115 | Buffer my; | 116 | Buffer my; |
116 | Buffer peer; | 117 | Buffer peer; |
117 | int done; | 118 | sig_atomic_t done; |
118 | int flags; | 119 | int flags; |
119 | const EVP_MD *evp_md; | 120 | const EVP_MD *evp_md; |
120 | #ifdef GSSAPI | 121 | #ifdef GSSAPI |
@@ -154,7 +155,7 @@ kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, | |||
154 | BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); | 155 | BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); |
155 | void | 156 | void |
156 | kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *, | 157 | kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *, |
157 | int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, | 158 | int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, |
158 | BIGNUM *, BIGNUM *, u_char **, u_int *); | 159 | BIGNUM *, BIGNUM *, u_char **, u_int *); |
159 | 160 | ||
160 | void | 161 | void |