Merge pull request #129 from bigbrett/img-mgr

Add image manager

Author: billphipps

src/wh_server_img_mgr.c

@@ -178,6 +178,7 @@ SRC_C += \
             $(WOLFHSM_DIR)/src/wh_server_keystore.c \
             $(WOLFHSM_DIR)/src/wh_server_counter.c \
             $(WOLFHSM_DIR)/src/wh_server_cert.c \
+            $(WOLFHSM_DIR)/src/wh_server_img_mgr.c \
             $(WOLFHSM_DIR)/src/wh_nvm.c \
             $(WOLFHSM_DIR)/src/wh_comm.c \
             $(WOLFHSM_DIR)/src/wh_message_comm.c \
@@ -212,15 +213,16 @@ SRC_C += \
 
 # APP
 SRC_C += \
-            ./src/wh_test.c \
-            ./src/wh_test_comm.c \
-            ./src/wh_test_crypto.c \
-            ./src/wh_test_she.c \
-            ./src/wh_test_nvm_flash.c \
-            ./src/wh_test_clientserver.c \
-            ./src/wh_test_flash_ramsim.c \
-            ./src/wh_test_check_struct_padding.c \
-            ./src/wh_test_cert.c
+            wh_test.c \
+            wh_test_comm.c \
+            wh_test_crypto.c \
+            wh_test_she.c \
+            wh_test_nvm_flash.c \
+            wh_test_clientserver.c \
+            wh_test_flash_ramsim.c \
+            wh_test_check_struct_padding.c \
+            wh_test_cert.c \
+            wh_test_server_img_mgr.c
 
 ifeq ($(TESTWOLFCRYPT),1)
 SRC_C += ./src/wh_test_wolfcrypt_test.c

test/Makefile

@@ -42,4 +42,8 @@
 
 #define WOLFHSM_CFG_CERTIFICATE_MANAGER
 #define WOLFHSM_CFG_CERTIFICATE_MANAGER_ACERT
+
+/* Enable Image Manager feature */
+#define WOLFHSM_CFG_SERVER_IMG_MGR
+
 #endif /* WOLFHSM_CFG_H_ */

test/config/wolfhsm_cfg.h

@@ -45,6 +45,10 @@
 #include "wh_test_wolfcrypt_test.h"
 #endif
 
+#if defined(WOLFHSM_CFG_SERVER_IMG_MGR)
+#include "wh_test_server_img_mgr.h"
+#endif
+
 #if defined(WOLFHSM_CFG_TEST_POSIX) && defined(WOLFHSM_CFG_ENABLE_CLIENT)
 #include "port/posix/posix_transport_tcp.h"
 #endif
@@ -73,6 +77,11 @@ int whTest_Unit(void)
     /* Crypto Tests */
     WH_TEST_ASSERT(0 == whTest_Crypto());
 
+#if defined(WOLFHSM_CFG_SERVER_IMG_MGR) && !defined(WOLFHSM_CFG_NO_CRYPTO)
+    /* Image Manager Tests */
+    WH_TEST_ASSERT(0 == whTest_ServerImgMgr());
+#endif /* WOLFHSM_CFG_SERVER_IMG_MGR && !WOLFHSM_CFG_NO_CRYPTO */
+
 #if defined(WOLFHSM_CFG_SHE_EXTENSION)
     WH_TEST_ASSERT(0 == whTest_She());
 #endif /* WOLFHSM_SHE_EXTENTION */