From 03a32250dadbec90aad1076b85fbb258e36daa53 Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Fri, 8 Jul 2022 09:06:30 -0700
Subject: [PATCH] Fix for KCAPI HMAC forcing use of software for HKDF.

---
 wolfcrypt/src/hmac.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/wolfcrypt/src/hmac.c b/wolfcrypt/src/hmac.c
index 7cb64e3b6..fe954e5ad 100644
--- a/wolfcrypt/src/hmac.c
+++ b/wolfcrypt/src/hmac.c
@@ -57,6 +57,7 @@
 #ifdef WOLFSSL_KCAPI_HMAC
     #include <wolfssl/wolfcrypt/port/kcapi/kcapi_hmac.h>
 
+    /* map the _Software calls used by kcapi_hmac.c */
     #define wc_HmacSetKey  wc_HmacSetKey_Software
     #define wc_HmacUpdate  wc_HmacUpdate_Software
     #define wc_HmacFinal   wc_HmacFinal_Software
@@ -994,6 +995,11 @@ int wc_HmacFinal(Hmac* hmac, byte* hash)
 #ifdef WOLFSSL_KCAPI_HMAC
     /* implemented in wolfcrypt/src/port/kcapi/kcapi_hmac.c */
 
+    /* unmap the _Software calls used by kcapi_hmac.c */
+    #undef wc_HmacSetKey
+    #undef wc_HmacUpdate
+    #undef wc_HmacFinal
+
 #else
 /* Initialize Hmac for use with async device */
 int wc_HmacInit(Hmac* hmac, void* heap, int devId)