X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/1e608e420beaca67ca6bc6bef308f9f9f6132a66..d7ffeb3534dbecb84340356c6c5038120410bfde:/openssh/kexdh.c

diff --git a/openssh/kexdh.c b/openssh/kexdh.c
index eaf497c..b850a1a 100644
--- a/openssh/kexdh.c
+++ b/openssh/kexdh.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kexdh.c,v 1.17 2002/02/28 15:46:33 markus Exp $");
+RCSID("$OpenBSD: kexdh.c,v 1.7 2001/09/17 19:27:15 stevesk Exp $");
 
 #include <openssl/crypto.h>
 #include <openssl/bn.h>
@@ -51,7 +51,7 @@ kex_dh_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);
@@ -81,7 +81,7 @@ kex_dh_hash(
 	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;
 }
@@ -97,6 +97,7 @@ kexdh_client(Kex *kex)
 	u_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();
@@ -114,24 +115,24 @@ kexdh_client(Kex *kex)
 #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");
 
 	/* 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= ");
@@ -142,7 +143,7 @@ kexdh_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");
@@ -153,8 +154,7 @@ kexdh_client(Kex *kex)
 #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);
@@ -171,7 +171,7 @@ kexdh_client(Kex *kex)
 	    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)
@@ -201,14 +201,14 @@ kexdh_server(Kex *kex)
 	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");
@@ -217,10 +217,10 @@ kexdh_server(Kex *kex)
 		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= ");
@@ -244,8 +244,7 @@ kexdh_server(Kex *kex)
 #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);
@@ -263,7 +262,7 @@ kexdh_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 */