WolfSSL
/
wolfBoot
mirror of https://github.com/wolfSSL/wolfBoot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed debug print, added PKCS11_SMALL, fixes

pull/455/head
Daniele Lacamera 2024-06-17 17:39:39 +02:00 committed by David Garske
parent 16bdc19914
commit 11ce50f6c1
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hal/stm32_tz.c
View File

@ -128,7 +128,6 @@ void hal_tz_claim_nonsecure_area(uint32_t address, int len)
address += FLASH_PAGE_SIZE; address += FLASH_PAGE_SIZE;
page_n++; page_n++;
} }
address = start_address; address = start_address;
while (address < end) { while (address < end) {
/* Erase claimed non-secure page, in secure mode */ /* Erase claimed non-secure page, in secure mode */
@ -141,10 +140,12 @@ void hal_tz_claim_nonsecure_area(uint32_t address, int len)
#endif #endif
DMB(); DMB();
ISB();
FLASH_CR |= FLASH_CR_STRT; FLASH_CR |= FLASH_CR_STRT;
ISB(); ISB();
hal_flash_wait_complete(bank); hal_flash_wait_complete(bank);
address += FLASH_PAGE_SIZE; address += FLASH_PAGE_SIZE;
page_n++;
} }
#ifndef PLATFORM_stm32h5 #ifndef PLATFORM_stm32h5
FLASH_CR &= ~FLASH_CR_PER ; FLASH_CR &= ~FLASH_CR_PER ;

17
hal/stm32h5.c
View File

@ -93,13 +93,9 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
int i = 0; int i = 0;
uint32_t *src, *dst; uint32_t *src, *dst;
uint32_t dword[2]; uint32_t dword[2];
volatile uint32_t *sr, *cr;
uint32_t off = 0; uint32_t off = 0;
uint32_t una_len = 0; uint32_t una_len = 0;
cr = &FLASH_CR;
sr = &FLASH_SR;
hal_flash_clear_errors(0); hal_flash_clear_errors(0);
src = (uint32_t *)data; src = (uint32_t *)data;
dst = (uint32_t *)address; dst = (uint32_t *)address;
@ -118,15 +114,15 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
dword[1] = src[(i >> 2) + 1]; dword[1] = src[(i >> 2) + 1];
else else
dword[1] = 0xFFFFFFFF; dword[1] = 0xFFFFFFFF;
*cr |= FLASH_CR_PG; FLASH_CR |= FLASH_CR_PG;
dst[i >> 2] = dword[0]; dst[i >> 2] = dword[0];
ISB(); ISB();
dst[(i >> 2) + 1] = dword[1]; dst[(i >> 2) + 1] = dword[1];
ISB(); ISB();
hal_flash_wait_complete(0); hal_flash_wait_complete(0);
if ((*sr & FLASH_SR_EOP) != 0) if ((FLASH_SR & FLASH_SR_EOP) != 0)
*sr |= FLASH_SR_EOP; FLASH_SR |= FLASH_SR_EOP;
*cr &= ~FLASH_CR_PG; FLASH_CR &= ~FLASH_CR_PG;
i+=8; i+=8;
} }
#if (TZ_SECURE()) #if (TZ_SECURE())
@ -215,11 +211,6 @@ int RAMFUNCTION hal_flash_erase(uint32_t address, int len)
/* Check for swapped banks to invert bnksel */ /* Check for swapped banks to invert bnksel */
if ((FLASH_OPTSR_CUR & FLASH_OPTSR_SWAP_BANK) >> 31) if ((FLASH_OPTSR_CUR & FLASH_OPTSR_SWAP_BANK) >> 31)
bnksel = !bnksel; bnksel = !bnksel;
#if !TZ_SECURE() && !defined(__FLASH_OTP_PRIMER) && defined(DEBUG)
printf("Erasing bank %d, page %d\r\n", bnksel, (p - base) >> 13);
#endif
reg |= ((((p - base) >> 13) << FLASH_CR_PNB_SHIFT) | FLASH_CR_SER | (bnksel << 31)); reg |= ((((p - base) >> 13) << FLASH_CR_PNB_SHIFT) | FLASH_CR_SER | (bnksel << 31));
FLASH_CR = reg; FLASH_CR = reg;
ISB(); ISB();

4
include/user_settings.h
View File

@ -114,7 +114,9 @@ extern int tolower(int c);
# endif # endif
# else # else
# define HAVE_ECC_SIGN # define HAVE_ECC_SIGN
#ifndef PKCS11_SMALL
# define HAVE_ECC_CDH # define HAVE_ECC_CDH
#endif
# define WOLFSSL_SP # define WOLFSSL_SP
# define WOLFSSL_SP_MATH # define WOLFSSL_SP_MATH
# define WOLFSSL_SP_SMALL # define WOLFSSL_SP_SMALL
@ -173,7 +175,7 @@ extern int tolower(int c);
#if defined(WOLFBOOT_SIGN_RSA2048) || \ #if defined(WOLFBOOT_SIGN_RSA2048) || \
defined(WOLFBOOT_SIGN_RSA3072) || \ defined(WOLFBOOT_SIGN_RSA3072) || \
defined(WOLFBOOT_SIGN_RSA4096) || \ defined(WOLFBOOT_SIGN_RSA4096) || \
defined(WOLFCRYPT_SECURE_MODE) (defined(WOLFCRYPT_SECURE_MODE) && (!defined(PKCS11_SMALL)))
# define WC_RSA_BLINDING # define WC_RSA_BLINDING
# define WC_RSA_DIRECT # define WC_RSA_DIRECT