===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kexgexc.c,v
retrieving revision 1.3.2.2
retrieving revision 1.4
diff -u -r1.3.2.2 -r1.4
--- src/usr.bin/ssh/kexgexc.c	2006/11/08 00:17:14	1.3.2.2
+++ src/usr.bin/ssh/kexgexc.c	2006/03/19 18:51:18	1.4
@@ -1,4 +1,3 @@
-/* $OpenBSD: kexgexc.c,v 1.3.2.2 2006/11/08 00:17:14 brad Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -24,16 +23,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
+#include "includes.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-
 #include "xmalloc.h"
-#include "buffer.h"
 #include "key.h"
-#include "cipher.h"
 #include "kex.h"
 #include "log.h"
 #include "packet.h"
@@ -48,8 +41,7 @@
 	BIGNUM *p = NULL, *g = NULL;
 	Key *server_host_key;
 	u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL;
-	u_int klen, slen, sbloblen, hashlen;
-	int kout;
+	u_int klen, kout, slen, sbloblen, hashlen;
 	int min, max, nbits;
 	DH *dh;
 
@@ -127,7 +119,7 @@
 	if (kex->verify_host_key(server_host_key) == -1)
 		fatal("server_host_key verification failed");
 
-	/* DH parameter f, server public DH key */
+	/* 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);
@@ -148,15 +140,13 @@
 
 	klen = DH_size(dh);
 	kbuf = xmalloc(klen);
-	if ((kout = DH_compute_key(kbuf, dh_server_pub, dh)) < 0)
-		fatal("DH_compute_key: failed");
+	kout = DH_compute_key(kbuf, dh_server_pub, dh);
 #ifdef DEBUG_KEXDH
 	dump_digest("shared secret", kbuf, kout);
 #endif
 	if ((shared_secret = BN_new()) == NULL)
 		fatal("kexgex_client: BN_new failed");
-	if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
-		fatal("kexgex_client: BN_bin2bn failed");
+	BN_bin2bn(kbuf, kout, shared_secret);
 	memset(kbuf, 0, klen);
 	xfree(kbuf);