- (djm) Bug #406: s/msg_send/ssh_msg_send/ for Mac OS X 1.2

[openssh.git] / kexgex.c

diff --git a/kexgex.c b/kexgex.c
index 49f639c61cab0ffa81437e1f45c4a0fd7e123326..2d4a58153151753d56e9cd24e025ad4897bd212a 100644 (file)
--- a/kexgex.c
+++ b/kexgex.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kexgex.c,v 1.13 2001/12/28 12:14:27 markus Exp $");
+RCSID("$OpenBSD: kexgex.c,v 1.22 2002/03/24 17:27:03 stevesk Exp $");
 
 #include <openssl/bn.h>
 
@@ -38,6 +38,7 @@ RCSID("$OpenBSD: kexgex.c,v 1.13 2001/12/28 12:14:27 markus Exp $");
 #include "dh.h"
 #include "ssh2.h"
 #include "compat.h"
+#include "monitor_wrap.h"
 
 static u_char *
 kexgex_hash(
@@ -53,7 +54,7 @@ kexgex_hash(
 {
        Buffer b;
        static u_char digest[EVP_MAX_MD_SIZE];
-       EVP_MD *evp_md = EVP_sha1();
+       const EVP_MD *evp_md = EVP_sha1();
        EVP_MD_CTX md;
 
        buffer_init(&b);
@@ -92,7 +93,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 +108,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,14 +139,14 @@ 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_get_bignum2(g);
        packet_check_eom();
 
        if (BN_num_bits(p) < min || BN_num_bits(p) > max)
@@ -169,14 +170,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 +187,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= ");
@@ -258,10 +260,10 @@ kexgex_server(Kex *kex)
 {
        BIGNUM *shared_secret = NULL, *dh_client_pub = NULL;
        Key *server_host_key;
-       DH *dh = 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;
+       u_int sbloblen, klen, kout, slen;
+       int min = -1, max = -1, nbits = -1, type;
 
        if (kex->load_host_key == NULL)
                fatal("Cannot load hostkey");
@@ -269,7 +271,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");
@@ -295,7 +297,8 @@ kexgex_server(Kex *kex)
                fatal("DH_GEX_REQUEST, bad parameters: %d !< %d !< %d",
                    min, nbits, max);
 
-       dh = choose_dh(min, nbits, max);
+       /* Contact privileged parent */
+       dh = PRIVSEP(choose_dh(min, nbits, max));
        if (dh == NULL)
                packet_disconnect("Protocol error: no matching DH grp found");
 
@@ -312,12 +315,13 @@ 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);
+       packet_check_eom();
 
 #ifdef DEBUG_KEXDH
        fprintf(stderr, "dh_client_pub= ");
@@ -377,7 +381,7 @@ kexgex_server(Kex *kex)
 
        /* sign H */
        /* XXX hashlen depends on KEX */
-       key_sign(server_host_key, &signature, &slen, hash, 20);
+       PRIVSEP(key_sign(server_host_key, &signature, &slen, hash, 20));
 
        /* destroy_sensitive_data(); */
 
@@ -388,6 +392,7 @@ kexgex_server(Kex *kex)
        packet_put_bignum2(dh->pub_key);        /* f */
        packet_put_string(signature, slen);
        packet_send();
+
        xfree(signature);
        xfree(server_host_key_blob);
        /* have keys, free DH */