Added unit test NVM + ENCRYPTION, fix offset

Author: danielinux

src/libwolfboot.c

@@ -214,29 +214,6 @@ static int RAMFUNCTION nvm_select_fresh_sector(int part)
 #endif
     }
 
-#ifdef EXT_ENCRYPTED
-#ifndef FLAGS_HOME
-    if (part == PART_BOOT)
-#endif
-    {
-        word_0 = *((uint32_t *)(ENCRYPT_TMP_SECRET_OFFSET +
-            WOLFBOOT_PARTITION_BOOT_ADDRESS));
-        word_1 = *((uint32_t *)(ENCRYPT_TMP_SECRET_OFFSET +
-            WOLFBOOT_PARTITION_BOOT_ADDRESS - WOLFBOOT_SECTOR_SIZE));
-
-        if (word_0 == FLASH_WORD_ERASED && word_1 !=
-            FLASH_WORD_ERASED) {
-            sel = 1;
-            goto finish;
-        }
-        else if (word_0 != FLASH_WORD_ERASED && word_1 ==
-            FLASH_WORD_ERASED) {
-            sel = 0;
-            goto finish;
-        }
-    }
-#endif
-
     /* check magic in case the sector is corrupt */
     word_0 = *((uint32_t*)((uintptr_t)base - (magic_off + sizeof(uint32_t))));
     word_1 = *((uint32_t*)((uintptr_t)base - (WOLFBOOT_SECTOR_SIZE + magic_off +

tools/unit-tests/Makefile

@@ -17,7 +17,8 @@ WOLFCRYPT=../../lib/wolfssl/
 
 
 TESTS:=unit-parser unit-extflash unit-aes128 unit-aes256 unit-chacha20 unit-pci \
-	   unit-mock-state unit-sectorflags unit-image unit-nvm unit-nvm-flagshome
+	   unit-mock-state unit-sectorflags unit-image unit-nvm unit-nvm-flagshome \
+	   unit-enc-nvm unit-enc-nvm-flagshome
 
 all: $(TESTS)
 
@@ -35,22 +36,29 @@ run: $(TESTS)
 	done
 
 
+WOLFCRYPT_SRC:=$(WOLFCRYPT)/wolfcrypt/src/sha.c \
+               $(WOLFCRYPT)/wolfcrypt/src/sha256.c \
+               $(WOLFCRYPT)/wolfcrypt/src/sp_int.c \
+               $(WOLFCRYPT)/wolfcrypt/src/sp_c64.c \
+               $(WOLFCRYPT)/wolfcrypt/src/random.c \
+               $(WOLFCRYPT)/wolfcrypt/src/memory.c
+
 unit-aes128:CFLAGS+=-DEXT_ENCRYPTED -DENCRYPT_WITH_AES128
 unit-aes256:CFLAGS+=-DEXT_ENCRYPTED -DENCRYPT_WITH_AES256
 unit-chacha20:CFLAGS+=-DEXT_ENCRYPTED -DENCRYPT_WITH_CHACHA
 unit-parser:CFLAGS+=-DNVM_FLASH_WRITEONCE
 unit-nvm:CFLAGS+=-DNVM_FLASH_WRITEONCE -DMOCK_PARTITIONS
 unit-nvm-flagshome:CFLAGS+=-DNVM_FLASH_WRITEONCE -DMOCK_PARTITIONS -DFLAGS_HOME
+unit-enc-nvm:CFLAGS+=-DNVM_FLASH_WRITEONCE -DMOCK_PARTITIONS -DEXT_ENCRYPTED \
+	-DENCRYPT_WITH_CHACHA -DEXT_FLASH -DHAVE_CHACHA
+unit-enc-nvm:WOLFCRYPT_SRC+=$(WOLFCRYPT)/wolfcrypt/src/chacha.c
+unit-enc-nvm-flagshome:CFLAGS+=-DNVM_FLASH_WRITEONCE -DMOCK_PARTITIONS \
+	-DEXT_ENCRYPTED -DENCRYPT_WITH_CHACHA -DEXT_FLASH -DHAVE_CHACHA -DFLAGS_HOME
+unit-enc-nvm-flagshome:WOLFCRYPT_SRC+=$(WOLFCRYPT)/wolfcrypt/src/chacha.c
 
 
-WOLFCRYPT_SRC:=$(WOLFCRYPT)/wolfcrypt/src/sha.c \
-               $(WOLFCRYPT)/wolfcrypt/src/sha256.c \
-               $(WOLFCRYPT)/wolfcrypt/src/sp_int.c \
-               $(WOLFCRYPT)/wolfcrypt/src/sp_c64.c \
-               $(WOLFCRYPT)/wolfcrypt/src/random.c \
-               $(WOLFCRYPT)/wolfcrypt/src/memory.c
 
-WOLFCRYPT_CFLAGS+=-DWOLFSSL_USER_SETTINGS -DWOLFBOOT_SIGN_ECC256 -DWOLFBOOT_SIGN_ECC256 -DHAVE_ECC_KEY_IMPORT -DWOLFBOOT_HASH_SHA256 -D__WOLFBOOT
+WOLFCRYPT_CFLAGS+=-DWOLFSSL_USER_SETTINGS -DWOLFBOOT_SIGN_ECC256 -DWOLFBOOT_SIGN_ECC256 -DHAVE_ECC_KEY_IMPORT  -D__WOLFBOOT
 
 
 
@@ -94,6 +102,12 @@ unit-nvm: ../../include/target.h unit-nvm.c
 unit-nvm-flagshome: ../../include/target.h unit-nvm.c
 	gcc -o $@ unit-nvm.c $(CFLAGS) $(LDFLAGS)
 
+unit-enc-nvm: ../../include/target.h unit-enc-nvm.c
+	gcc -o $@ $(WOLFCRYPT_SRC) unit-enc-nvm.c $(CFLAGS) $(WOLFCRYPT_CFLAGS) $(LDFLAGS)
+
+unit-enc-nvm-flagshome: ../../include/target.h unit-enc-nvm.c
+	gcc -o $@ $(WOLFCRYPT_SRC) unit-enc-nvm.c $(CFLAGS) $(WOLFCRYPT_CFLAGS) $(LDFLAGS)
+
 %.o:%.c
 	gcc -c -o $@ $^ $(CFLAGS)