From 907476d7012660aa50889933f85d19ec6f31338c Mon Sep 17 00:00:00 2001 From: Andrzej Puzdrowski Date: Wed, 7 Oct 2020 09:35:55 +0200 Subject: [PATCH] boot: remove direct fih delay rng inclusion Direct inclusion of "bootutil/fault_injection_hardening_delay_rng.h" might cause linking collision as this header belongs to `FIH_ENABLE_DELAY` mode. This header is already included by "bootutil/fault_injection_hardening.h" appropriately. fixes #831 Signed-off-by: Andrzej Puzdrowski --- boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c | 1 - boot/cypress/MCUBootApp/main.c | 1 - boot/mynewt/src/main.c | 1 - boot/zephyr/main.c | 1 - boot/zephyr/single_loader.c | 1 - 5 files changed, 5 deletions(-) diff --git a/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c b/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c index 1eadb720..9c6f2184 100644 --- a/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c +++ b/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c @@ -8,7 +8,6 @@ #ifdef FIH_ENABLE_DELAY -#include "bootutil/fault_injection_hardening_delay_rng.h" #include "mcuboot-mbedtls-cfg.h" #include "mbedtls/ctr_drbg.h" #include "mbedtls/entropy.h" diff --git a/boot/cypress/MCUBootApp/main.c b/boot/cypress/MCUBootApp/main.c index fdc6c6ea..2211a288 100644 --- a/boot/cypress/MCUBootApp/main.c +++ b/boot/cypress/MCUBootApp/main.c @@ -37,7 +37,6 @@ #include "bootutil/bootutil_log.h" #include "bootutil/fault_injection_hardening.h" -#include "bootutil/fault_injection_hardening_delay_rng.h" /* Define pins for UART debug output */ #define CYBSP_UART_ENABLED 1U diff --git a/boot/mynewt/src/main.c b/boot/mynewt/src/main.c index 3d1f9d6d..97adfc40 100755 --- a/boot/mynewt/src/main.c +++ b/boot/mynewt/src/main.c @@ -46,7 +46,6 @@ #include "bootutil/bootutil.h" #include "bootutil/bootutil_log.h" #include "bootutil/fault_injection_hardening.h" -#include "bootutil/fault_injection_hardening_delay_rng.h" #if MYNEWT_VAL(BOOT_CUSTOM_START) void boot_custom_start(uintptr_t flash_base, struct boot_rsp *rsp); diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c index 2c2968d7..350b3ab2 100644 --- a/boot/zephyr/main.c +++ b/boot/zephyr/main.c @@ -31,7 +31,6 @@ #include "bootutil/image.h" #include "bootutil/bootutil.h" #include "bootutil/fault_injection_hardening.h" -#include "bootutil/fault_injection_hardening_delay_rng.h" #include "flash_map_backend/flash_map_backend.h" #ifdef CONFIG_MCUBOOT_SERIAL diff --git a/boot/zephyr/single_loader.c b/boot/zephyr/single_loader.c index a5e9d1f7..fd7929d5 100644 --- a/boot/zephyr/single_loader.c +++ b/boot/zephyr/single_loader.c @@ -10,7 +10,6 @@ #include "bootutil_priv.h" #include "bootutil/bootutil_log.h" #include "bootutil/fault_injection_hardening.h" -#include "bootutil/fault_injection_hardening_delay_rng.h" #include "mcuboot_config/mcuboot_config.h"