Merge pull request #10401 from night1rider/Early-heap-delcare-cmac

plumb caller heap into Cmac before cryptocb fires

wolfcrypt/src/cmac.c

@@ -126,6 +126,13 @@ static int _InitCmac_common(Cmac* cmac, const byte* key, word32 keySz,
 #endif
     XMEMSET(cmac, 0, sizeof(Cmac));
 
+    /* Stash heap so the cryptocb can read it from the zeroed cmac. */
+#ifndef NO_AES
+    cmac->aes.heap = heap;
+#else
+    cmac->heap = heap;
+#endif
+
     /* Store id/label on the Cmac struct so the crypto callback can
      * inspect them to determine the hardware key slot. */
 #ifdef WOLF_PRIVATE_KEY_ID

wolfssl/wolfcrypt/cmac.h

@@ -63,6 +63,8 @@ struct Cmac {
     byte digest[WC_AES_BLOCK_SIZE]; /* running digest */
     byte k1[WC_AES_BLOCK_SIZE];
     byte k2[WC_AES_BLOCK_SIZE];
+#else
+    void* heap; /* fallback when no aes.heap is available */
 #endif
     word32 bufferSz;
     word32 totalSz;