1 files changed, 38 insertions, 22 deletions

diff --git a/digest-openssl.c b/digest-openssl.c
index 863d37d03..02b170341 100644
--- a/digest-openssl.c
+++ b/digest-openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: digest-openssl.c,v 1.2 2014/02/02 03:44:31 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>
  *
@@ -26,8 +26,18 @@
 
 #include "openbsd-compat/openssl-compat.h"
 
-#include "buffer.h"
+#include "sshbuf.h"
 #include "digest.h"
+#include "ssherr.h"
+
+#ifndef HAVE_EVP_RIPEMD160
+# define EVP_ripemd160 NULL
+#endif /* HAVE_EVP_RIPEMD160 */
+#ifndef HAVE_EVP_SHA256
+# define EVP_sha256 NULL
+# define EVP_sha384 NULL
+# define EVP_sha512 NULL
+#endif /* HAVE_EVP_SHA256 */
 
 struct ssh_digest_ctx {
         int alg;
@@ -46,11 +56,9 @@ const struct ssh_digest digests[] = {
         { SSH_DIGEST_MD5,       "MD5",          16,     EVP_md5 },
         { SSH_DIGEST_RIPEMD160, "RIPEMD160",    20,     EVP_ripemd160 },
         { SSH_DIGEST_SHA1,      "SHA1",         20,     EVP_sha1 },
-#ifdef HAVE_EVP_SHA256 /* XXX replace with local if missing */
         { SSH_DIGEST_SHA256,    "SHA256",       32,     EVP_sha256 },
         { SSH_DIGEST_SHA384,    "SHA384",       48,     EVP_sha384 },
         { SSH_DIGEST_SHA512,    "SHA512",       64,     EVP_sha512 },
-#endif
         { -1,                   NULL,           0,      NULL },
 };
 
@@ -61,6 +69,8 @@ ssh_digest_by_alg(int alg)
                 return NULL;
         if (digests[alg].id != alg) /* sanity */
                 return NULL;
+        if (digests[alg].mdfunc == NULL)
+                return NULL;
         return &(digests[alg]);
 }
 
@@ -98,9 +108,11 @@ ssh_digest_start(int alg)
 int
 ssh_digest_copy_state(struct ssh_digest_ctx *from, struct ssh_digest_ctx *to)
 {
+        if (from->alg != to->alg)
+                return SSH_ERR_INVALID_ARGUMENT;
         /* we have bcopy-style order while openssl has memcpy-style */
         if (!EVP_MD_CTX_copy_ex(&to->mdctx, &from->mdctx))
-                return -1;
+                return SSH_ERR_LIBCRYPTO_ERROR;
         return 0;
 }
 
@@ -108,14 +120,14 @@ int
 ssh_digest_update(struct ssh_digest_ctx *ctx, const void *m, size_t mlen)
 {
         if (EVP_DigestUpdate(&ctx->mdctx, m, mlen) != 1)
-                return -1;
+                return SSH_ERR_LIBCRYPTO_ERROR;
         return 0;
 }
 
 int
-ssh_digest_update_buffer(struct ssh_digest_ctx *ctx, const Buffer *b)
+ssh_digest_update_buffer(struct ssh_digest_ctx *ctx, const struct sshbuf *b)
 {
-        return ssh_digest_update(ctx, buffer_ptr(b), buffer_len(b));
+        return ssh_digest_update(ctx, sshbuf_ptr(b), sshbuf_len(b));
 }
 
 int
@@ -125,13 +137,13 @@ ssh_digest_final(struct ssh_digest_ctx *ctx, u_char *d, size_t dlen)
         u_int l = dlen;
 
         if (dlen > UINT_MAX)
-                return -1;
+                return SSH_ERR_INVALID_ARGUMENT;
         if (dlen < digest->digest_len) /* No truncation allowed */
-                return -1;
+                return SSH_ERR_INVALID_ARGUMENT;
         if (EVP_DigestFinal_ex(&ctx->mdctx, d, &l) != 1)
-                return -1;
+                return SSH_ERR_LIBCRYPTO_ERROR;
         if (l != digest->digest_len) /* sanity */
-                return -1;
+                return SSH_ERR_INTERNAL_ERROR;
         return 0;
 }
 
@@ -148,19 +160,23 @@ 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);
-
-        if (ctx == NULL)
-                return -1;
-        if (ssh_digest_update(ctx, m, mlen) != 0 ||
-            ssh_digest_final(ctx, d, dlen) != 0)
-                return -1;
-        ssh_digest_free(ctx);
+        const struct ssh_digest *digest = ssh_digest_by_alg(alg);
+        u_int mdlen;
+
+        if (digest == NULL)
+                return SSH_ERR_INVALID_ARGUMENT;
+        if (dlen > UINT_MAX)
+                return SSH_ERR_INVALID_ARGUMENT;
+        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;
 }
 
 int
-ssh_digest_buffer(int alg, const Buffer *b, u_char *d, size_t dlen)
+ssh_digest_buffer(int alg, const struct sshbuf *b, u_char *d, size_t dlen)
 {
-        return ssh_digest_memory(alg, buffer_ptr(b), buffer_len(b), d, dlen);
+        return ssh_digest_memory(alg, sshbuf_ptr(b), sshbuf_len(b), d, dlen);
 }