- dtucker@cvs.openbsd.org 2009/06/21 07:37:15

     [kexdhs.c kexgexs.c]
     abort if key_sign fails, preventing possible null deref.  Based on report
     from Paolo Ganci, ok markus@ djm@

diff --git a/kexdhs.c b/kexdhs.c
index 861708818451f04ce0b54d89f3ed585368819370..a6719f6722f6474334d04604c6e4f97d1c36279e 100644 (file)
--- a/kexdhs.c
+++ b/kexdhs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexdhs.c,v 1.9 2006/11/06 21:25:28 markus Exp $ */
+/* $OpenBSD: kexdhs.c,v 1.10 2009/06/21 07:37:15 dtucker Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -137,7 +137,9 @@ kexdh_server(Kex *kex)
        }
 
        /* sign H */
-       PRIVSEP(key_sign(server_host_key, &signature, &slen, hash, hashlen));
+       if (PRIVSEP(key_sign(server_host_key, &signature, &slen, hash,
+           hashlen)) < 0)
+               fatal("kexdh_server: key_sign failed");
 
        /* destroy_sensitive_data(); */
 

diff --git a/kexgexs.c b/kexgexs.c
index 76a0f8ca7164d5e0259a49e90e6b29e061ec7381..8515568b36edda5d4d8be638bb031d5f1039ddcb 100644 (file)
--- a/kexgexs.c
+++ b/kexgexs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexs.c,v 1.11 2009/01/01 21:17:36 djm Exp $ */
+/* $OpenBSD: kexgexs.c,v 1.12 2009/06/21 07:37:15 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -179,7 +179,9 @@ kexgex_server(Kex *kex)
        }
 
        /* sign H */
-       PRIVSEP(key_sign(server_host_key, &signature, &slen, hash, hashlen));
+       if (PRIVSEP(key_sign(server_host_key, &signature, &slen, hash,
+           hashlen)) < 0)
+               fatal("kexgex_server: key_sign failed");
 
        /* destroy_sensitive_data(); */