Fixed regression in update_ram tests

Author: danielinux

src/update_ram.c

@@ -138,7 +138,7 @@ void RAMFUNCTION wolfBoot_start(void)
     uint8_t *dts_addr = NULL;
     uint32_t dts_size = 0;
 #endif
-#ifndef ALLOW_DOWNGRADE
+#if !defined(ALLOW_DOWNGRADE) && defined(WOLFBOOT_FIXED_PARTITIONS)
     int boot_v_raw = (int)wolfBoot_current_firmware_version();
     int update_v_raw = (int)wolfBoot_update_firmware_version();
     uint32_t boot_v = 0U;
@@ -150,7 +150,7 @@ void RAMFUNCTION wolfBoot_start(void)
     if (update_v_raw >= 0)
         update_v = (uint32_t)update_v_raw;
     max_v = (boot_v > update_v) ? boot_v : update_v;
-#endif
+#endif /* !ALLOW_DOWNGRADE && WOLFBOOT_FIXED_PARTITIONS */
 
     memset(&os_image, 0, sizeof(struct wolfBoot_image));
 
@@ -175,7 +175,7 @@ void RAMFUNCTION wolfBoot_start(void)
             wolfBoot_panic();
             break;
         }
-#ifndef ALLOW_DOWNGRADE
+#if !defined(ALLOW_DOWNGRADE) && defined(WOLFBOOT_FIXED_PARTITIONS)
         {
             uint32_t active_v = (active == PART_UPDATE) ? update_v : boot_v;
             if ((max_v > 0U) && (active_v < max_v)) {
@@ -184,7 +184,7 @@ void RAMFUNCTION wolfBoot_start(void)
                 break;
             }
         }
-#endif
+#endif /* !ALLOW_DOWNGRADE && WOLFBOOT_FIXED_PARTITIONS */
 
     #if defined(WOLFBOOT_DUALBOOT) && defined(WOLFBOOT_FIXED_PARTITIONS)
         wolfBoot_printf("Trying %s partition at %p\n",

tools/unit-tests/unit-update-ram-nofixed.c

@@ -193,7 +193,7 @@ static int add_payload(uint8_t part, uint32_t version, uint32_t size)
     return 0;
 }
 
-START_TEST(test_invalid_update_rollback_to_older_boot_is_denied)
+START_TEST(test_invalid_update_falls_back_to_boot)
 {
     uint8_t bad_digest[SHA256_DIGEST_SIZE];
 
@@ -210,9 +210,9 @@ START_TEST(test_invalid_update_rollback_to_older_boot_is_denied)
 
     wolfBoot_start();
 
-    ck_assert_int_eq(wolfBoot_staged_ok, 0);
-    ck_assert_int_eq(wolfBoot_panicked, 1);
-    ck_assert_uint_eq((uintptr_t)wolfBoot_stage_address, STAGE_ADDR_SENTINEL);
+    ck_assert_int_eq(wolfBoot_staged_ok, 1);
+    ck_assert_int_eq(wolfBoot_panicked, 0);
+    ck_assert_uint_eq((uintptr_t)wolfBoot_stage_address, WOLFBOOT_LOAD_ADDRESS);
     cleanup_flash();
 }
 END_TEST
@@ -222,7 +222,7 @@ static Suite *wolfboot_suite(void)
     Suite *s = suite_create("wolfboot-update-ram-nofixed");
     TCase *tc = tcase_create("fallback");
 
-    tcase_add_test(tc, test_invalid_update_rollback_to_older_boot_is_denied);
+    tcase_add_test(tc, test_invalid_update_falls_back_to_boot);
     tcase_set_timeout(tc, 5);
     suite_add_tcase(s, tc);