5 files changed, 25 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index e503acd44..1fbc6a20f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
    - otto@cvs.openbsd.org 2006/10/28 18:08:10
      [ssh.1]
      correct/expand example of usage of -w; ok jmc@ stevesk@
+   - markus@cvs.openbsd.org 2006/10/31 16:33:12
+     [kexdhc.c kexdhs.c kexgexc.c kexgexs.c]
+     check DH_compute_key() for -1 even if it should not happen because of
+     earlier calls to dh_pub_is_valid(); report krahmer at suse.de; ok djm
 
 20061101
  - (dtucker) [openbsd-compat/port-solaris.c] Bug #1255: Make only hwerr
@@ -2584,4 +2588,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4582 2006/11/04 18:31:33 djm Exp $
+$Id: ChangeLog,v 1.4583 2006/11/04 18:32:02 djm Exp $
diff --git a/kexdhc.c b/kexdhc.c
index 64de7af30..61d54fdc2 100644
--- a/kexdhc.c
+++ b/kexdhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexdhc.c,v 1.9 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: kexdhc.c,v 1.10 2006/10/31 16:33:12 markus Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -50,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) {
@@ -112,7 +113,8 @@ 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
diff --git a/kexdhs.c b/kexdhs.c
index 93ec97f93..5de434309 100644
--- a/kexdhs.c
+++ b/kexdhs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexdhs.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: kexdhs.c,v 1.8 2006/10/31 16:33:12 markus Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -52,8 +52,8 @@ kexdh_server(Kex *kex)
         DH *dh;
         Key *server_host_key;
         u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL;
-        u_int sbloblen, klen, kout, hashlen;
-        u_int slen;
+        u_int sbloblen, klen, hashlen, slen;
+        int kout;
 
         /* generate server DH public key */
         switch (kex->kex_type) {
@@ -101,7 +101,8 @@ kexdh_server(Kex *kex)
 
         klen = DH_size(dh);
         kbuf = xmalloc(klen);
-        kout = DH_compute_key(kbuf, dh_client_pub, dh);
+        if ((kout = DH_compute_key(kbuf, dh_client_pub, dh)) < 0)
+                fatal("DH_compute_key: failed");
 #ifdef DEBUG_KEXDH
         dump_digest("shared secret", kbuf, kout);
 #endif
diff --git a/kexgexc.c b/kexgexc.c
index 2c19713e1..49d50116a 100644
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexc.c,v 1.9 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: kexgexc.c,v 1.10 2006/10/31 16:33:12 markus Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -51,7 +51,8 @@ kexgex_client(Kex *kex)
         BIGNUM *p = NULL, *g = NULL;
         Key *server_host_key;
         u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL;
-        u_int klen, kout, slen, sbloblen, hashlen;
+        u_int klen, slen, sbloblen, hashlen;
+        int kout;
         int min, max, nbits;
         DH *dh;
 
@@ -150,7 +151,8 @@ kexgex_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
diff --git a/kexgexs.c b/kexgexs.c
index 5373a633a..863e15172 100644
--- a/kexgexs.c
+++ b/kexgexs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexs.c,v 1.8 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: kexgexs.c,v 1.9 2006/10/31 16:33:12 markus Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -55,8 +55,8 @@ kexgex_server(Kex *kex)
         Key *server_host_key;
         DH *dh;
         u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL;
-        u_int sbloblen, klen, kout, slen, hashlen;
-        int min = -1, max = -1, nbits = -1, type;
+        u_int sbloblen, klen, slen, hashlen;
+        int min = -1, max = -1, nbits = -1, type, kout;
 
         if (kex->load_host_key == NULL)
                 fatal("Cannot load hostkey");
@@ -134,7 +134,8 @@ kexgex_server(Kex *kex)
 
         klen = DH_size(dh);
         kbuf = xmalloc(klen);
-        kout = DH_compute_key(kbuf, dh_client_pub, dh);
+        if ((kout = DH_compute_key(kbuf, dh_client_pub, dh)) < 0)
+                fatal("DH_compute_key: failed");
 #ifdef DEBUG_KEXDH
         dump_digest("shared secret", kbuf, kout);
 #endif