diff options
Diffstat (limited to 'kex.c')
-rw-r--r-- | kex.c | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kex.c,v 1.14 2000/12/15 17:30:14 provos Exp $"); | 26 | RCSID("$OpenBSD: kex.c,v 1.16 2000/12/20 19:37:22 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh.h" | 28 | #include "ssh.h" |
29 | #include "ssh2.h" | 29 | #include "ssh2.h" |
@@ -51,7 +51,7 @@ Buffer * | |||
51 | kex_init(char *myproposal[PROPOSAL_MAX]) | 51 | kex_init(char *myproposal[PROPOSAL_MAX]) |
52 | { | 52 | { |
53 | int first_kex_packet_follows = 0; | 53 | int first_kex_packet_follows = 0; |
54 | unsigned char cookie[KEX_COOKIE_LEN]; | 54 | u_char cookie[KEX_COOKIE_LEN]; |
55 | u_int32_t rand = 0; | 55 | u_int32_t rand = 0; |
56 | int i; | 56 | int i; |
57 | Buffer *ki = xmalloc(sizeof(*ki)); | 57 | Buffer *ki = xmalloc(sizeof(*ki)); |
@@ -190,7 +190,7 @@ dh_new_group(BIGNUM *gen, BIGNUM *modulus) | |||
190 | } | 190 | } |
191 | 191 | ||
192 | DH * | 192 | DH * |
193 | dh_new_group1() | 193 | dh_new_group1(void) |
194 | { | 194 | { |
195 | static char *gen = "2", *group1 = | 195 | static char *gen = "2", *group1 = |
196 | "FFFFFFFF" "FFFFFFFF" "C90FDAA2" "2168C234" "C4C6628B" "80DC1CD1" | 196 | "FFFFFFFF" "FFFFFFFF" "C90FDAA2" "2168C234" "C4C6628B" "80DC1CD1" |
@@ -204,7 +204,7 @@ dh_new_group1() | |||
204 | } | 204 | } |
205 | 205 | ||
206 | void | 206 | void |
207 | dump_digest(unsigned char *digest, int len) | 207 | dump_digest(u_char *digest, int len) |
208 | { | 208 | { |
209 | int i; | 209 | int i; |
210 | for (i = 0; i< len; i++){ | 210 | for (i = 0; i< len; i++){ |
@@ -215,7 +215,7 @@ dump_digest(unsigned char *digest, int len) | |||
215 | fprintf(stderr, "\n"); | 215 | fprintf(stderr, "\n"); |
216 | } | 216 | } |
217 | 217 | ||
218 | unsigned char * | 218 | u_char * |
219 | kex_hash( | 219 | kex_hash( |
220 | char *client_version_string, | 220 | char *client_version_string, |
221 | char *server_version_string, | 221 | char *server_version_string, |
@@ -227,7 +227,7 @@ kex_hash( | |||
227 | BIGNUM *shared_secret) | 227 | BIGNUM *shared_secret) |
228 | { | 228 | { |
229 | Buffer b; | 229 | Buffer b; |
230 | static unsigned char digest[EVP_MAX_MD_SIZE]; | 230 | static u_char digest[EVP_MAX_MD_SIZE]; |
231 | EVP_MD *evp_md = EVP_sha1(); | 231 | EVP_MD *evp_md = EVP_sha1(); |
232 | EVP_MD_CTX md; | 232 | EVP_MD_CTX md; |
233 | 233 | ||
@@ -264,7 +264,7 @@ kex_hash( | |||
264 | return digest; | 264 | return digest; |
265 | } | 265 | } |
266 | 266 | ||
267 | unsigned char * | 267 | u_char * |
268 | kex_hash_gex( | 268 | kex_hash_gex( |
269 | char *client_version_string, | 269 | char *client_version_string, |
270 | char *server_version_string, | 270 | char *server_version_string, |
@@ -277,7 +277,7 @@ kex_hash_gex( | |||
277 | BIGNUM *shared_secret) | 277 | BIGNUM *shared_secret) |
278 | { | 278 | { |
279 | Buffer b; | 279 | Buffer b; |
280 | static unsigned char digest[EVP_MAX_MD_SIZE]; | 280 | static u_char digest[EVP_MAX_MD_SIZE]; |
281 | EVP_MD *evp_md = EVP_sha1(); | 281 | EVP_MD *evp_md = EVP_sha1(); |
282 | EVP_MD_CTX md; | 282 | EVP_MD_CTX md; |
283 | 283 | ||
@@ -317,8 +317,8 @@ kex_hash_gex( | |||
317 | return digest; | 317 | return digest; |
318 | } | 318 | } |
319 | 319 | ||
320 | unsigned char * | 320 | u_char * |
321 | derive_key(int id, int need, char unsigned *hash, BIGNUM *shared_secret) | 321 | derive_key(int id, int need, u_char *hash, BIGNUM *shared_secret) |
322 | { | 322 | { |
323 | Buffer b; | 323 | Buffer b; |
324 | EVP_MD *evp_md = EVP_sha1(); | 324 | EVP_MD *evp_md = EVP_sha1(); |
@@ -326,7 +326,7 @@ derive_key(int id, int need, char unsigned *hash, BIGNUM *shared_secret) | |||
326 | char c = id; | 326 | char c = id; |
327 | int have; | 327 | int have; |
328 | int mdsz = evp_md->md_size; | 328 | int mdsz = evp_md->md_size; |
329 | unsigned char *digest = xmalloc(((need+mdsz-1)/mdsz)*mdsz); | 329 | u_char *digest = xmalloc(((need+mdsz-1)/mdsz)*mdsz); |
330 | 330 | ||
331 | buffer_init(&b); | 331 | buffer_init(&b); |
332 | buffer_put_bignum2(&b, shared_secret); | 332 | buffer_put_bignum2(&b, shared_secret); |
@@ -512,12 +512,12 @@ kex_choose_conf(char *cprop[PROPOSAL_MAX], char *sprop[PROPOSAL_MAX], int server | |||
512 | } | 512 | } |
513 | 513 | ||
514 | int | 514 | int |
515 | kex_derive_keys(Kex *k, unsigned char *hash, BIGNUM *shared_secret) | 515 | kex_derive_keys(Kex *k, u_char *hash, BIGNUM *shared_secret) |
516 | { | 516 | { |
517 | int i; | 517 | int i; |
518 | int mode; | 518 | int mode; |
519 | int ctos; | 519 | int ctos; |
520 | unsigned char *keys[NKEYS]; | 520 | u_char *keys[NKEYS]; |
521 | 521 | ||
522 | for (i = 0; i < NKEYS; i++) | 522 | for (i = 0; i < NKEYS; i++) |
523 | keys[i] = derive_key('A'+i, k->we_need, hash, shared_secret); | 523 | keys[i] = derive_key('A'+i, k->we_need, hash, shared_secret); |