Initialize wolfPKCS11 also in "_hwswap" mode

danielinux · danielinux · commit d573efa8c65c · 2024-05-24T13:23:22.000+02:00
diff --git a/src/update_flash_hwswap.c b/src/update_flash_hwswap.c
@@ -27,6 +27,9 @@
 #include "hal.h"
 #include "spi_flash.h"
 #include "wolfboot/wolfboot.h"
+#ifdef SECURE_PKCS11
+int WP11_Library_Init(void);
+#endif
 
 extern void hal_flash_dualbank_swap(void);
 
@@ -92,6 +95,9 @@ void RAMFUNCTION wolfBoot_start(void)
             hal_flash_lock();
         }
     }
+#ifdef SECURE_PKCS11
+    WP11_Library_Init();
+#endif
     hal_prepare_boot();
     do_boot((void *)(WOLFBOOT_PARTITION_BOOT_ADDRESS + IMAGE_HEADER_SIZE));
 }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,9 @@`
`27`	`27`	`#include "hal.h"`
`28`	`28`	`#include "spi_flash.h"`
`29`	`29`	`#include "wolfboot/wolfboot.h"`
	`30`	`+#ifdef SECURE_PKCS11`
	`31`	`+int WP11_Library_Init(void);`
	`32`	`+#endif`
`30`	`33`
`31`	`34`	`extern void hal_flash_dualbank_swap(void);`
`32`	`35`
`@@ -92,6 +95,9 @@ void RAMFUNCTION wolfBoot_start(void)`
`92`	`95`	`hal_flash_lock();`
`93`	`96`	`}`
`94`	`97`	`}`
	`98`	`+#ifdef SECURE_PKCS11`
	`99`	`+ WP11_Library_Init();`
	`100`	`+#endif`
`95`	`101`	`hal_prepare_boot();`
`96`	`102`	`do_boot((void *)(WOLFBOOT_PARTITION_BOOT_ADDRESS + IMAGE_HEADER_SIZE));`
`97`	`103`	`}`