andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Crypto library: Migrate support to MbedTLS v2.24.0" into integration

This commit is contained in:
Olivier Deprez 2020-10-01 13:21:14 +00:00 committed by TrustedFirmware Code Review
parent 428518c638 ea14b51b83
commit 82f38d5ed7
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/getting_started/prerequisites.rst
View File

@ -60,7 +60,7 @@ supporting tools:
The following libraries are required for Trusted Board Boot support: The following libraries are required for Trusted Board Boot support:
- mbed TLS == 2.18.0 (tag: ``mbedtls-2.18.0``) - mbed TLS == 2.24.0 (tag: ``mbedtls-2.24.0``)
These tools are optional: These tools are optional:

3
drivers/auth/mbedtls/mbedtls_common.mk
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. # Copyright (c) 2015-2020, Arm Limited. All rights reserved.
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -35,7 +35,6 @@ LIBMBEDTLS_SRCS := $(addprefix ${MBEDTLS_DIR}/library/, \
bignum.c \ bignum.c \
gcm.c \ gcm.c \
md.c \ md.c \
md_wrap.c \
pk.c \ pk.c \
pk_wrap.c \ pk_wrap.c \
pkparse.c \ pkparse.c \

9
include/drivers/auth/mbedtls/mbedtls_config.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2020, Arm Limited. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -63,6 +63,7 @@
#define MBEDTLS_ECDSA_C #define MBEDTLS_ECDSA_C
#define MBEDTLS_ECP_C #define MBEDTLS_ECP_C
#define MBEDTLS_ECP_DP_SECP256R1_ENABLED #define MBEDTLS_ECP_DP_SECP256R1_ENABLED
#define MBEDTLS_ECP_NO_INTERNAL_RNG
#endif #endif
#if TF_MBEDTLS_USE_RSA #if TF_MBEDTLS_USE_RSA
#define MBEDTLS_RSA_C #define MBEDTLS_RSA_C
@ -101,6 +102,12 @@
/* Memory buffer allocator options */ /* Memory buffer allocator options */
#define MBEDTLS_MEMORY_ALIGN_MULTIPLE 8 #define MBEDTLS_MEMORY_ALIGN_MULTIPLE 8
/*
* Prevent the use of 128-bit division which
* creates dependency on external libraries.
*/
#define MBEDTLS_NO_UDBL_DIVISION
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
/* System headers required to build mbed TLS with the current configuration */ /* System headers required to build mbed TLS with the current configuration */
#include <stdlib.h> #include <stdlib.h>