From 17adf8dd96b8c132a33b42a9bf19c946ff26c48b Mon Sep 17 00:00:00 2001 From: Sherry Zhang Date: Tue, 13 Jul 2021 22:09:43 +0800 Subject: [PATCH] zephyr: upgrade mbedtls library to mbedtls-3.0.0 Signed-off-by: Sherry Zhang Change-Id: I306a9adc2e2a9c7933f637224f87c21dbd1bc5a4 --- boot/zephyr/include/config-ec.h | 3 ++- boot/zephyr/include/config-ed25519.h | 3 ++- boot/zephyr/include/config-kw.h | 3 ++- boot/zephyr/include/config-rsa-kw.h | 3 ++- boot/zephyr/include/config-rsa.h | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/boot/zephyr/include/config-ec.h b/boot/zephyr/include/config-ec.h index 99c5aee2..3b112957 100644 --- a/boot/zephyr/include/config-ec.h +++ b/boot/zephyr/include/config-ec.h @@ -1,7 +1,7 @@ /* * Minimal configuration for using TLS in the bootloader * - * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved + * Copyright (C) 2006-2021, ARM Limited, All Rights Reserved * Copyright (C) 2016, Linaro Ltd * SPDX-License-Identifier: Apache-2.0 * @@ -65,6 +65,7 @@ #define MBEDTLS_MD_C #define MBEDTLS_OID_C #define MBEDTLS_SHA256_C +#define MBEDTLS_SHA224_C #define MBEDTLS_AES_C /* Bring in support for x509. */ diff --git a/boot/zephyr/include/config-ed25519.h b/boot/zephyr/include/config-ed25519.h index 3efb7bdd..7e437084 100644 --- a/boot/zephyr/include/config-ed25519.h +++ b/boot/zephyr/include/config-ed25519.h @@ -1,7 +1,7 @@ /* * Configuration of mbedTLS containing only the ASN.1 parser. * - * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved + * Copyright (C) 2006-2021, ARM Limited, All Rights Reserved * Copyright (C) 2016, Linaro Ltd * SPDX-License-Identifier: Apache-2.0 * @@ -60,6 +60,7 @@ #define MBEDTLS_MD_C #define MBEDTLS_OID_C #define MBEDTLS_SHA256_C +#define MBEDTLS_SHA224_C #define MBEDTLS_SHA512_C #define MBEDTLS_AES_C diff --git a/boot/zephyr/include/config-kw.h b/boot/zephyr/include/config-kw.h index 0ed94d1a..168e56ee 100644 --- a/boot/zephyr/include/config-kw.h +++ b/boot/zephyr/include/config-kw.h @@ -1,7 +1,7 @@ /* * Minimal configuration for using TLS in the bootloader * - * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved + * Copyright (C) 2006-2021, ARM Limited, All Rights Reserved * Copyright (C) 2016, Linaro Ltd * SPDX-License-Identifier: Apache-2.0 * @@ -57,6 +57,7 @@ #define MBEDTLS_CIPHER_MODE_CTR #define MBEDTLS_SHA256_C +#define MBEDTLS_SHA224_C #define MBEDTLS_AES_C #define MBEDTLS_CIPHER_C #define MBEDTLS_NIST_KW_C diff --git a/boot/zephyr/include/config-rsa-kw.h b/boot/zephyr/include/config-rsa-kw.h index 99c9957d..bc3da7d8 100644 --- a/boot/zephyr/include/config-rsa-kw.h +++ b/boot/zephyr/include/config-rsa-kw.h @@ -1,7 +1,7 @@ /* * Minimal configuration for using TLS in the bootloader * - * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved + * Copyright (C) 2006-2021, ARM Limited, All Rights Reserved * Copyright (C) 2016, Linaro Ltd * SPDX-License-Identifier: Apache-2.0 * @@ -63,6 +63,7 @@ #define MBEDTLS_MD_C #define MBEDTLS_OID_C #define MBEDTLS_SHA256_C +#define MBEDTLS_SHA224_C #define MBEDTLS_AES_C #define MBEDTLS_CIPHER_C #define MBEDTLS_NIST_KW_C diff --git a/boot/zephyr/include/config-rsa.h b/boot/zephyr/include/config-rsa.h index 265b2907..05524204 100644 --- a/boot/zephyr/include/config-rsa.h +++ b/boot/zephyr/include/config-rsa.h @@ -1,7 +1,7 @@ /* * Minimal configuration for using TLS in the bootloader * - * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved + * Copyright (C) 2006-2021, ARM Limited, All Rights Reserved * Copyright (C) 2016, Linaro Ltd * SPDX-License-Identifier: Apache-2.0 * @@ -64,6 +64,7 @@ #define MBEDTLS_MD_C #define MBEDTLS_OID_C #define MBEDTLS_SHA256_C +#define MBEDTLS_SHA224_C #define MBEDTLS_AES_C /* Save RAM by adjusting to our exact needs */