summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/kexdhs.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2009-06-21 07:37:16 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2009-06-21 07:37:16 +0000
commit0ece3a26f5b61ec696f3bce4a140970ca45737e4 (patch)
tree1f5b154aa109b8af08230d8266558ff27bedf82c /usr.bin/ssh/kexdhs.c
parentbd5c7a3cb0c2fa0ed813f4012b31b75be3a10f25 (diff)
abort if key_sign fails, preventing possible null deref. Based on report
from Paolo Ganci, ok markus@ djm@
Diffstat (limited to 'usr.bin/ssh/kexdhs.c')
-rw-r--r--usr.bin/ssh/kexdhs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/ssh/kexdhs.c b/usr.bin/ssh/kexdhs.c
index 6c810e8308b..d602b417b18 100644
--- a/usr.bin/ssh/kexdhs.c
+++ b/usr.bin/ssh/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.
*
@@ -134,7 +134,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(); */