Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bootloader: Don't enable secure boot or flash encryption for 3/4 Coding Scheme

Browse source
This commit is contained in:
Angus Gratton 2018-09-26 16:57:44 +10:00 committed by Angus Gratton
parent 5b061a0530
commit c990ca4e20
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/bootloader_support/src/flash_encrypt.c
View file

@ -62,6 +62,11 @@ esp_err_t esp_flash_encrypt_check_and_update(void)
static esp_err_t initialise_flash_encryption(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 */ /* Before first flash encryption pass, need to initialise key & crypto config */
/* Generate key */ /* Generate key */

5
components/bootloader_support/src/secure_boot.c
View file

@ -111,6 +111,11 @@ esp_err_t esp_secure_boot_permanently_enable(void) {
return ESP_OK; 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); err = esp_image_verify_bootloader(&image_len);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "bootloader image appears invalid! error %d", err); ESP_LOGE(TAG, "bootloader image appears invalid! error %d", err);