From 534d64d67edbca0141f63bac458b0796d0fb5ae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 14 Mar 2023 17:43:06 +0100 Subject: [PATCH] MD no longer depends on a built-in hash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Pégourié-Gonnard --- include/mbedtls/check_config.h | 10 +++++++++- include/mbedtls/mbedtls_config.h | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h index 08874e3ce8..ffaeccb1de 100644 --- a/include/mbedtls/check_config.h +++ b/include/mbedtls/check_config.h @@ -398,7 +398,15 @@ defined(MBEDTLS_SHA224_C) || \ defined(MBEDTLS_SHA256_C) || \ defined(MBEDTLS_SHA384_C) || \ - defined(MBEDTLS_SHA512_C) ) + defined(MBEDTLS_SHA512_C) || \ + (defined(MBEDTLS_PSA_CRYPTO_C) && \ + (defined(PSA_WANT_ALG_MD5) || \ + defined(PSA_WANT_ALG_RIPEMD160) || \ + defined(PSA_WANT_ALG_SHA_1) || \ + defined(PSA_WANT_ALG_SHA_224) || \ + defined(PSA_WANT_ALG_SHA_256) || \ + defined(PSA_WANT_ALG_SHA_384) || \ + defined(PSA_WANT_ALG_SHA_512)))) #error "MBEDTLS_MD_C defined, but not all prerequisites" #endif diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h index d889e7ee63..bf88f61ec4 100644 --- a/include/mbedtls/mbedtls_config.h +++ b/include/mbedtls/mbedtls_config.h @@ -2644,7 +2644,8 @@ * * Requires: one of: MBEDTLS_MD5_C, MBEDTLS_RIPEMD160_C, MBEDTLS_SHA1_C, * MBEDTLS_SHA224_C, MBEDTLS_SHA256_C, MBEDTLS_SHA384_C, - * MBEDTLS_SHA512_C. + * MBEDTLS_SHA512_C, or MBEDTLS_PSA_CRYPTO_C with a least + * one hash. * Module: library/md.c * Caller: library/constant_time.c * library/ecdsa.c