X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/1e608e420beaca67ca6bc6bef308f9f9f6132a66..ac4501406d19ea7c1e28686c8a1bc241cd1ef484:/openssh/kexgex.c?ds=sidebyside

diff --git a/openssh/kexgex.c b/openssh/kexgex.c
index 61896e6..f06f2c3 100644
--- a/openssh/kexgex.c
+++ b/openssh/kexgex.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kexgex.c,v 1.20 2002/02/28 15:46:33 markus Exp $");
+RCSID("$OpenBSD: kexgex.c,v 1.9 2001/09/17 19:27:15 stevesk Exp $");
 
 #include <openssl/bn.h>
 
@@ -53,7 +53,7 @@ kexgex_hash(
 {
 	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);
@@ -92,7 +92,7 @@ kexgex_hash(
 	buffer_free(&b);
 
 #ifdef DEBUG_KEXDH
-	dump_digest("hash", digest, EVP_MD_size(evp_md));
+	dump_digest("hash", digest, evp_md->md_size);
 #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 min, max, nbits;
+	int dlen, plen, 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(SSH2_MSG_KEX_DH_GEX_GROUP);
+	packet_read_expect(&plen, SSH2_MSG_KEX_DH_GEX_GROUP);
 
 	if ((p = BN_new()) == NULL)
 		fatal("BN_new");
-	packet_get_bignum2(p);
+	packet_get_bignum2(p, &dlen);
 	if ((g = BN_new()) == NULL)
 		fatal("BN_new");
-	packet_get_bignum2(g);
-	packet_check_eom();
+	packet_get_bignum2(g, &dlen);
+	packet_done();
 
 	if (BN_num_bits(p) < min || BN_num_bits(p) > max)
 		fatal("DH_GEX group out of range: %d !< %d !< %d",
@@ -169,24 +169,24 @@ kexgex_client(Kex *kex)
 	packet_send();
 
 	debug("expecting SSH2_MSG_KEX_DH_GEX_REPLY");
-	packet_read_expect(SSH2_MSG_KEX_DH_GEX_REPLY);
+	packet_read_expect(&plen, 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)
 		fatal("server_host_key verification failed");
 
 	/* 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= ");
@@ -197,7 +197,7 @@ kexgex_client(Kex *kex)
 
 	/* 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");
@@ -208,8 +208,7 @@ kexgex_client(Kex *kex)
 #ifdef DEBUG_KEXDH
 	dump_digest("shared secret", kbuf, kout);
 #endif
-	if ((shared_secret = BN_new()) == NULL)
-		fatal("kexgex_client: BN_new failed");
+	shared_secret = BN_new();
 	BN_bin2bn(kbuf, kout, shared_secret);
 	memset(kbuf, 0, klen);
 	xfree(kbuf);
@@ -233,7 +232,7 @@ kexgex_client(Kex *kex)
 	/* have keys, free DH */
 	DH_free(dh);
 	xfree(server_host_key_blob);
-	BN_clear_free(dh_server_pub);
+	BN_free(dh_server_pub);
 
 	if (key_verify(server_host_key, signature, slen, hash, 20) != 1)
 		fatal("key_verify failed for server_host_key");
@@ -261,8 +260,8 @@ kexgex_server(Kex *kex)
 	Key *server_host_key;
 	DH *dh = dh;
 	u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL;
-	u_int sbloblen, klen, kout, slen;
-	int min = -1, max = -1, nbits = -1, type;
+	u_int sbloblen, klen, kout;
+	int min = -1, max = -1, nbits = -1, type, plen, dlen, slen;
 
 	if (kex->load_host_key == NULL)
 		fatal("Cannot load hostkey");
@@ -270,8 +269,8 @@ kexgex_server(Kex *kex)
 	if (server_host_key == NULL)
 		fatal("Unsupported hostkey type %d", kex->hostkey_type);
 
-	type = packet_read();
-	switch (type) {
+	type = packet_read(&plen);
+	switch(type){
 	case SSH2_MSG_KEX_DH_GEX_REQUEST:
 		debug("SSH2_MSG_KEX_DH_GEX_REQUEST received");
 		min = packet_get_int();
@@ -290,7 +289,7 @@ kexgex_server(Kex *kex)
 	default:
 		fatal("protocol error during kex, no DH_GEX_REQUEST: %d", type);
 	}
-	packet_check_eom();
+	packet_done();
 
 	if (max < min || nbits < min || max < nbits)
 		fatal("DH_GEX_REQUEST, bad parameters: %d !< %d !< %d",
@@ -313,13 +312,13 @@ kexgex_server(Kex *kex)
 	dh_gen_key(dh, kex->we_need * 8);
 
 	debug("expecting SSH2_MSG_KEX_DH_GEX_INIT");
-	packet_read_expect(SSH2_MSG_KEX_DH_GEX_INIT);
+	packet_read_expect(&plen, SSH2_MSG_KEX_DH_GEX_INIT);
 
 	/* 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= ");
@@ -343,8 +342,7 @@ kexgex_server(Kex *kex)
 #ifdef DEBUG_KEXDH
 	dump_digest("shared secret", kbuf, kout);
 #endif
-	if ((shared_secret = BN_new()) == NULL)
-		fatal("kexgex_server: BN_new failed");
+	shared_secret = BN_new();
 	BN_bin2bn(kbuf, kout, shared_secret);
 	memset(kbuf, 0, klen);
 	xfree(kbuf);
@@ -367,7 +365,7 @@ kexgex_server(Kex *kex)
 	    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 */