upstream: hold our collective noses and use the openssl-1.1.x API in

OpenSSH; feedback and ok tb@ jsing@ markus@

OpenBSD-Commit-ID: cacbcac87ce5da0d3ca7ef1b38a6f7fb349e4417

1 files changed, 14 insertions, 12 deletions

diff --git a/digest-openssl.c b/digest-openssl.c
index 277099929..da7ed72bc 100644
--- a/digest-openssl.c
+++ b/digest-openssl.c
@@ -43,7 +43,7 @@
 
 struct ssh_digest_ctx {
         int alg;
-        EVP_MD_CTX mdctx;
+        EVP_MD_CTX *mdctx;
 };
 
 struct ssh_digest {
@@ -106,7 +106,7 @@ ssh_digest_bytes(int alg)
 size_t
 ssh_digest_blocksize(struct ssh_digest_ctx *ctx)
 {
-        return EVP_MD_CTX_block_size(&ctx->mdctx);
+        return EVP_MD_CTX_block_size(ctx->mdctx);
 }
 
 struct ssh_digest_ctx *
@@ -118,11 +118,14 @@ ssh_digest_start(int alg)
         if (digest == NULL || ((ret = calloc(1, sizeof(*ret))) == NULL))
                 return NULL;
         ret->alg = alg;
-        EVP_MD_CTX_init(&ret->mdctx);
-        if (EVP_DigestInit_ex(&ret->mdctx, digest->mdfunc(), NULL) != 1) {
+        if ((ret->mdctx = EVP_MD_CTX_new()) == NULL) {
                 free(ret);
                 return NULL;
         }
+        if (EVP_DigestInit_ex(ret->mdctx, digest->mdfunc(), NULL) != 1) {
+                ssh_digest_free(ret);
+                return NULL;
+        }
         return ret;
 }
 
@@ -132,7 +135,7 @@ 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))
+        if (!EVP_MD_CTX_copy_ex(to->mdctx, from->mdctx))
                 return SSH_ERR_LIBCRYPTO_ERROR;
         return 0;
 }
@@ -140,7 +143,7 @@ ssh_digest_copy_state(struct ssh_digest_ctx *from, struct ssh_digest_ctx *to)
 int
 ssh_digest_update(struct ssh_digest_ctx *ctx, const void *m, size_t mlen)
 {
-        if (EVP_DigestUpdate(&ctx->mdctx, m, mlen) != 1)
+        if (EVP_DigestUpdate(ctx->mdctx, m, mlen) != 1)
                 return SSH_ERR_LIBCRYPTO_ERROR;
         return 0;
 }
@@ -161,7 +164,7 @@ ssh_digest_final(struct ssh_digest_ctx *ctx, u_char *d, size_t dlen)
                 return SSH_ERR_INVALID_ARGUMENT;
         if (dlen < digest->digest_len) /* No truncation allowed */
                 return SSH_ERR_INVALID_ARGUMENT;
-        if (EVP_DigestFinal_ex(&ctx->mdctx, d, &l) != 1)
+        if (EVP_DigestFinal_ex(ctx->mdctx, d, &l) != 1)
                 return SSH_ERR_LIBCRYPTO_ERROR;
         if (l != digest->digest_len) /* sanity */
                 return SSH_ERR_INTERNAL_ERROR;
@@ -171,11 +174,10 @@ ssh_digest_final(struct ssh_digest_ctx *ctx, u_char *d, size_t dlen)
 void
 ssh_digest_free(struct ssh_digest_ctx *ctx)
 {
-        if (ctx != NULL) {
-                EVP_MD_CTX_cleanup(&ctx->mdctx);
-                explicit_bzero(ctx, sizeof(*ctx));
-                free(ctx);
-        }
+        if (ctx == NULL)
+                return;
+        EVP_MD_CTX_free(ctx->mdctx);
+        freezero(ctx, sizeof(*ctx));
 }
 
 int