From 52f3dc6aa47355fd421d254cf3f970c4debdb308 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Wed, 12 Jan 2022 17:46:39 -0600
Subject: [PATCH] hcrypto: HMAC_Init_Ex(): return int like OpenSSL

---
 lib/hcrypto/hmac.c | 23 +++++++++++++++++------
 lib/hcrypto/hmac.h |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/lib/hcrypto/hmac.c b/lib/hcrypto/hmac.c
index 6cdf4e97a..c5265310f 100644
--- a/lib/hcrypto/hmac.c
+++ b/lib/hcrypto/hmac.c
@@ -85,7 +85,7 @@ HMAC_size(const HMAC_CTX *ctx)
     return EVP_MD_size(ctx->md);
 }
 
-void
+int
 HMAC_Init_ex(HMAC_CTX *ctx,
 	     const void *key,
 	     size_t keylen,
@@ -103,17 +103,26 @@ HMAC_Init_ex(HMAC_CTX *ctx,
 
 	ctx->md = md;
 	ctx->key_length = EVP_MD_size(ctx->md);
+        ctx->opad = NULL;
+        ctx->ipad = NULL;
+        ctx->ctx = NULL;
 	ctx->buf = malloc(ctx->key_length);
-        ctx->opad = malloc(blockSize);
-        ctx->ipad = malloc(blockSize);
-        ctx->ctx = EVP_MD_CTX_create();
+        if (ctx->buf)
+            ctx->opad = malloc(blockSize);
+        if (ctx->opad)
+            ctx->ipad = malloc(blockSize);
+        if (ctx->ipad)
+            ctx->ctx = EVP_MD_CTX_create();
+        if (!ctx->buf || !ctx->opad || !ctx->ipad || !ctx->ctx)
+            return 0;
     }
 #if 0
     ctx->engine = engine;
 #endif
 
     if (keylen > blockSize) {
-	EVP_Digest(key, keylen, ctx->buf, NULL, ctx->md, engine);
+	if (EVP_Digest(key, keylen, ctx->buf, NULL, ctx->md, engine) == 0)
+            return 0;
 	key = ctx->buf;
 	keylen = EVP_MD_size(ctx->md);
     }
@@ -126,8 +135,10 @@ HMAC_Init_ex(HMAC_CTX *ctx,
     for (i = 0, p = ctx->opad; i < keylen; i++)
 	p[i] ^= ((const unsigned char *)key)[i];
 
-    EVP_DigestInit_ex(ctx->ctx, ctx->md, ctx->engine);
+    if (EVP_DigestInit_ex(ctx->ctx, ctx->md, ctx->engine) == 0)
+        return 0;
     EVP_DigestUpdate(ctx->ctx, ctx->ipad, EVP_MD_block_size(ctx->md));
+    return 1;
 }
 
 void
diff --git a/lib/hcrypto/hmac.h b/lib/hcrypto/hmac.h
index 2c7d9b880..cc99c879f 100644
--- a/lib/hcrypto/hmac.h
+++ b/lib/hcrypto/hmac.h
@@ -75,7 +75,7 @@ void    HMAC_CTX_free(HMAC_CTX *ctx);
 
 size_t	HMAC_size(const HMAC_CTX *ctx);
 
-void	HMAC_Init_ex(HMAC_CTX *, const void *, size_t,
+int	HMAC_Init_ex(HMAC_CTX *, const void *, size_t,
 		     const EVP_MD *, ENGINE *);
 void	HMAC_Update(HMAC_CTX *ctx, const void *data, size_t len);
 void	HMAC_Final(HMAC_CTX *ctx, void *md, unsigned int *len);