lib/wolfHSM: pin to wolfHSM PR 348 head for NSC transport

Author: aidangarske

lib/wolfHSM

@@ -1159,10 +1159,10 @@ ifeq ($(WOLFCRYPT_TZ_WOLFHSM),1)
   CFLAGS+=-DWOLFCRYPT_SECURE_MODE
   CFLAGS+=-DWOLFHSM_CFG_ENABLE_SERVER
   CFLAGS+=-DWOLFHSM_CFG_COMM_DATA_LEN=1280
-  CFLAGS+=-DWOLFHSM_CFG_PORT_STM32_TZ_NSC
+  CFLAGS+=-DWOLFHSM_CFG_PORT_ARMV8M_TZ_NSC
   CFLAGS+=-DWOLFHSM_CFG_NO_SYS_TIME
   CFLAGS+=-I"$(WOLFBOOT_LIB_WOLFHSM)"
-  CFLAGS+=-I"$(WOLFBOOT_LIB_WOLFHSM)/port/stmicro/stm32-tz"
+  CFLAGS+=-I"$(WOLFBOOT_LIB_WOLFHSM)/port/armv8m-tz"
   ifeq ($(USE_CLANG),1)
     CLANG_MULTILIB_FLAGS:=$(filter -mthumb -mlittle-endian,$(LDFLAGS)) $(filter -mcpu=%,$(CFLAGS))
     LIBS+=$(shell $(CLANG_GCC_NAME) $(CLANG_MULTILIB_FLAGS) -print-file-name=libc.a)
@@ -1191,7 +1191,7 @@ ifeq ($(WOLFCRYPT_TZ_WOLFHSM),1)
   endif
   endif
   WOLFHSM_OBJS+=$(WOLFHSM_SERVER_OBJS)
-  WOLFHSM_OBJS+=$(WOLFBOOT_LIB_WOLFHSM)/port/stmicro/stm32-tz/wh_transport_nsc.o
+  WOLFHSM_OBJS+=$(WOLFBOOT_LIB_WOLFHSM)/port/armv8m-tz/wh_transport_nsc.o
   STACK_USAGE=20000
 endif
 

options.mk

@@ -382,18 +382,18 @@ ifeq ($(TZEN),1)
         CFLAGS+=-DWOLFCRYPT_TZ_WOLFHSM
         CFLAGS+=-DWOLFHSM_CFG_ENABLE_CLIENT
         CFLAGS+=-DWOLFHSM_CFG_COMM_DATA_LEN=1280
-        CFLAGS+=-DWOLFHSM_CFG_PORT_STM32_TZ_NSC
+        CFLAGS+=-DWOLFHSM_CFG_PORT_ARMV8M_TZ_NSC
         CFLAGS+=-DWOLFHSM_CFG_NO_SYS_TIME
         ifeq ($(WOLFBOOT_TZ_TEST_NO_BKPT),1)
             CFLAGS+=-DWOLFBOOT_TZ_TEST_NO_BKPT
         endif
         CFLAGS+=-I"$(WOLFBOOT_LIB_WOLFHSM)"
-        CFLAGS+=-I"$(WOLFBOOT_LIB_WOLFHSM)/port/stmicro/stm32-tz"
+        CFLAGS+=-I"$(WOLFBOOT_LIB_WOLFHSM)/port/armv8m-tz"
         WOLFCRYPT_APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/cryptocb.o
         APP_OBJS+=./wcs/wolfhsm_test.o
         APP_OBJS+=./wcs/wolfhsm_stub.o
         WOLFHSM_APP_OBJS+=$(WOLFHSM_CLIENT_OBJS)
-        WOLFHSM_APP_OBJS+=$(WOLFBOOT_LIB_WOLFHSM)/port/stmicro/stm32-tz/wh_transport_nsc.o
+        WOLFHSM_APP_OBJS+=$(WOLFBOOT_LIB_WOLFHSM)/port/armv8m-tz/wh_transport_nsc.o
         WOLFHSM_APP_OBJS:=$(patsubst $(WOLFBOOT_LIB_WOLFHSM)/%, \
             $(WOLFHSM_LOCAL_OBJDIR)/%, $(WOLFHSM_APP_OBJS))
         APP_OBJS+=$(sort $(WOLFHSM_APP_OBJS))

test-app/Makefile

@@ -8,7 +8,7 @@
 /*
  * Non-secure side static buffers + transport context for the wolfHSM TZ
  * NSC bridge. The transport callback table itself lives in the wolfHSM
- * port file (port/stmicro/stm32-tz/wh_transport_nsc.c); this stub just
+ * port file (port/armv8m-tz/wh_transport_nsc.c); this stub just
  * provides the singleton context it operates on.
  */