porting libtomcrypt tests cases,update make config.

Signed-off-by: zhangchao53 <[email protected]>

crypto/libtomcrypt/Kconfig

@@ -79,4 +79,28 @@ endif # LIBTOMCRYPT_HASHSUM
 
 endif # LIBTOMCRYPT_DEMOS
 
+menuconfig LIBTOMCRYPT_TEST
+	tristate "Enable LibTomCrypt tests"
+	default n
+	---help---
+		Enable LibTomCrypt tests.
+
+if LIBTOMCRYPT_TEST
+
+config LIBTOMCRYPT_TEST_PROGNAME
+	string "Program name"
+	default "libtomcrypt_test"
+	---help---
+		LibTomCrypt test priority program name
+
+config LIBTOMCRYPT_TEST_PRIORITY
+	int "LibTomCrypt test priority"
+	default 100
+
+config LIBTOMCRYPT_TEST_STACKSIZE
+	int "LibTomCrypt test stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+endif # LIBTOMCRYPT_TEST
+
 endif # CRYPTO_LIBTOMCRYPT

crypto/libtomcrypt/Makefile

@@ -440,7 +440,8 @@ CSRCS += \
 
 CFLAGS += -DLTC_SOURCE -DLTM_DESC
 CFLAGS += -Wno-deprecated-declarations
-
+CFLAGS += -Dblake2s_init=libtomcrypt_blake2s_init
+CFLAGS += -Dmd5_init=libtomcrypt_md5_init
 #CFLAGS += -Wno-format
 
 ifneq ($(CONFIG_LIBTOMCRYPT_DEMOS),)
@@ -463,6 +464,23 @@ endif
 
 endif
 
+ifneq ($(CONFIG_LIBTOMCRYPT_TEST),)
+${shell mkdir -p $(BOARD_DIR)/resource/libtomcrypt}
+${shell cp libtomcrypt/tests/*.key $(BOARD_DIR)/resource/libtomcrypt}
+${shell cp libtomcrypt/tests/*.der $(BOARD_DIR)/resource/libtomcrypt}
+CFLAGS += -DKEY_DIR=\"/resource/libtomcrypt\"
+CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/crypto/libtomcrypt/libtomcrypt/tests
+CFLAGS += -Dbase64_decode=libtomcrypt_base64_decode
+CFLAGS += -Dbase64_encode=libtomcrypt_encode
+NEWSRC := $(wildcard libtomcrypt/tests/*.c)
+CSRCS += $(filter-out $(LIBTOMCRYPT_UNPACKNAME)/tests/test.c, $(NEWSRC))
+MAINSRC += $(LIBTOMCRYPT_UNPACKNAME)/tests/test.c
+
+PROGNAME += $(CONFIG_LIBTOMCRYPT_TEST_PROGNAME)
+PRIORITY  += $(CONFIG_LIBTOMCRYPT_TEST_PRIORITY)
+STACKSIZE += $(CONFIG_LIBTOMCRYPT_TEST_STACKSIZE)
+endif
+
 $(LIBTOMCRYPT_ZIP):
 	@echo "Downloading: $(LIBTOMCRYPT_ZIP)"
 	$(Q) curl -O -L $(CONFIG_LIBTOMCRYPT_URL)/$(LIBTOMCRYPT_ZIP)