Commit 907476d7 authored by Andrzej Puzdrowski's avatar Andrzej Puzdrowski
Browse files

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: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parent 82fb4124

boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

boot/cypress/MCUBootApp/main.c

+0 −1
Original line number Diff line number Diff line
@@ -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

boot/mynewt/src/main.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

boot/zephyr/main.c

+0 −1
Original line number Diff line number Diff line
@@ -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

boot/zephyr/single_loader.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

CRA Git | Maintained and supported by SUSTech CRA and CCSE