diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-09-18 05:41:19 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-09-18 05:41:19 +0000 |
commit | 9e0ddd4379242d325157e38d406e5ed80ba0892c (patch) | |
tree | 6a5edbe9c4e33e195e52ddb11e6c30d3a6e63fb8 /kexgex.c | |
parent | 1e2432416483351ba18ac7ea21538b138db583ae (diff) |
- stevesk@cvs.openbsd.org 2001/09/17 19:27:15
[kexdh.c kexgex.c key.c key.h ssh-dss.c ssh-keygen.c ssh-rsa.c]
u_char*/char* cleanup; ok markus
Diffstat (limited to 'kexgex.c')
-rw-r--r-- | kexgex.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -24,7 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: kexgex.c,v 1.8 2001/06/23 15:12:19 itojun Exp $"); | 27 | RCSID("$OpenBSD: kexgex.c,v 1.9 2001/09/17 19:27:15 stevesk Exp $"); |
28 | 28 | ||
29 | #include <openssl/bn.h> | 29 | #include <openssl/bn.h> |
30 | 30 | ||
@@ -45,7 +45,7 @@ kexgex_hash( | |||
45 | char *server_version_string, | 45 | char *server_version_string, |
46 | char *ckexinit, int ckexinitlen, | 46 | char *ckexinit, int ckexinitlen, |
47 | char *skexinit, int skexinitlen, | 47 | char *skexinit, int skexinitlen, |
48 | char *serverhostkeyblob, int sbloblen, | 48 | u_char *serverhostkeyblob, int sbloblen, |
49 | int min, int wantbits, int max, BIGNUM *prime, BIGNUM *gen, | 49 | int min, int wantbits, int max, BIGNUM *prime, BIGNUM *gen, |
50 | BIGNUM *client_dh_pub, | 50 | BIGNUM *client_dh_pub, |
51 | BIGNUM *server_dh_pub, | 51 | BIGNUM *server_dh_pub, |
@@ -234,7 +234,7 @@ kexgex_client(Kex *kex) | |||
234 | xfree(server_host_key_blob); | 234 | xfree(server_host_key_blob); |
235 | BN_free(dh_server_pub); | 235 | BN_free(dh_server_pub); |
236 | 236 | ||
237 | if (key_verify(server_host_key, (u_char *)signature, slen, hash, 20) != 1) | 237 | if (key_verify(server_host_key, signature, slen, hash, 20) != 1) |
238 | fatal("key_verify failed for server_host_key"); | 238 | fatal("key_verify failed for server_host_key"); |
239 | key_free(server_host_key); | 239 | key_free(server_host_key); |
240 | xfree(signature); | 240 | xfree(signature); |
@@ -358,7 +358,7 @@ kexgex_server(Kex *kex) | |||
358 | kex->server_version_string, | 358 | kex->server_version_string, |
359 | buffer_ptr(&kex->peer), buffer_len(&kex->peer), | 359 | buffer_ptr(&kex->peer), buffer_len(&kex->peer), |
360 | buffer_ptr(&kex->my), buffer_len(&kex->my), | 360 | buffer_ptr(&kex->my), buffer_len(&kex->my), |
361 | (char *)server_host_key_blob, sbloblen, | 361 | server_host_key_blob, sbloblen, |
362 | min, nbits, max, | 362 | min, nbits, max, |
363 | dh->p, dh->g, | 363 | dh->p, dh->g, |
364 | dh_client_pub, | 364 | dh_client_pub, |
@@ -384,9 +384,9 @@ kexgex_server(Kex *kex) | |||
384 | /* send server hostkey, DH pubkey 'f' and singed H */ | 384 | /* send server hostkey, DH pubkey 'f' and singed H */ |
385 | debug("SSH2_MSG_KEX_DH_GEX_REPLY sent"); | 385 | debug("SSH2_MSG_KEX_DH_GEX_REPLY sent"); |
386 | packet_start(SSH2_MSG_KEX_DH_GEX_REPLY); | 386 | packet_start(SSH2_MSG_KEX_DH_GEX_REPLY); |
387 | packet_put_string((char *)server_host_key_blob, sbloblen); | 387 | packet_put_string(server_host_key_blob, sbloblen); |
388 | packet_put_bignum2(dh->pub_key); /* f */ | 388 | packet_put_bignum2(dh->pub_key); /* f */ |
389 | packet_put_string((char *)signature, slen); | 389 | packet_put_string(signature, slen); |
390 | packet_send(); | 390 | packet_send(); |
391 | xfree(signature); | 391 | xfree(signature); |
392 | xfree(server_host_key_blob); | 392 | xfree(server_host_key_blob); |