diff options
Diffstat (limited to 'kex.h')
-rw-r--r-- | kex.h | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.35 2004/06/13 12:53:24 djm Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.37 2005/07/25 11:59:39 markus 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. |
@@ -35,6 +35,10 @@ | |||
35 | #define KEX_DH14 "diffie-hellman-group14-sha1" | 35 | #define KEX_DH14 "diffie-hellman-group14-sha1" |
36 | #define KEX_DHGEX "diffie-hellman-group-exchange-sha1" | 36 | #define KEX_DHGEX "diffie-hellman-group-exchange-sha1" |
37 | 37 | ||
38 | #define COMP_NONE 0 | ||
39 | #define COMP_ZLIB 1 | ||
40 | #define COMP_DELAYED 2 | ||
41 | |||
38 | enum kex_init_proposals { | 42 | enum kex_init_proposals { |
39 | PROPOSAL_KEX_ALGS, | 43 | PROPOSAL_KEX_ALGS, |
40 | PROPOSAL_SERVER_HOST_KEY_ALGS, | 44 | PROPOSAL_SERVER_HOST_KEY_ALGS, |
@@ -60,6 +64,7 @@ enum kex_exchange { | |||
60 | KEX_DH_GRP14_SHA1, | 64 | KEX_DH_GRP14_SHA1, |
61 | KEX_DH_GEX_SHA1, | 65 | KEX_DH_GEX_SHA1, |
62 | KEX_GSS_GRP1_SHA1, | 66 | KEX_GSS_GRP1_SHA1, |
67 | KEX_GSS_GEX_SHA1, | ||
63 | KEX_MAX | 68 | KEX_MAX |
64 | }; | 69 | }; |
65 | 70 | ||
@@ -84,9 +89,9 @@ struct Mac { | |||
84 | char *name; | 89 | char *name; |
85 | int enabled; | 90 | int enabled; |
86 | const EVP_MD *md; | 91 | const EVP_MD *md; |
87 | int mac_len; | 92 | u_int mac_len; |
88 | u_char *key; | 93 | u_char *key; |
89 | int key_len; | 94 | u_int key_len; |
90 | }; | 95 | }; |
91 | struct Comp { | 96 | struct Comp { |
92 | int type; | 97 | int type; |
@@ -102,7 +107,7 @@ struct Kex { | |||
102 | u_char *session_id; | 107 | u_char *session_id; |
103 | u_int session_id_len; | 108 | u_int session_id_len; |
104 | Newkeys *newkeys[MODE_MAX]; | 109 | Newkeys *newkeys[MODE_MAX]; |
105 | int we_need; | 110 | u_int we_need; |
106 | int server; | 111 | int server; |
107 | char *name; | 112 | char *name; |
108 | int hostkey_type; | 113 | int hostkey_type; |
@@ -113,6 +118,8 @@ struct Kex { | |||
113 | int flags; | 118 | int flags; |
114 | #ifdef GSSAPI | 119 | #ifdef GSSAPI |
115 | int gss_deleg_creds; | 120 | int gss_deleg_creds; |
121 | int gss_trust_dns; | ||
122 | char *gss_host; | ||
116 | #endif | 123 | #endif |
117 | char *client_version_string; | 124 | char *client_version_string; |
118 | char *server_version_string; | 125 | char *server_version_string; |