diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
commit | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (patch) | |
tree | 28fc9a13eaab935e4de055b561b333d67387a934 /kex.h | |
parent | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
import openssh-4.3p2-gsskex-20060223.patch
Diffstat (limited to 'kex.h')
-rw-r--r-- | kex.h | 24 |
1 files changed, 13 insertions, 11 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.37 2005/07/25 11:59:39 markus Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.38 2005/11/04 05:15:59 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. |
@@ -31,9 +31,9 @@ | |||
31 | #include "cipher.h" | 31 | #include "cipher.h" |
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_DH14 "diffie-hellman-group14-sha1" |
36 | #define KEX_DHGEX "diffie-hellman-group-exchange-sha1" | 36 | #define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1" |
37 | 37 | ||
38 | #define COMP_NONE 0 | 38 | #define COMP_NONE 0 |
39 | #define COMP_ZLIB 1 | 39 | #define COMP_ZLIB 1 |
@@ -116,8 +116,9 @@ struct Kex { | |||
116 | Buffer peer; | 116 | Buffer peer; |
117 | int done; | 117 | int done; |
118 | int flags; | 118 | int flags; |
119 | const EVP_MD *evp_md; | ||
119 | #ifdef GSSAPI | 120 | #ifdef GSSAPI |
120 | int gss_deleg_creds; | 121 | int gss_deleg_creds; |
121 | int gss_trust_dns; | 122 | int gss_trust_dns; |
122 | char *gss_host; | 123 | char *gss_host; |
123 | #endif | 124 | #endif |
@@ -134,7 +135,7 @@ void kex_finish(Kex *); | |||
134 | 135 | ||
135 | void kex_send_kexinit(Kex *); | 136 | void kex_send_kexinit(Kex *); |
136 | void kex_input_kexinit(int, u_int32_t, void *); | 137 | void kex_input_kexinit(int, u_int32_t, void *); |
137 | void kex_derive_keys(Kex *, u_char *, BIGNUM *); | 138 | void kex_derive_keys(Kex *, u_char *, u_int, BIGNUM *); |
138 | 139 | ||
139 | Newkeys *kex_get_newkeys(int); | 140 | Newkeys *kex_get_newkeys(int); |
140 | 141 | ||
@@ -148,12 +149,13 @@ void kexgss_client(Kex *); | |||
148 | void kexgss_server(Kex *); | 149 | void kexgss_server(Kex *); |
149 | #endif | 150 | #endif |
150 | 151 | ||
151 | u_char * | 152 | void |
152 | kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, | 153 | kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, |
153 | BIGNUM *, BIGNUM *, BIGNUM *); | 154 | BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); |
154 | u_char * | 155 | void |
155 | kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int, | 156 | kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *, |
156 | int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *); | 157 | int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, |
158 | BIGNUM *, BIGNUM *, u_char **, u_int *); | ||
157 | 159 | ||
158 | void | 160 | void |
159 | derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]); | 161 | derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]); |