Merge "refactor(mbedtls): allow platform to specify their config file" into integration
This commit is contained in:
commit
af68314ddc
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2020, Arm Limited. All rights reserved.
|
* Copyright (c) 2020-2022, Arm Limited. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
#include <platform_def.h>
|
#include <platform_def.h>
|
||||||
|
|
||||||
#include <drivers/auth/mbedtls/mbedtls_config.h>
|
#include MBEDTLS_CONFIG_FILE
|
||||||
#include <drivers/auth/auth_mod.h>
|
#include <drivers/auth/auth_mod.h>
|
||||||
#include <tools_share/dualroot_oid.h>
|
#include <tools_share/dualroot_oid.h>
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
|
* Copyright (c) 2015-2022, Arm Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
#include <common/debug.h>
|
#include <common/debug.h>
|
||||||
#include <drivers/auth/mbedtls/mbedtls_common.h>
|
#include <drivers/auth/mbedtls/mbedtls_common.h>
|
||||||
#include <drivers/auth/mbedtls/mbedtls_config.h>
|
#include MBEDTLS_CONFIG_FILE
|
||||||
#include <plat/common/platform.h>
|
#include <plat/common/platform.h>
|
||||||
|
|
||||||
static void cleanup(void)
|
static void cleanup(void)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Copyright (c) 2015-2021, Arm Limited. All rights reserved.
|
# Copyright (c) 2015-2022, Arm Limited. All rights reserved.
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: BSD-3-Clause
|
# SPDX-License-Identifier: BSD-3-Clause
|
||||||
#
|
#
|
||||||
|
@ -16,7 +16,7 @@ endif
|
||||||
MBEDTLS_INC = -I${MBEDTLS_DIR}/include
|
MBEDTLS_INC = -I${MBEDTLS_DIR}/include
|
||||||
|
|
||||||
# Specify mbed TLS configuration file
|
# Specify mbed TLS configuration file
|
||||||
MBEDTLS_CONFIG_FILE := "<drivers/auth/mbedtls/mbedtls_config.h>"
|
MBEDTLS_CONFIG_FILE ?= "<drivers/auth/mbedtls/mbedtls_config.h>"
|
||||||
$(eval $(call add_define,MBEDTLS_CONFIG_FILE))
|
$(eval $(call add_define,MBEDTLS_CONFIG_FILE))
|
||||||
|
|
||||||
MBEDTLS_SOURCES += drivers/auth/mbedtls/mbedtls_common.c
|
MBEDTLS_SOURCES += drivers/auth/mbedtls/mbedtls_common.c
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
|
* Copyright (c) 2015-2022, Arm Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -7,7 +7,7 @@
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
#include <platform_def.h>
|
#include <platform_def.h>
|
||||||
#include <drivers/auth/mbedtls/mbedtls_config.h>
|
#include MBEDTLS_CONFIG_FILE
|
||||||
|
|
||||||
#include <drivers/auth/auth_mod.h>
|
#include <drivers/auth/auth_mod.h>
|
||||||
#include <drivers/auth/tbbr_cot_common.h>
|
#include <drivers/auth/tbbr_cot_common.h>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2021, ARM Limited and Contributors. All rights reserved.
|
* Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -7,7 +7,7 @@
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
#include <drivers/auth/auth_mod.h>
|
#include <drivers/auth/auth_mod.h>
|
||||||
#include <drivers/auth/mbedtls/mbedtls_config.h>
|
#include MBEDTLS_CONFIG_FILE
|
||||||
#include <drivers/auth/tbbr_cot_common.h>
|
#include <drivers/auth/tbbr_cot_common.h>
|
||||||
|
|
||||||
#if USE_TBBR_DEFS
|
#if USE_TBBR_DEFS
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
|
* Copyright (c) 2015-2022, Arm Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -7,7 +7,7 @@
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
#include <platform_def.h>
|
#include <platform_def.h>
|
||||||
#include <drivers/auth/mbedtls/mbedtls_config.h>
|
#include MBEDTLS_CONFIG_FILE
|
||||||
|
|
||||||
#include <drivers/auth/auth_mod.h>
|
#include <drivers/auth/auth_mod.h>
|
||||||
#include <drivers/auth/tbbr_cot_common.h>
|
#include <drivers/auth/tbbr_cot_common.h>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
|
* Copyright (c) 2015-2022, Arm Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -7,7 +7,7 @@
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
#include <platform_def.h>
|
#include <platform_def.h>
|
||||||
#include <drivers/auth/mbedtls/mbedtls_config.h>
|
#include MBEDTLS_CONFIG_FILE
|
||||||
|
|
||||||
#include <drivers/auth/auth_mod.h>
|
#include <drivers/auth/auth_mod.h>
|
||||||
#include <drivers/auth/tbbr_cot_common.h>
|
#include <drivers/auth/tbbr_cot_common.h>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2020, Arm Limited. All rights reserved.
|
* Copyright (c) 2020-2022, Arm Limited. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -8,7 +8,7 @@
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
#include <common/fdt_wrappers.h>
|
#include <common/fdt_wrappers.h>
|
||||||
#include <drivers/auth/mbedtls/mbedtls_config.h>
|
#include MBEDTLS_CONFIG_FILE
|
||||||
#include <drivers/auth/auth_mod.h>
|
#include <drivers/auth/auth_mod.h>
|
||||||
#include <lib/fconf/fconf.h>
|
#include <lib/fconf/fconf.h>
|
||||||
#include <lib/object_pool.h>
|
#include <lib/object_pool.h>
|
||||||
|
|
Loading…
Reference in New Issue