Merge pull request wolfSSL#481 from danielinux/pkcs11-store-fixes

Refactoring of pkcs11_store.c module
philljj · Sep 6, 2024 · 21464f7 · 21464f7
2 parents 002dc8d + 865e3ee
commit 21464f7
Show file tree

Hide file tree

Showing 21 changed files with 1,170 additions and 429 deletions.
diff --git a/options.mk b/options.mk
@@ -843,3 +843,12 @@ endif
 ifeq ($(SIGN_ALG),ext_LMS)
   SIGN_ALG=LMS
 endif
+
+ifneq ($(KEYVAULT_OBJ_SIZE),)
+  CFLAGS+=-DKEYVAULT_OBJ_SIZE=$(KEYVAULT_OBJ_SIZE)
+endif
+
+ifneq ($(KEYVAULT_MAX_ITEMS),)
+  CFLAGS+=-DKEYVAULT_MAX_ITEMS=$(KEYVAULT_MAX_ITEMS)
+endif
+
diff --git a/src/image.c b/src/image.c
@@ -26,6 +26,9 @@
 #ifndef IMAGE_H_
 #define IMAGE_H_
 
+#ifdef UNIT_TEST
+#include <stdio.h>
+#endif
 #include <wolfssl/wolfcrypt/settings.h> /* for wolfCrypt hash/sign routines */
 
 #include <stddef.h>

diff --git a/src/libwolfboot.c b/src/libwolfboot.c
@@ -1504,13 +1504,13 @@ ChaCha chacha;
 int RAMFUNCTION chacha_init(void)
 {
 #if defined(MMU) || defined(UNIT_TEST)
-    uint8_t *key = ENCRYPT_KEY;
+    const uint8_t *key = ENCRYPT_KEY;
 #else
-    uint8_t *key = (uint8_t *)(WOLFBOOT_PARTITION_BOOT_ADDRESS +
+    const uint8_t *key = (uint8_t *)(WOLFBOOT_PARTITION_BOOT_ADDRESS +
         ENCRYPT_TMP_SECRET_OFFSET);
 #endif
     uint8_t ff[ENCRYPT_KEY_SIZE];
-    uint8_t* stored_nonce;
+    const uint8_t* stored_nonce;
 
 #ifdef NVM_FLASH_WRITEONCE
     key -= WOLFBOOT_SECTOR_SIZE * nvm_select_fresh_sector(PART_BOOT);