Merge branch 'fix/virt_efuse_example_test' into 'master'

efuse_example_test: Fix the example test

See merge request espressif/esp-idf!16065

components/bootloader_support/src/esp32c3/secure_boot_secure_features.c

@@ -33,7 +33,7 @@ esp_err_t esp_secure_boot_enable_secure_features(void)
         return err;
     }
 #else
-    ESP_LOGW(TAG, "UART ROM download mode kept enabled - SECURITY COMPROMISED");
+    ESP_LOGW(TAG, "UART ROM Download mode kept enabled - SECURITY COMPROMISED");
 #endif
 
 #ifndef CONFIG_SECURE_BOOT_ALLOW_JTAG

components/bootloader_support/src/esp32h2/secure_boot.c

@@ -266,7 +266,7 @@ esp_err_t esp_secure_boot_v2_permanently_enable(const esp_image_metadata_t *imag
         return err;
     }
 #else
-    ESP_LOGW(TAG, "UART download mode kept enabled - SECURITY COMPROMISED");
+    ESP_LOGW(TAG, "UART ROM Download mode kept enabled - SECURITY COMPROMISED");
 #endif
 
 #ifndef CONFIG_SECURE_BOOT_ALLOW_JTAG

components/bootloader_support/src/esp32s2/secure_boot_secure_features.c

@@ -34,7 +34,7 @@ esp_err_t esp_secure_boot_enable_secure_features(void)
         return err;
     }
 #else
-    ESP_LOGW(TAG, "UART ROM download mode kept enabled - SECURITY COMPROMISED");
+    ESP_LOGW(TAG, "UART ROM Download mode kept enabled - SECURITY COMPROMISED");
 #endif
 
 #ifndef CONFIG_SECURE_BOOT_ALLOW_JTAG

components/bootloader_support/src/esp32s3/secure_boot_secure_features.c

@@ -33,7 +33,7 @@ esp_err_t esp_secure_boot_enable_secure_features(void)
         return err;
     }
 #else
-    ESP_LOGW(TAG, "UART ROM download mode kept enabled - SECURITY COMPROMISED");
+    ESP_LOGW(TAG, "UART ROM Download mode kept enabled - SECURITY COMPROMISED");
 #endif
 
 #ifndef CONFIG_SECURE_BOOT_ALLOW_JTAG

components/bootloader_support/src/esp8684/secure_boot_secure_features.c

@@ -33,7 +33,7 @@ esp_err_t esp_secure_boot_enable_secure_features(void)
         return err;
     }
 #else
-    ESP_LOGW(TAG, "UART ROM download mode kept enabled - SECURITY COMPROMISED");
+    ESP_LOGW(TAG, "UART ROM Download mode kept enabled - SECURITY COMPROMISED");
 #endif
 
 #ifndef CONFIG_SECURE_BOOT_ALLOW_JTAG

examples/system/efuse/example_test.py

@@ -385,7 +385,7 @@ def test_examples_efuse_with_virt_secure_boot_v2(env, _):  # type: (ttfw_idf.Tin
     dut.expect('secure_boot_v2: blowing secure boot efuse...')
     dut.expect('Disable JTAG...')
     dut.expect('Disable ROM BASIC interpreter fallback...')
-    dut.expect('Not disabling ROM Download mode - SECURITY COMPROMISED')
+    dut.expect('UART ROM Download mode kept enabled - SECURITY COMPROMISED')
     dut.expect('Prevent read disabling of additional efuses...')
     dut.expect('secure_boot_v2: Secure boot permanently enabled')
 
@@ -449,7 +449,7 @@ def test_examples_efuse_with_virt_secure_boot_v2_pre_loaded(env, _):  # type: (t
     dut.expect('secure_boot_v2: blowing secure boot efuse...')
     dut.expect('Disable JTAG...')
     dut.expect('Disable ROM BASIC interpreter fallback...')
-    dut.expect('Not disabling ROM Download mode - SECURITY COMPROMISED')
+    dut.expect('UART ROM Download mode kept enabled - SECURITY COMPROMISED')
     dut.expect('Prevent read disabling of additional efuses...')
     dut.expect('secure_boot_v2: Secure boot permanently enabled')
 
@@ -508,7 +508,7 @@ def test_examples_efuse_with_virt_secure_boot_v2_esp32xx(env, _):  # type: (ttfw
     dut.expect('secure_boot_v2: Revoking empty key digest slot (1)...')
     dut.expect('secure_boot_v2: Revoking empty key digest slot (2)...')
     dut.expect('secure_boot_v2: blowing secure boot efuse...')
-    dut.expect('Not enabling Security download mode - SECURITY COMPROMISED')
+    dut.expect('UART ROM Download mode kept enabled - SECURITY COMPROMISED')
     dut.expect('Disable hardware & software JTAG...')
     dut.expect('secure_boot_v2: Secure boot permanently enabled')
 
@@ -570,7 +570,7 @@ def test_examples_efuse_with_virt_secure_boot_v2_esp32xx_pre_loaded(env, _):  #
     dut.expect('secure_boot_v2: Revoking empty key digest slot (2)...')
 
     dut.expect('secure_boot_v2: blowing secure boot efuse...')
-    dut.expect('Not enabling Security download mode - SECURITY COMPROMISED')
+    dut.expect('UART ROM Download mode kept enabled - SECURITY COMPROMISED')
     dut.expect('Disable hardware & software JTAG...')
     dut.expect('secure_boot_v2: Secure boot permanently enabled')
 
@@ -691,7 +691,7 @@ def test_examples_efuse_with_virt_sb_v2_and_fe(env, _):  # type: (ttfw_idf.TinyF
     dut.expect('secure_boot_v2: blowing secure boot efuse...')
     dut.expect('Disable JTAG...')
     dut.expect('Disable ROM BASIC interpreter fallback...')
-    dut.expect('Not disabling ROM Download mode - SECURITY COMPROMISED')
+    dut.expect('UART ROM Download mode kept enabled - SECURITY COMPROMISED')
     dut.expect('secure_boot_v2: Secure boot permanently enabled')
 
     dut.expect('Checking flash encryption...')
@@ -769,7 +769,7 @@ def test_examples_efuse_with_virt_sb_v2_and_fe_esp32xx(env, _):  # type: (ttfw_i
     dut.expect('secure_boot_v2: Revoking empty key digest slot (1)...')
     dut.expect('secure_boot_v2: Revoking empty key digest slot (2)...')
     dut.expect('secure_boot_v2: blowing secure boot efuse...')
-    dut.expect('Not enabling Security download mode - SECURITY COMPROMISED')
+    dut.expect('UART ROM Download mode kept enabled - SECURITY COMPROMISED')
     dut.expect('Disable hardware & software JTAG...')
     dut.expect('secure_boot_v2: Secure boot permanently enabled')