=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kexdh.c,v retrieving revision 1.3.2.3 retrieving revision 1.4 diff -u -r1.3.2.3 -r1.4 --- src/usr.bin/ssh/kexdh.c 2002/06/02 22:56:10 1.3.2.3 +++ src/usr.bin/ssh/kexdh.c 2001/06/07 20:23:04 1.4 @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: kexdh.c,v 1.3.2.3 2002/06/02 22:56:10 miod Exp $"); +RCSID("$OpenBSD: kexdh.c,v 1.4 2001/06/07 20:23:04 markus Exp $"); #include #include @@ -37,22 +37,21 @@ #include "packet.h" #include "dh.h" #include "ssh2.h" -#include "monitor_wrap.h" -static u_char * +u_char * kex_dh_hash( char *client_version_string, char *server_version_string, char *ckexinit, int ckexinitlen, char *skexinit, int skexinitlen, - u_char *serverhostkeyblob, int sbloblen, + char *serverhostkeyblob, int sbloblen, BIGNUM *client_dh_pub, BIGNUM *server_dh_pub, BIGNUM *shared_secret) { Buffer b; static u_char digest[EVP_MAX_MD_SIZE]; - const EVP_MD *evp_md = EVP_sha1(); + EVP_MD *evp_md = EVP_sha1(); EVP_MD_CTX md; buffer_init(&b); @@ -82,22 +81,23 @@ buffer_free(&b); #ifdef DEBUG_KEX - dump_digest("hash", digest, EVP_MD_size(evp_md)); + dump_digest("hash", digest, evp_md->md_size); #endif return digest; } /* client */ -static void +void kexdh_client(Kex *kex) { BIGNUM *dh_server_pub = NULL, *shared_secret = NULL; DH *dh; Key *server_host_key; - u_char *server_host_key_blob = NULL, *signature = NULL; + char *server_host_key_blob = NULL, *signature = NULL; u_char *kbuf, *hash; u_int klen, kout, slen, sbloblen; + int dlen, plen; /* generate and send 'e', client DH public key */ dh = dh_new_group1(); @@ -115,24 +115,23 @@ #endif debug("expecting SSH2_MSG_KEXDH_REPLY"); - packet_read_expect(SSH2_MSG_KEXDH_REPLY); + packet_read_expect(&plen, SSH2_MSG_KEXDH_REPLY); /* key, cert */ server_host_key_blob = packet_get_string(&sbloblen); server_host_key = key_from_blob(server_host_key_blob, sbloblen); if (server_host_key == NULL) fatal("cannot decode server_host_key_blob"); - if (server_host_key->type != kex->hostkey_type) - fatal("type mismatch for decoded server_host_key_blob"); - if (kex->verify_host_key == NULL) - fatal("cannot verify server_host_key"); - if (kex->verify_host_key(server_host_key) == -1) - fatal("server_host_key verification failed"); + if (kex->check_host_key == NULL) + fatal("cannot check server_host_key"); + kex->check_host_key(server_host_key); + /* DH paramter f, server public DH key */ - if ((dh_server_pub = BN_new()) == NULL) + dh_server_pub = BN_new(); + if (dh_server_pub == NULL) fatal("dh_server_pub == NULL"); - packet_get_bignum2(dh_server_pub); + packet_get_bignum2(dh_server_pub, &dlen); #ifdef DEBUG_KEXDH fprintf(stderr, "dh_server_pub= "); @@ -143,7 +142,7 @@ /* signed H */ signature = packet_get_string(&slen); - packet_check_eom(); + packet_done(); if (!dh_pub_is_valid(dh, dh_server_pub)) packet_disconnect("bad server public DH value"); @@ -154,8 +153,7 @@ #ifdef DEBUG_KEXDH dump_digest("shared secret", kbuf, kout); #endif - if ((shared_secret = BN_new()) == NULL) - fatal("kexdh_client: BN_new failed"); + shared_secret = BN_new(); BN_bin2bn(kbuf, kout, shared_secret); memset(kbuf, 0, klen); xfree(kbuf); @@ -172,10 +170,10 @@ shared_secret ); xfree(server_host_key_blob); - BN_clear_free(dh_server_pub); + BN_free(dh_server_pub); DH_free(dh); - if (key_verify(server_host_key, signature, slen, hash, 20) != 1) + if (key_verify(server_host_key, (u_char *)signature, slen, hash, 20) != 1) fatal("key_verify failed for server_host_key"); key_free(server_host_key); xfree(signature); @@ -194,7 +192,7 @@ /* server */ -static void +void kexdh_server(Kex *kex) { BIGNUM *shared_secret = NULL, *dh_client_pub = NULL; @@ -202,14 +200,14 @@ Key *server_host_key; u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL; u_int sbloblen, klen, kout; - u_int slen; + int dlen, slen, plen; /* generate server DH public key */ dh = dh_new_group1(); dh_gen_key(dh, kex->we_need * 8); debug("expecting SSH2_MSG_KEXDH_INIT"); - packet_read_expect(SSH2_MSG_KEXDH_INIT); + packet_read_expect(&plen, SSH2_MSG_KEXDH_INIT); if (kex->load_host_key == NULL) fatal("Cannot load hostkey"); @@ -218,10 +216,10 @@ fatal("Unsupported hostkey type %d", kex->hostkey_type); /* key, cert */ - if ((dh_client_pub = BN_new()) == NULL) + dh_client_pub = BN_new(); + if (dh_client_pub == NULL) fatal("dh_client_pub == NULL"); - packet_get_bignum2(dh_client_pub); - packet_check_eom(); + packet_get_bignum2(dh_client_pub, &dlen); #ifdef DEBUG_KEXDH fprintf(stderr, "dh_client_pub= "); @@ -245,8 +243,7 @@ #ifdef DEBUG_KEXDH dump_digest("shared secret", kbuf, kout); #endif - if ((shared_secret = BN_new()) == NULL) - fatal("kexdh_server: BN_new failed"); + shared_secret = BN_new(); BN_bin2bn(kbuf, kout, shared_secret); memset(kbuf, 0, klen); xfree(kbuf); @@ -259,12 +256,12 @@ kex->server_version_string, buffer_ptr(&kex->peer), buffer_len(&kex->peer), buffer_ptr(&kex->my), buffer_len(&kex->my), - server_host_key_blob, sbloblen, + (char *)server_host_key_blob, sbloblen, dh_client_pub, dh->pub_key, shared_secret ); - BN_clear_free(dh_client_pub); + BN_free(dh_client_pub); /* save session id := H */ /* XXX hashlen depends on KEX */ @@ -276,15 +273,15 @@ /* sign H */ /* XXX hashlen depends on KEX */ - PRIVSEP(key_sign(server_host_key, &signature, &slen, hash, 20)); + key_sign(server_host_key, &signature, &slen, hash, 20); /* destroy_sensitive_data(); */ /* send server hostkey, DH pubkey 'f' and singed H */ packet_start(SSH2_MSG_KEXDH_REPLY); - packet_put_string(server_host_key_blob, sbloblen); + packet_put_string((char *)server_host_key_blob, sbloblen); packet_put_bignum2(dh->pub_key); /* f */ - packet_put_string(signature, slen); + packet_put_string((char *)signature, slen); packet_send(); xfree(signature);