From 88cb25164c0b997c3023b849dcb0285f58454a68 Mon Sep 17 00:00:00 2001
From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Thu, 15 Aug 2019 16:48:09 -0700
Subject: [PATCH] Updated HMAC code for OpenSSL 1.1.0. #409

---
 mz_crypt_openssl.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/mz_crypt_openssl.c b/mz_crypt_openssl.c
index 7c5472c..51b503c 100644
--- a/mz_crypt_openssl.c
+++ b/mz_crypt_openssl.c
@@ -13,6 +13,7 @@
 #include "mz.h"
 
 #include <openssl/err.h>
+#include <openssl/engine.h>
 #include <openssl/rand.h>
 #include <openssl/sha.h>
 #include <openssl/aes.h>
@@ -33,6 +34,9 @@ static void mz_crypt_init(void)
         ERR_load_BIO_strings();
         ERR_load_crypto_strings();
 
+        ENGINE_load_builtin_engines();
+        ENGINE_register_all_complete();
+
         openssl_initialized = 1;
     }
 }
@@ -310,7 +314,7 @@ void mz_crypt_aes_delete(void **handle)
 /***************************************************************************/
 
 typedef struct mz_crypt_hmac_s {
-    HMAC_CTX   ctx;
+    HMAC_CTX   *ctx;
     int32_t    initialized;
     int32_t    error;
     uint16_t   algorithm;
@@ -322,7 +326,8 @@ void mz_crypt_hmac_reset(void *handle)
 {
     mz_crypt_hmac *hmac = (mz_crypt_hmac *)handle;
 
-    HMAC_CTX_cleanup(&hmac->ctx);
+    HMAC_CTX_free(hmac->ctx);
+    hmac->ctx = NULL;
     hmac->error = 0;
 
     mz_crypt_init();
@@ -339,12 +344,14 @@ int32_t mz_crypt_hmac_init(void *handle, const void *key, int32_t key_length)
 
     mz_crypt_hmac_reset(handle);
 
+    hmac->ctx = HMAC_CTX_new();
+
     if (hmac->algorithm == MZ_HASH_SHA1)
         evp_md = EVP_sha1();
     else
         evp_md = EVP_sha256();
 
-    result = HMAC_Init(&hmac->ctx, key, key_length, evp_md);
+    result = HMAC_Init_ex(hmac->ctx, key, key_length, evp_md, NULL);
     if (!result)
     {
         hmac->error = ERR_get_error();
@@ -362,7 +369,7 @@ int32_t mz_crypt_hmac_update(void *handle, const void *buf, int32_t size)
     if (hmac == NULL || buf == NULL)
         return MZ_PARAM_ERROR;
 
-    result = HMAC_Update(&hmac->ctx, buf, size);
+    result = HMAC_Update(hmac->ctx, buf, size);
     if (!result)
     {
         hmac->error = ERR_get_error();
@@ -385,13 +392,13 @@ int32_t mz_crypt_hmac_end(void *handle, uint8_t *digest, int32_t digest_size)
         if (digest_size < MZ_HASH_SHA1_SIZE)
             return MZ_BUF_ERROR;
 
-        result = HMAC_Final(&hmac->ctx, digest, (uint32_t *)&digest_size);
+        result = HMAC_Final(hmac->ctx, digest, (uint32_t *)&digest_size);
     }
     else
     {
         if (digest_size < MZ_HASH_SHA256_SIZE)
             return MZ_BUF_ERROR;
-        result = HMAC_Final(&hmac->ctx, digest, (uint32_t *)&digest_size);
+        result = HMAC_Final(hmac->ctx, digest, (uint32_t *)&digest_size);
     }
 
     if (!result)
@@ -419,7 +426,7 @@ int32_t mz_crypt_hmac_copy(void *src_handle, void *target_handle)
         return MZ_PARAM_ERROR;
 
     mz_crypt_hmac_reset(target_handle);
-    result = HMAC_CTX_copy(&target->ctx, &source->ctx);
+    result = HMAC_CTX_copy(target->ctx, source->ctx);
     if (!result)
     {
         target->error = ERR_get_error();