- djm@cvs.openbsd.org 2002/02/12 12:44:46

[openssh.git] / kexgex.c

diff --git a/kexgex.c b/kexgex.c
index 8822c8dcd7362b8c617faf1840fa5610b39583a6..dc2fa67239340938428419bfb9eb80e649035d62 100644 (file)
--- a/kexgex.c
+++ b/kexgex.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kexgex.c,v 1.12 2001/12/27 19:37:23 markus Exp $");
+RCSID("$OpenBSD: kexgex.c,v 1.17 2002/01/31 13:35:11 markus Exp $");
 
 #include <openssl/bn.h>
 
@@ -92,7 +92,7 @@ kexgex_hash(
        buffer_free(&b);
 
 #ifdef DEBUG_KEXDH
-       dump_digest("hash", digest, evp_md->md_size);
+       dump_digest("hash", digest, EVP_MD_size(evp_md));
 #endif
        return digest;
 }
@@ -107,7 +107,7 @@ kexgex_client(Kex *kex)
        Key *server_host_key;
        u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL;
        u_int klen, kout, slen, sbloblen;
-       int dlen, plen, min, max, nbits;
+       int min, max, nbits;
        DH *dh;
 
        nbits = dh_estimate(kex->we_need * 8);
@@ -138,15 +138,15 @@ kexgex_client(Kex *kex)
        packet_send();
 
        debug("expecting SSH2_MSG_KEX_DH_GEX_GROUP");
-       packet_read_expect(&plen, SSH2_MSG_KEX_DH_GEX_GROUP);
+       packet_read_expect(SSH2_MSG_KEX_DH_GEX_GROUP);
 
        if ((p = BN_new()) == NULL)
                fatal("BN_new");
-       packet_get_bignum2(p, &dlen);
+       packet_get_bignum2(p);
        if ((g = BN_new()) == NULL)
                fatal("BN_new");
-       packet_get_bignum2(g, &dlen);
-       packet_done();
+       packet_get_bignum2(g);
+       packet_check_eom();
 
        if (BN_num_bits(p) < min || BN_num_bits(p) > max)
                fatal("DH_GEX group out of range: %d !< %d !< %d",
@@ -169,14 +169,15 @@ kexgex_client(Kex *kex)
        packet_send();
 
        debug("expecting SSH2_MSG_KEX_DH_GEX_REPLY");
-       packet_read_expect(&plen, SSH2_MSG_KEX_DH_GEX_REPLY);
+       packet_read_expect(SSH2_MSG_KEX_DH_GEX_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)
@@ -185,7 +186,7 @@ kexgex_client(Kex *kex)
        /* DH paramter f, server public DH key */
        if ((dh_server_pub = BN_new()) == NULL)
                fatal("dh_server_pub == NULL");
-       packet_get_bignum2(dh_server_pub, &dlen);
+       packet_get_bignum2(dh_server_pub);
 
 #ifdef DEBUG_KEXDH
        fprintf(stderr, "dh_server_pub= ");
@@ -196,7 +197,7 @@ kexgex_client(Kex *kex)
 
        /* signed H */
        signature = packet_get_string(&slen);
-       packet_done();
+       packet_check_eom();
 
        if (!dh_pub_is_valid(dh, dh_server_pub))
                packet_disconnect("bad server public DH value");
@@ -261,7 +262,7 @@ kexgex_server(Kex *kex)
        DH *dh = dh;
        u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL;
        u_int sbloblen, klen, kout;
-       int min = -1, max = -1, nbits = -1, type, plen, dlen, slen;
+       int min = -1, max = -1, nbits = -1, type, slen;
 
        if (kex->load_host_key == NULL)
                fatal("Cannot load hostkey");
@@ -269,7 +270,7 @@ kexgex_server(Kex *kex)
        if (server_host_key == NULL)
                fatal("Unsupported hostkey type %d", kex->hostkey_type);
 
-       type = packet_read(&plen);
+       type = packet_read();
        switch (type) {
        case SSH2_MSG_KEX_DH_GEX_REQUEST:
                debug("SSH2_MSG_KEX_DH_GEX_REQUEST received");
@@ -289,7 +290,7 @@ kexgex_server(Kex *kex)
        default:
                fatal("protocol error during kex, no DH_GEX_REQUEST: %d", type);
        }
-       packet_done();
+       packet_check_eom();
 
        if (max < min || nbits < min || max < nbits)
                fatal("DH_GEX_REQUEST, bad parameters: %d !< %d !< %d",
@@ -312,12 +313,12 @@ kexgex_server(Kex *kex)
        dh_gen_key(dh, kex->we_need * 8);
 
        debug("expecting SSH2_MSG_KEX_DH_GEX_INIT");
-       packet_read_expect(&plen, SSH2_MSG_KEX_DH_GEX_INIT);
+       packet_read_expect(SSH2_MSG_KEX_DH_GEX_INIT);
 
        /* key, cert */
        if ((dh_client_pub = BN_new()) == NULL)
                fatal("dh_client_pub == NULL");
-       packet_get_bignum2(dh_client_pub, &dlen);
+       packet_get_bignum2(dh_client_pub);
 
 #ifdef DEBUG_KEXDH
        fprintf(stderr, "dh_client_pub= ");