Workaround regression in wolfSSL (missing include in asn.h)

Author: danielinux

CMakeLists.txt

@@ -1200,7 +1200,7 @@ list(
     lib/wolfssl/wolfcrypt/src/ge_operations.c
     lib/wolfssl/wolfcrypt/src/fe_448.c
     lib/wolfssl/wolfcrypt/src/ge_448.c
-    lib/wolfssl/wolfcrypt/src/hash.c
+    src/wolfssl_hash_compat.c
     lib/wolfssl/wolfcrypt/src/logging.c
     lib/wolfssl/wolfcrypt/src/memory.c
     lib/wolfssl/wolfcrypt/src/random.c

lib/wolfTPM

@@ -0,0 +1,8 @@
+/* wolfssl_hash_compat.c
+ *
+ * Temporary wolfBoot-side wrapper for wolfSSL hash.c until the upstream
+ * header dependency regression is fixed.
+ */
+
+#include <wolfssl/wolfcrypt/sha512.h>
+#include "../lib/wolfssl/wolfcrypt/src/hash.c"

src/wolfssl_hash_compat.c

@@ -207,7 +207,7 @@ if(BUILD_TEST_APPS)
             ../lib/wolfssl/wolfcrypt/src/aes.c
             ../lib/wolfssl/wolfcrypt/src/hmac.c
             ../lib/wolfssl/wolfcrypt/src/pwdbased.c
-            ../lib/wolfssl/wolfcrypt/src/hash.c
+            ../src/wolfssl_hash_compat.c
             ../lib/wolfssl/wolfcrypt/src/sha256.c
             ../lib/wolfssl/wolfcrypt/src/sha512.c
             ../lib/wolfssl/wolfcrypt/src/sha3.c

test-app/CMakeLists.txt

@@ -134,7 +134,7 @@ ifeq ($(WOLFCRYPT_SUPPORT),1)
   APP_OBJS+=syscalls.o
 
   # Add wolfCrypt core implementation files
-  APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/hash.o
+  APP_OBJS+=../src/wolfssl_hash_compat.o
   APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/wc_port.o
   APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/logging.o
   APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/misc.o
@@ -223,7 +223,7 @@ ifeq ($(TZEN),1)
         APP_OBJS+=../src/wc_secure_calls.o
         WOLFCRYPT_APP_OBJS+=\
             $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/memory.o \
-            $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/hash.o \
+            ../src/wolfssl_hash_compat.o \
             $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/sha.o \
             $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/sha256.o \
             $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/sha512.o \
@@ -261,7 +261,7 @@ ifeq ($(TZEN),1)
             APP_OBJS+=./wcs/aes.o
             APP_OBJS+=./wcs/hmac.o
             APP_OBJS+=./wcs/pwdbased.o
-            APP_OBJS+=./wcs/hash.o
+            APP_OBJS+=./wcs/hash_compat.o
             APP_OBJS+=./wcs/sha256.o
             APP_OBJS+=./wcs/sha512.o
             APP_OBJS+=./wcs/sha3.o

test-app/Makefile

@@ -0,0 +1,6 @@
+/* hash_compat.c
+ *
+ * Temporary wrapper for PKCS11 test-app builds.
+ */
+
+#include "../../src/wolfssl_hash_compat.c"

test-app/wcs/hash_compat.c

@@ -50,7 +50,7 @@ OBJS_REAL=\
 	$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/ecc.o \
 	$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/error.o \
 	$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/coding.o \
-	$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/hash.o \
+	$(WOLFBOOTDIR)/src/wolfssl_hash_compat.o \
 	$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/logging.o \
 	$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/memory.o \
 	$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/random.o \