diff options
| author | des <des@FreeBSD.org> | 2006-11-10 16:39:21 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-11-10 16:39:21 +0000 |
| commit | f591b3e29c677bff2b0f0d482490554c419128fd (patch) | |
| tree | 209e642fbe2a816041f67bc27c9800879f5541bc /crypto/openssh/kexgexs.c | |
| parent | e6cc400c8f011e212207834669aaf4b62bee951e (diff) | |
| download | FreeBSD-src-f591b3e29c677bff2b0f0d482490554c419128fd.zip FreeBSD-src-f591b3e29c677bff2b0f0d482490554c419128fd.tar.gz | |
Vendor import of OpenSSH 4.5p1.
Diffstat (limited to 'crypto/openssh/kexgexs.c')
| -rw-r--r-- | crypto/openssh/kexgexs.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/crypto/openssh/kexgexs.c b/crypto/openssh/kexgexs.c index 5373a63..a037f57 100644 --- a/crypto/openssh/kexgexs.c +++ b/crypto/openssh/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.10 2006/11/06 21:25:28 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,13 +134,15 @@ 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 if ((shared_secret = BN_new()) == NULL) fatal("kexgex_server: BN_new failed"); - BN_bin2bn(kbuf, kout, shared_secret); + if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) + fatal("kexgex_server: BN_bin2bn failed"); memset(kbuf, 0, klen); xfree(kbuf); |
