summaryrefslogtreecommitdiff
path: root/kexdh.c
diff options
context:
space:
mode:
Diffstat (limited to 'kexdh.c')
-rw-r--r--kexdh.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/kexdh.c b/kexdh.c
index feea6697d..0bf0dc138 100644
--- a/kexdh.c
+++ b/kexdh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kexdh.c,v 1.25 2015/01/19 20:16:15 markus Exp $ */ 1/* $OpenBSD: kexdh.c,v 1.26 2016/05/02 10:26:04 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -43,6 +43,7 @@
43 43
44int 44int
45kex_dh_hash( 45kex_dh_hash(
46 int hash_alg,
46 const char *client_version_string, 47 const char *client_version_string,
47 const char *server_version_string, 48 const char *server_version_string,
48 const u_char *ckexinit, size_t ckexinitlen, 49 const u_char *ckexinit, size_t ckexinitlen,
@@ -56,7 +57,7 @@ kex_dh_hash(
56 struct sshbuf *b; 57 struct sshbuf *b;
57 int r; 58 int r;
58 59
59 if (*hashlen < ssh_digest_bytes(SSH_DIGEST_SHA1)) 60 if (*hashlen < ssh_digest_bytes(hash_alg))
60 return SSH_ERR_INVALID_ARGUMENT; 61 return SSH_ERR_INVALID_ARGUMENT;
61 if ((b = sshbuf_new()) == NULL) 62 if ((b = sshbuf_new()) == NULL)
62 return SSH_ERR_ALLOC_FAIL; 63 return SSH_ERR_ALLOC_FAIL;
@@ -79,12 +80,12 @@ kex_dh_hash(
79#ifdef DEBUG_KEX 80#ifdef DEBUG_KEX
80 sshbuf_dump(b, stderr); 81 sshbuf_dump(b, stderr);
81#endif 82#endif
82 if (ssh_digest_buffer(SSH_DIGEST_SHA1, b, hash, *hashlen) != 0) { 83 if (ssh_digest_buffer(hash_alg, b, hash, *hashlen) != 0) {
83 sshbuf_free(b); 84 sshbuf_free(b);
84 return SSH_ERR_LIBCRYPTO_ERROR; 85 return SSH_ERR_LIBCRYPTO_ERROR;
85 } 86 }
86 sshbuf_free(b); 87 sshbuf_free(b);
87 *hashlen = ssh_digest_bytes(SSH_DIGEST_SHA1); 88 *hashlen = ssh_digest_bytes(hash_alg);
88#ifdef DEBUG_KEX 89#ifdef DEBUG_KEX
89 dump_digest("hash", hash, *hashlen); 90 dump_digest("hash", hash, *hashlen);
90#endif 91#endif