1 files changed, 17 insertions, 5 deletions

diff --git a/kexdhc.c b/kexdhc.c
index d8a2fa3b7..d384c8052 100644
--- a/kexdhc.c
+++ b/kexdhc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: kexdhc.c,v 1.11 2006/11/06 21:25:28 markus Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -23,10 +24,18 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kexdhc.c,v 1.3 2005/11/04 05:15:59 djm Exp $");
+
+#include <sys/types.h>
+
+#include <stdarg.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"
@@ -41,7 +50,8 @@ kexdh_client(Kex *kex)
         Key *server_host_key;
         u_char *server_host_key_blob = NULL, *signature = NULL;
         u_char *kbuf, *hash;
-        u_int klen, kout, slen, sbloblen, hashlen;
+        u_int klen, slen, sbloblen, hashlen;
+        int kout;
 
         /* generate and send 'e', client DH public key */
         switch (kex->kex_type) {
@@ -82,7 +92,7 @@ kexdh_client(Kex *kex)
         if (kex->verify_host_key(server_host_key) == -1)
                 fatal("server_host_key verification failed");
 
-        /* DH paramter f, server public DH key */
+        /* DH parameter f, server public DH key */
         if ((dh_server_pub = BN_new()) == NULL)
                 fatal("dh_server_pub == NULL");
         packet_get_bignum2(dh_server_pub);
@@ -103,13 +113,15 @@ kexdh_client(Kex *kex)
 
         klen = DH_size(dh);
         kbuf = xmalloc(klen);
-        kout = DH_compute_key(kbuf, dh_server_pub, dh);
+        if ((kout = DH_compute_key(kbuf, dh_server_pub, dh)) < 0)
+                fatal("DH_compute_key: failed");
 #ifdef DEBUG_KEXDH
         dump_digest("shared secret", kbuf, kout);
 #endif
         if ((shared_secret = BN_new()) == NULL)
                 fatal("kexdh_client: BN_new failed");
-        BN_bin2bn(kbuf, kout, shared_secret);
+        if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
+                fatal("kexdh_client: BN_bin2bn failed");
         memset(kbuf, 0, klen);
         xfree(kbuf);