feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix(flash_encryption): Fix the issue that XTS_AES Plain text memory size wrong

Browse Source
This commit is contained in:
Cao Sen Miao
2023-10-24 11:31:33 +08:00
parent c5ae121bac
commit 420ac840ff
13 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/hal/esp32c2/include/hal/spi_flash_encrypted_ll.h
View File

@@ -17,6 +17,7 @@
#include "soc/system_reg.h" #include "soc/system_reg.h"
#include "soc/xts_aes_reg.h" #include "soc/xts_aes_reg.h"
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/soc_caps.h"
#include "hal/assert.h" #include "hal/assert.h"
#ifdef __cplusplus #ifdef __cplusplus
@@ -84,7 +85,8 @@ static inline void spi_flash_encrypt_ll_buffer_length(uint32_t size)
*/ */
static inline void spi_flash_encrypt_ll_plaintext_save(uint32_t address, const uint32_t* buffer, uint32_t size) static inline void spi_flash_encrypt_ll_plaintext_save(uint32_t address, const uint32_t* buffer, uint32_t size)
{ {
uint32_t plaintext_offs = (address % 64); uint32_t plaintext_offs = (address % SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX);
HAL_ASSERT(plaintext_offs + size <= SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX);
memcpy((void *)(XTS_AES_PLAIN_MEM + plaintext_offs), buffer, size); memcpy((void *)(XTS_AES_PLAIN_MEM + plaintext_offs), buffer, size);
} }

4
components/hal/esp32c3/include/hal/spi_flash_encrypted_ll.h
View File

@@ -17,6 +17,7 @@
#include "soc/system_reg.h" #include "soc/system_reg.h"
#include "soc/xts_aes_reg.h" #include "soc/xts_aes_reg.h"
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/soc_caps.h"
#include "hal/assert.h" #include "hal/assert.h"
#ifdef __cplusplus #ifdef __cplusplus
@@ -84,7 +85,8 @@ static inline void spi_flash_encrypt_ll_buffer_length(uint32_t size)
*/ */
static inline void spi_flash_encrypt_ll_plaintext_save(uint32_t address, const uint32_t* buffer, uint32_t size) static inline void spi_flash_encrypt_ll_plaintext_save(uint32_t address, const uint32_t* buffer, uint32_t size)
{ {
uint32_t plaintext_offs = (address % 64); uint32_t plaintext_offs = (address % SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX);
HAL_ASSERT(plaintext_offs + size <= SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX);
memcpy((void *)(XTS_AES_PLAIN_MEM + plaintext_offs), buffer, size); memcpy((void *)(XTS_AES_PLAIN_MEM + plaintext_offs), buffer, size);
} }

4
components/hal/esp32c6/include/hal/spi_flash_encrypted_ll.h
View File

@@ -17,6 +17,7 @@
#include "soc/hp_system_reg.h" #include "soc/hp_system_reg.h"
#include "soc/xts_aes_reg.h" #include "soc/xts_aes_reg.h"
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/soc_caps.h"
#include "hal/assert.h" #include "hal/assert.h"
#ifdef __cplusplus #ifdef __cplusplus
@@ -84,7 +85,8 @@ static inline void spi_flash_encrypt_ll_buffer_length(uint32_t size)
*/ */
static inline void spi_flash_encrypt_ll_plaintext_save(uint32_t address, const uint32_t* buffer, uint32_t size) static inline void spi_flash_encrypt_ll_plaintext_save(uint32_t address, const uint32_t* buffer, uint32_t size)
{ {
uint32_t plaintext_offs = (address % 64); uint32_t plaintext_offs = (address % SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX);
HAL_ASSERT(plaintext_offs + size <= SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX);
memcpy((void *)(XTS_AES_PLAIN_MEM(0) + plaintext_offs), buffer, size); memcpy((void *)(XTS_AES_PLAIN_MEM(0) + plaintext_offs), buffer, size);
} }

4
components/hal/esp32h2/include/hal/spi_flash_encrypted_ll.h
View File

@@ -17,6 +17,7 @@
#include "soc/hp_system_reg.h" #include "soc/hp_system_reg.h"
#include "soc/xts_aes_reg.h" #include "soc/xts_aes_reg.h"
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/soc_caps.h"
#include "hal/assert.h" #include "hal/assert.h"
#ifdef __cplusplus #ifdef __cplusplus
@@ -84,7 +85,8 @@ static inline void spi_flash_encrypt_ll_buffer_length(uint32_t size)
*/ */
static inline void spi_flash_encrypt_ll_plaintext_save(uint32_t address, const uint32_t* buffer, uint32_t size) static inline void spi_flash_encrypt_ll_plaintext_save(uint32_t address, const uint32_t* buffer, uint32_t size)
{ {
uint32_t plaintext_offs = (address % 64); uint32_t plaintext_offs = (address % SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX);
HAL_ASSERT(plaintext_offs + size <= SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX);
memcpy((void *)(XTS_AES_PLAIN_MEM(0) + plaintext_offs), buffer, size); memcpy((void *)(XTS_AES_PLAIN_MEM(0) + plaintext_offs), buffer, size);
} }

4
components/hal/esp32p4/include/hal/spi_flash_encrypted_ll.h
View File

@@ -17,6 +17,7 @@
#include "soc/hp_system_reg.h" #include "soc/hp_system_reg.h"
#include "soc/spi_mem_reg.h" #include "soc/spi_mem_reg.h"
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/soc_caps.h"
#include "hal/assert.h" #include "hal/assert.h"
#ifdef __cplusplus #ifdef __cplusplus
@@ -88,7 +89,8 @@ static inline void spi_flash_encrypt_ll_buffer_length(uint32_t size)
*/ */
static inline void spi_flash_encrypt_ll_plaintext_save(uint32_t address, const uint32_t* buffer, uint32_t size) static inline void spi_flash_encrypt_ll_plaintext_save(uint32_t address, const uint32_t* buffer, uint32_t size)
{ {
uint32_t plaintext_offs = (address % 64); uint32_t plaintext_offs = (address % SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX);
HAL_ASSERT(plaintext_offs + size <= SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX);
memcpy((void *)(SPI_MEM_XTS_PLAIN_BASE_REG(0) + plaintext_offs), buffer, size); memcpy((void *)(SPI_MEM_XTS_PLAIN_BASE_REG(0) + plaintext_offs), buffer, size);
} }

4
components/hal/esp32s2/include/hal/spi_flash_encrypted_ll.h
View File

@@ -17,6 +17,7 @@
#include "soc/system_reg.h" #include "soc/system_reg.h"
#include "soc/hwcrypto_reg.h" #include "soc/hwcrypto_reg.h"
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/soc_caps.h"
#include "hal/assert.h" #include "hal/assert.h"
#ifdef __cplusplus #ifdef __cplusplus
@@ -93,7 +94,8 @@ static inline void spi_flash_encrypt_ll_buffer_length(uint32_t size)
*/ */
static inline void spi_flash_encrypt_ll_plaintext_save(uint32_t address, const uint32_t* buffer, uint32_t size) static inline void spi_flash_encrypt_ll_plaintext_save(uint32_t address, const uint32_t* buffer, uint32_t size)
{ {
uint32_t plaintext_offs = (address % 64); uint32_t plaintext_offs = (address % SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX);
HAL_ASSERT(plaintext_offs + size <= SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX);
memcpy((void *)(AES_XTS_PLAIN_BASE + plaintext_offs), buffer, size); memcpy((void *)(AES_XTS_PLAIN_BASE + plaintext_offs), buffer, size);
} }

4
components/hal/esp32s3/include/hal/spi_flash_encrypted_ll.h
View File

@@ -17,6 +17,7 @@
#include "soc/system_reg.h" #include "soc/system_reg.h"
#include "soc/hwcrypto_reg.h" #include "soc/hwcrypto_reg.h"
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/soc_caps.h"
#include "hal/assert.h" #include "hal/assert.h"
#ifdef __cplusplus #ifdef __cplusplus
@@ -84,7 +85,8 @@ static inline void spi_flash_encrypt_ll_buffer_length(uint32_t size)
*/ */
static inline void spi_flash_encrypt_ll_plaintext_save(uint32_t address, const uint32_t* buffer, uint32_t size) static inline void spi_flash_encrypt_ll_plaintext_save(uint32_t address, const uint32_t* buffer, uint32_t size)
{ {
uint32_t plaintext_offs = (address % 64); uint32_t plaintext_offs = (address % SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX);
HAL_ASSERT(plaintext_offs + size <= SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX);
memcpy((void *)(AES_XTS_PLAIN_BASE + plaintext_offs), buffer, size); memcpy((void *)(AES_XTS_PLAIN_BASE + plaintext_offs), buffer, size);
} }

2
components/soc/esp32c6/include/soc/Kconfig.soc_caps.in
View File

@@ -1113,7 +1113,7 @@ config SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY
config SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX config SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX
int int
default 32 default 64
config SOC_FLASH_ENCRYPTION_XTS_AES config SOC_FLASH_ENCRYPTION_XTS_AES
bool bool

2
components/soc/esp32c6/include/soc/soc_caps.h
View File

@@ -455,7 +455,7 @@
#define SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY 1 #define SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY 1
/*-------------------------- Flash Encryption CAPS----------------------------*/ /*-------------------------- Flash Encryption CAPS----------------------------*/
#define SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX (32) #define SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX (64)
#define SOC_FLASH_ENCRYPTION_XTS_AES 1 #define SOC_FLASH_ENCRYPTION_XTS_AES 1
#define SOC_FLASH_ENCRYPTION_XTS_AES_128 1 #define SOC_FLASH_ENCRYPTION_XTS_AES_128 1

2
components/soc/esp32h2/include/soc/Kconfig.soc_caps.in
View File

@@ -1093,7 +1093,7 @@ config SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY
config SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX config SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX
int int
default 32 default 64
config SOC_FLASH_ENCRYPTION_XTS_AES config SOC_FLASH_ENCRYPTION_XTS_AES
bool bool

2
components/soc/esp32h2/include/soc/soc_caps.h
View File

@@ -448,7 +448,7 @@
#define SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY 1 #define SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY 1
/*-------------------------- Flash Encryption CAPS----------------------------*/ /*-------------------------- Flash Encryption CAPS----------------------------*/
#define SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX (32) #define SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX (64)
#define SOC_FLASH_ENCRYPTION_XTS_AES 1 #define SOC_FLASH_ENCRYPTION_XTS_AES 1
#define SOC_FLASH_ENCRYPTION_XTS_AES_128 1 #define SOC_FLASH_ENCRYPTION_XTS_AES_128 1

2
components/soc/esp32p4/include/soc/Kconfig.soc_caps.in
View File

@@ -1069,7 +1069,7 @@ config SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY
config SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX config SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX
int int
default 32 default 64
config SOC_FLASH_ENCRYPTION_XTS_AES config SOC_FLASH_ENCRYPTION_XTS_AES
bool bool

2
components/soc/esp32p4/include/soc/soc_caps.h
View File

@@ -479,7 +479,7 @@
#define SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY 1 #define SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY 1
/*-------------------------- Flash Encryption CAPS----------------------------*/ /*-------------------------- Flash Encryption CAPS----------------------------*/
#define SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX (32) #define SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX (64)
#define SOC_FLASH_ENCRYPTION_XTS_AES 1 #define SOC_FLASH_ENCRYPTION_XTS_AES 1
#define SOC_FLASH_ENCRYPTION_XTS_AES_128 1 #define SOC_FLASH_ENCRYPTION_XTS_AES_128 1