diff options
| author | Damien Miller <djm@mindrot.org> | 2014-07-03 21:23:24 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-07-03 21:23:24 +1000 |
| commit | c174a3b7c14e0d178c61219de2aa1110e209950c (patch) | |
| tree | 58486e26093e815daeb397dd5d48ac9cb757689c /digest-openssl.c | |
| parent | d7ca2cd31ecc4d63a055e2dcc4bf35c13f2db4c5 (diff) | |
| download | openssh-git-c174a3b7c14e0d178c61219de2aa1110e209950c.tar.gz | |
- djm@cvs.openbsd.org 2014/07/03 03:26:43
[digest-openssl.c]
use EVP_Digest() for one-shot hash instead of creating, updating,
finalising and destroying a context.
bz#2231, based on patch from Timo Teras
Diffstat (limited to 'digest-openssl.c')
| -rw-r--r-- | digest-openssl.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/digest-openssl.c b/digest-openssl.c index 7ec6bd26..6e8bf15d 100644 --- a/digest-openssl.c +++ b/digest-openssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: digest-openssl.c,v 1.3 2014/06/24 01:13:21 djm Exp $ */ +/* $OpenBSD: digest-openssl.c,v 1.4 2014/07/03 03:26:43 djm Exp $ */ /* * Copyright (c) 2013 Damien Miller <djm@mindrot.org> * @@ -153,15 +153,18 @@ ssh_digest_free(struct ssh_digest_ctx *ctx) int ssh_digest_memory(int alg, const void *m, size_t mlen, u_char *d, size_t dlen) { - struct ssh_digest_ctx *ctx = ssh_digest_start(alg); - int r; + const struct ssh_digest *digest = ssh_digest_by_alg(alg); + u_int mdlen; - if (ctx == NULL) + if (digest == NULL) + return SSH_ERR_INVALID_ARGUMENT; + if (dlen > UINT_MAX) return SSH_ERR_INVALID_ARGUMENT; - if ((r = ssh_digest_update(ctx, m, mlen) != 0) || - (r = ssh_digest_final(ctx, d, dlen) != 0)) - return r; - ssh_digest_free(ctx); + if (dlen < digest->digest_len) + return SSH_ERR_INVALID_ARGUMENT; + mdlen = dlen; + if (!EVP_Digest(m, mlen, d, &mdlen, digest->mdfunc(), NULL)) + return SSH_ERR_LIBCRYPTO_ERROR; return 0; } |