Reverting some fixes, revert wolfHSM to older version

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
-    src/wolfssl_hash_compat.c
+    lib/wolfssl/wolfcrypt/src/hash.c
     lib/wolfssl/wolfcrypt/src/logging.c
     lib/wolfssl/wolfcrypt/src/memory.c
     lib/wolfssl/wolfcrypt/src/random.c

arch.mk

@@ -1488,8 +1488,6 @@ ifeq ($(ARCH),sim)
     WH_NVM_HEX ?= whNvmImage.hex
     WH_NVM_PART_SIZE ?= 16384 # must match partition size in hal/sim.c
     WH_NVM_BASE_ADDRESS ?= 0x0
-
-    CFLAGS += -DWOLFHSM_CFG_NO_SYS_TIME
   endif
 endif
 
@@ -1514,8 +1512,7 @@ ifeq ($(ARCH), AURIX_TC3)
     # Makefile shennanigans for "if (WOLFHSM_CLIENT==1 || WOLFHSM_SERVER==1)"
     ifneq ($(filter 1,$(WOLFHSM_CLIENT) $(WOLFHSM_SERVER)),)
       # Common wolfHSM port files
-      CFLAGS += -I$(WOLFHSM_INFINEON_TC3XX)/port -DWOLFHSM_CFG_DMA \
-                -DWOLFHSM_CFG_NO_SYS_TIME
+      CFLAGS += -I$(WOLFHSM_INFINEON_TC3XX)/port -DWOLFHSM_CFG_DMA
       OBJS += $(WOLFHSM_INFINEON_TC3XX)/port/tchsm_common.o \
               $(WOLFHSM_INFINEON_TC3XX)/port/tchsm_hsmhost.o
       # General wolfHSM files
@@ -1583,7 +1580,8 @@ ifeq ($(ARCH), AURIX_TC3)
       ifeq ($(WOLFHSM_SERVER),1)
         USE_GCC_HEADLESS=0
 
-        CFLAGS += -I$(WOLFHSM_INFINEON_TC3XX)/port/server
+        CFLAGS += -I$(WOLFHSM_INFINEON_TC3XX)/port/server \
+				  -I$(WOLFHSM_INFINEON_TC3XX)/port/server/config
 
         OBJS += $(WOLFHSM_INFINEON_TC3XX)/port/server/port_halflash_df1.o \
           $(WOLFHSM_INFINEON_TC3XX)/port/server/io.o \
@@ -1666,9 +1664,8 @@ ifeq ($(ARCH), AURIX_TC3)
 
       ifeq ($(WOLFHSM_CLIENT),1)
         CFLAGS += -I$(WOLFHSM_INFINEON_TC3XX)/port/client
-        OBJS += $(WOLFHSM_INFINEON_TC3XX)/port/client/hsm_ipc.o \
-                $(WOLFHSM_INFINEON_TC3XX)/port/client/io.o \
-                $(WOLFHSM_INFINEON_TC3XX)/port/client/tchsm_hh_host.o
+		# All source files in port/client but listed as *.o files
+        OBJS += $(patsubst %.c,%.o,$(wildcard $(WOLFHSM_INFINEON_TC3XX)/port/client/*.c))
       endif
 
     endif # !AURIX_TC3_HSM

hal/aurix_tc3xx.c

@@ -89,6 +89,7 @@
 /* wolfHSM client context and configuration */
 #if defined(WOLFBOOT_ENABLE_WOLFHSM_CLIENT)
 
+static int _cancelCb(uint16_t cancelSeq);
 static int _connectCb(void* context, whCommConnected connect);
 
 /* Client configuration/contexts */
@@ -707,6 +708,13 @@ RAMFUNCTION void ext_flash_unlock(void)
 
 #ifdef WOLFBOOT_ENABLE_WOLFHSM_CLIENT
 
+static int _cancelCb(uint16_t cancelSeq)
+{
+    HSM_SHM_CORE0_CANCEL_SEQ = cancelSeq;
+    (void)tchsmHhHost2Hsm_Notify(TCHSM_HOST2HSM_NOTIFY_CANCEL);
+    return 0;
+}
+
 static int _connectCb(void* context, whCommConnected connect)
 {
     int ret;
@@ -754,6 +762,7 @@ int hal_hsm_init_connect(void)
 
     whClientConfig c_conf[1] = {{
         .comm     = cc_conf,
+        .cancelCb = _cancelCb,
     }};
 
     rc = hsm_ipc_init();

hal/sim.c

@@ -183,7 +183,9 @@ whCommServerConfig cs_conf[1] = {{
 }};
 
 /* Crypto context */
-whServerCryptoContext crypto[1] = {{0}};
+whServerCryptoContext crypto[1] = {{
+    .devId = INVALID_DEVID,
+}};
 
 #if defined(WOLFHSM_CFG_SHE_EXTENSION)
 whServerSheContext    she[1]    = {{0}};
@@ -193,9 +195,6 @@ whServerConfig s_conf[1] = {{
     .comm_config = cs_conf,
     .nvm         = nvm,
     .crypto      = crypto,
-#if defined(WOLF_CRYPTO_CB)
-    .devId       = INVALID_DEVID,
-#endif
 }};
 
 whServerContext hsmServerCtx = {0};

lib/wolfHSM

@@ -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
-            ../src/wolfssl_hash_compat.c
+            ../lib/wolfssl/wolfcrypt/src/hash.c
             ../lib/wolfssl/wolfcrypt/src/sha256.c
             ../lib/wolfssl/wolfcrypt/src/sha512.c
             ../lib/wolfssl/wolfcrypt/src/sha3.c

lib/wolfssl

@@ -134,7 +134,7 @@ ifeq ($(WOLFCRYPT_SUPPORT),1)
   APP_OBJS+=syscalls.o
 
   # Add wolfCrypt core implementation files
-  APP_OBJS+=../src/wolfssl_hash_compat.o
+  APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/hash.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 \
-            ../src/wolfssl_hash_compat.o \
+            $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/hash.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+=../src/wolfssl_hash_compat.o
+            APP_OBJS+=./wcs/hash.o
             APP_OBJS+=./wcs/sha256.o
             APP_OBJS+=./wcs/sha512.o
             APP_OBJS+=./wcs/sha3.o

src/wolfssl_hash_compat.c

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