Merge branch 'bugfix/disable_coding_scheme_security_features_v3.0' into 'release/v3.0'
bootloader: Don't enable secure boot or flash encryption for 3/4 Coding Scheme (v3.0) See merge request idf/esp-idf!3422
This commit is contained in:
commit
2e8d7fa36d
3 changed files with 11 additions and 1 deletions
|
@ -62,6 +62,11 @@ esp_err_t esp_flash_encrypt_check_and_update(void)
|
|||
|
||||
static esp_err_t initialise_flash_encryption(void)
|
||||
{
|
||||
if (REG_READ(EFUSE_BLK0_RDATA6_REG) & EFUSE_CODING_SCHEME_M) {
|
||||
ESP_LOGE(TAG, "Flash Encryption is currently not supported on hardware with 3/4 Coding Scheme (CODING_SCHEME efuse set)");
|
||||
return ESP_ERR_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
/* Before first flash encryption pass, need to initialise key & crypto config */
|
||||
|
||||
/* Generate key */
|
||||
|
|
|
@ -111,6 +111,11 @@ esp_err_t esp_secure_boot_permanently_enable(void) {
|
|||
return ESP_OK;
|
||||
}
|
||||
|
||||
if (REG_READ(EFUSE_BLK0_RDATA6_REG) & EFUSE_CODING_SCHEME_M) {
|
||||
ESP_LOGE(TAG, "Secure Boot is currently not supported on hardware with 3/4 Coding Scheme (CODING_SCHEME efuse set)");
|
||||
return ESP_ERR_NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
err = esp_image_verify_bootloader(&image_len);
|
||||
if (err != ESP_OK) {
|
||||
ESP_LOGE(TAG, "bootloader image appears invalid! error %d", err);
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 4dab24e1b28632d270adf7305fe0d008d1acee99
|
||||
Subproject commit 59b8dd8bfe3927dc11ffc06603fa082cb0f523bb
|
Loading…
Reference in a new issue