From 67f80372f099669774f3ca5677fcbe1500399c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 6 Jun 2023 13:01:18 +0200 Subject: [PATCH 1/9] Add size measurements per library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Pégourié-Gonnard --- tests/scripts/all.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 7b0893b8fc..6b87c6e939 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -3875,6 +3875,10 @@ component_build_arm_none_eabi_gcc_m0plus () { msg "size: ${ARM_NONE_EABI_GCC_PREFIX}gcc -mthumb -mcpu=cortex-m0plus -Os, baremetal_size" ${ARM_NONE_EABI_GCC_PREFIX}size -t library/*.o + for lib in library/*.a; do + echo "$lib:" + ${ARM_NONE_EABI_GCC_PREFIX}size -t $lib | grep TOTALS + done } component_build_arm_none_eabi_gcc_no_udbl_division () { From 70aa2a110e7ec7518d02af6725895bd9e0903c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 3 May 2023 12:26:56 +0200 Subject: [PATCH 2/9] Change contract of MD<->PSA conversion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is preparation work for simplifying the implementation of those functions. Done first in order to get the CI's opinion on it. Signed-off-by: Manuel Pégourié-Gonnard --- library/md.c | 28 ---------------------------- library/md_psa.h | 8 ++++---- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/library/md.c b/library/md.c index ac0619871d..932c6d0271 100644 --- a/library/md.c +++ b/library/md.c @@ -774,34 +774,20 @@ mbedtls_md_type_t mbedtls_md_get_type(const mbedtls_md_info_t *md_info) psa_algorithm_t mbedtls_md_psa_alg_from_type(mbedtls_md_type_t md_type) { switch (md_type) { -#if defined(MBEDTLS_MD_CAN_MD5) case MBEDTLS_MD_MD5: return PSA_ALG_MD5; -#endif -#if defined(MBEDTLS_MD_CAN_RIPEMD160) case MBEDTLS_MD_RIPEMD160: return PSA_ALG_RIPEMD160; -#endif -#if defined(MBEDTLS_MD_CAN_SHA1) case MBEDTLS_MD_SHA1: return PSA_ALG_SHA_1; -#endif -#if defined(MBEDTLS_MD_CAN_SHA224) case MBEDTLS_MD_SHA224: return PSA_ALG_SHA_224; -#endif -#if defined(MBEDTLS_MD_CAN_SHA256) case MBEDTLS_MD_SHA256: return PSA_ALG_SHA_256; -#endif -#if defined(MBEDTLS_MD_CAN_SHA384) case MBEDTLS_MD_SHA384: return PSA_ALG_SHA_384; -#endif -#if defined(MBEDTLS_MD_CAN_SHA512) case MBEDTLS_MD_SHA512: return PSA_ALG_SHA_512; -#endif default: return PSA_ALG_NONE; } @@ -810,34 +796,20 @@ psa_algorithm_t mbedtls_md_psa_alg_from_type(mbedtls_md_type_t md_type) mbedtls_md_type_t mbedtls_md_type_from_psa_alg(psa_algorithm_t psa_alg) { switch (psa_alg) { -#if defined(MBEDTLS_MD_CAN_MD5) case PSA_ALG_MD5: return MBEDTLS_MD_MD5; -#endif -#if defined(MBEDTLS_MD_CAN_RIPEMD160) case PSA_ALG_RIPEMD160: return MBEDTLS_MD_RIPEMD160; -#endif -#if defined(MBEDTLS_MD_CAN_SHA1) case PSA_ALG_SHA_1: return MBEDTLS_MD_SHA1; -#endif -#if defined(MBEDTLS_MD_CAN_SHA224) case PSA_ALG_SHA_224: return MBEDTLS_MD_SHA224; -#endif -#if defined(MBEDTLS_MD_CAN_SHA256) case PSA_ALG_SHA_256: return MBEDTLS_MD_SHA256; -#endif -#if defined(MBEDTLS_MD_CAN_SHA384) case PSA_ALG_SHA_384: return MBEDTLS_MD_SHA384; -#endif -#if defined(MBEDTLS_MD_CAN_SHA512) case PSA_ALG_SHA_512: return MBEDTLS_MD_SHA512; -#endif default: return MBEDTLS_MD_NONE; } diff --git a/library/md_psa.h b/library/md_psa.h index 6645c832e6..3231a6023c 100644 --- a/library/md_psa.h +++ b/library/md_psa.h @@ -33,8 +33,8 @@ * * \param md_type The type of digest to search for. * - * \return The PSA algorithm identifier associated with \p md_type. - * \return PSA_ALG_NONE if the algorithm is not supported. + * \return The PSA algorithm identifier associated with \p md_type, + * regardless of whether it is supported or not. */ psa_algorithm_t mbedtls_md_psa_alg_from_type(mbedtls_md_type_t md_type); @@ -44,8 +44,8 @@ psa_algorithm_t mbedtls_md_psa_alg_from_type(mbedtls_md_type_t md_type); * * \param psa_alg The PSA algorithm identifier to search for. * - * \return The MD type associated with \p psa_alg. - * \return MBEDTLS_MD_NONE if the algorithm is not supported. + * \return The MD type associated with \p psa_alg, + * regardless of whether it is supported or not. */ mbedtls_md_type_t mbedtls_md_type_from_psa_alg(psa_algorithm_t psa_alg); From eb5920421c344c01531ae82ae395981130883889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 31 May 2023 10:48:38 +0200 Subject: [PATCH 3/9] Fix error status for PSA RSA-OAEP unknown hash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Pégourié-Gonnard --- library/psa_crypto_rsa.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/library/psa_crypto_rsa.c b/library/psa_crypto_rsa.c index ab93146deb..0becc6c4bd 100644 --- a/library/psa_crypto_rsa.c +++ b/library/psa_crypto_rsa.c @@ -529,6 +529,12 @@ static int psa_rsa_oaep_set_padding_mode(psa_algorithm_t alg, psa_algorithm_t hash_alg = PSA_ALG_RSA_OAEP_GET_HASH(alg); mbedtls_md_type_t md_alg = mbedtls_md_type_from_psa_alg(hash_alg); + /* Just to get the error status right, as rsa_set_padding() doesn't + * distinguish between "bad RSA algorithm" and "unknown hash". */ + if (mbedtls_md_info_from_type(md_alg) == NULL) { + return PSA_ERROR_NOT_SUPPORTED; + } + return mbedtls_rsa_set_padding(rsa, MBEDTLS_RSA_PKCS_V21, md_alg); } #endif /* defined(MBEDTLS_PSA_BUILTIN_ALG_RSA_OAEP) */ From 9b76318138034de90314ae5fda2de2cf5aa44a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 31 May 2023 10:54:08 +0200 Subject: [PATCH 4/9] Change values of md_type enum MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Pégourié-Gonnard --- include/mbedtls/md.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/include/mbedtls/md.h b/include/mbedtls/md.h index 2f1b3e2bae..079fd83d93 100644 --- a/include/mbedtls/md.h +++ b/include/mbedtls/md.h @@ -143,19 +143,20 @@ extern "C" { * stronger message digests instead. * */ +/* XXX: comment + test */ typedef enum { MBEDTLS_MD_NONE=0, /**< None. */ - MBEDTLS_MD_MD5, /**< The MD5 message digest. */ - MBEDTLS_MD_SHA1, /**< The SHA-1 message digest. */ - MBEDTLS_MD_SHA224, /**< The SHA-224 message digest. */ - MBEDTLS_MD_SHA256, /**< The SHA-256 message digest. */ - MBEDTLS_MD_SHA384, /**< The SHA-384 message digest. */ - MBEDTLS_MD_SHA512, /**< The SHA-512 message digest. */ - MBEDTLS_MD_RIPEMD160, /**< The RIPEMD-160 message digest. */ - MBEDTLS_MD_SHA3_224, /**< The SHA3-224 message digest. */ - MBEDTLS_MD_SHA3_256, /**< The SHA3-256 message digest. */ - MBEDTLS_MD_SHA3_384, /**< The SHA3-384 message digest. */ - MBEDTLS_MD_SHA3_512, /**< The SHA3-512 message digest. */ + MBEDTLS_MD_MD5=0x03, /**< The MD5 message digest. */ + MBEDTLS_MD_RIPEMD160=0x04, /**< The RIPEMD-160 message digest. */ + MBEDTLS_MD_SHA1=0x05, /**< The SHA-1 message digest. */ + MBEDTLS_MD_SHA224=0x08, /**< The SHA-224 message digest. */ + MBEDTLS_MD_SHA256=0x09, /**< The SHA-256 message digest. */ + MBEDTLS_MD_SHA384=0x0a, /**< The SHA-384 message digest. */ + MBEDTLS_MD_SHA512=0x0b, /**< The SHA-512 message digest. */ + MBEDTLS_MD_SHA3_224=0x10, /**< The SHA3-224 message digest. */ + MBEDTLS_MD_SHA3_256=0x11, /**< The SHA3-256 message digest. */ + MBEDTLS_MD_SHA3_384=0x12, /**< The SHA3-384 message digest. */ + MBEDTLS_MD_SHA3_512=0x13, /**< The SHA3-512 message digest. */ } mbedtls_md_type_t; #if defined(MBEDTLS_MD_CAN_SHA512) || defined(MBEDTLS_SHA3_C) From 47bb380f6dfdec698988dc1186978fb154a118b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Mon, 5 Jun 2023 12:40:32 +0200 Subject: [PATCH 5/9] Fix missing call to mbedtls_ssl_md_alg_from_hash() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I looked around and think this one the only place where a conversion was missing. Signed-off-by: Manuel Pégourié-Gonnard --- library/ssl_tls.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/library/ssl_tls.c b/library/ssl_tls.c index f0067f4b2d..aeb0957d5d 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -8867,11 +8867,17 @@ unsigned int mbedtls_ssl_tls12_get_preferred_hash_for_sig_alg( MBEDTLS_SSL_TLS12_SIG_ALG_FROM_SIG_AND_HASH_ALG( received_sig_algs[i]); + mbedtls_md_type_t md_alg = + mbedtls_ssl_md_alg_from_hash((unsigned char) hash_alg_received); + if (md_alg == MBEDTLS_MD_NONE) { + continue; + } + if (sig_alg == sig_alg_received) { #if defined(MBEDTLS_USE_PSA_CRYPTO) if (ssl->handshake->key_cert && ssl->handshake->key_cert->key) { psa_algorithm_t psa_hash_alg = - mbedtls_md_psa_alg_from_type(hash_alg_received); + mbedtls_md_psa_alg_from_type(md_alg); if (sig_alg_received == MBEDTLS_SSL_SIG_ECDSA && !mbedtls_pk_can_do_ext(ssl->handshake->key_cert->key, From 1f6d2e352dd7ebfbef16249a0425271028deed5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 6 Jun 2023 12:34:45 +0200 Subject: [PATCH 6/9] Simplify implementation of MD<->PSA translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also, add tests and comments due from previous commits. Signed-off-by: Manuel Pégourié-Gonnard --- include/mbedtls/md.h | 4 ++- library/md.c | 39 +++-------------------------- library/md_psa.h | 6 +++++ tests/suites/test_suite_md.function | 26 +++++++++++++++++++ 4 files changed, 39 insertions(+), 36 deletions(-) diff --git a/include/mbedtls/md.h b/include/mbedtls/md.h index 079fd83d93..deff9cf621 100644 --- a/include/mbedtls/md.h +++ b/include/mbedtls/md.h @@ -143,7 +143,9 @@ extern "C" { * stronger message digests instead. * */ -/* XXX: comment + test */ +/* Note: these are aligned with the definitions of PSA_ALG_ macros for hashes, + * in order to enable an efficient implementation of conversion functions. + * This is tested by md_to_from_psa() in test_suite_md. */ typedef enum { MBEDTLS_MD_NONE=0, /**< None. */ MBEDTLS_MD_MD5=0x03, /**< The MD5 message digest. */ diff --git a/library/md.c b/library/md.c index 932c6d0271..d0ea66b9c7 100644 --- a/library/md.c +++ b/library/md.c @@ -773,46 +773,15 @@ mbedtls_md_type_t mbedtls_md_get_type(const mbedtls_md_info_t *md_info) #if defined(MBEDTLS_PSA_CRYPTO_C) psa_algorithm_t mbedtls_md_psa_alg_from_type(mbedtls_md_type_t md_type) { - switch (md_type) { - case MBEDTLS_MD_MD5: - return PSA_ALG_MD5; - case MBEDTLS_MD_RIPEMD160: - return PSA_ALG_RIPEMD160; - case MBEDTLS_MD_SHA1: - return PSA_ALG_SHA_1; - case MBEDTLS_MD_SHA224: - return PSA_ALG_SHA_224; - case MBEDTLS_MD_SHA256: - return PSA_ALG_SHA_256; - case MBEDTLS_MD_SHA384: - return PSA_ALG_SHA_384; - case MBEDTLS_MD_SHA512: - return PSA_ALG_SHA_512; - default: - return PSA_ALG_NONE; + if (md_type == MBEDTLS_MD_NONE) { + return PSA_ALG_NONE; } + return PSA_ALG_CATEGORY_HASH | (psa_algorithm_t) md_type; } mbedtls_md_type_t mbedtls_md_type_from_psa_alg(psa_algorithm_t psa_alg) { - switch (psa_alg) { - case PSA_ALG_MD5: - return MBEDTLS_MD_MD5; - case PSA_ALG_RIPEMD160: - return MBEDTLS_MD_RIPEMD160; - case PSA_ALG_SHA_1: - return MBEDTLS_MD_SHA1; - case PSA_ALG_SHA_224: - return MBEDTLS_MD_SHA224; - case PSA_ALG_SHA_256: - return MBEDTLS_MD_SHA256; - case PSA_ALG_SHA_384: - return MBEDTLS_MD_SHA384; - case PSA_ALG_SHA_512: - return MBEDTLS_MD_SHA512; - default: - return MBEDTLS_MD_NONE; - } + return (mbedtls_md_type_t) (psa_alg & PSA_ALG_HASH_MASK); } int mbedtls_md_error_from_psa(psa_status_t status) diff --git a/library/md_psa.h b/library/md_psa.h index 3231a6023c..2f6c7017dc 100644 --- a/library/md_psa.h +++ b/library/md_psa.h @@ -33,6 +33,9 @@ * * \param md_type The type of digest to search for. * + * \warning This function does not check if the algorithm is + * supported, it always returns the corresponding identifier. + * * \return The PSA algorithm identifier associated with \p md_type, * regardless of whether it is supported or not. */ @@ -44,6 +47,9 @@ psa_algorithm_t mbedtls_md_psa_alg_from_type(mbedtls_md_type_t md_type); * * \param psa_alg The PSA algorithm identifier to search for. * + * \warning This function does not check if the algorithm is + * supported, it always returns the corresponding identifier. + * * \return The MD type associated with \p psa_alg, * regardless of whether it is supported or not. */ diff --git a/tests/suites/test_suite_md.function b/tests/suites/test_suite_md.function index ac9516ab8d..687b1029e8 100644 --- a/tests/suites/test_suite_md.function +++ b/tests/suites/test_suite_md.function @@ -1,5 +1,10 @@ /* BEGIN_HEADER */ #include "mbedtls/md.h" +#include "md_psa.h" + +#define MD_PSA(md, psa) \ + TEST_EQUAL(mbedtls_md_psa_alg_from_type(md), psa); \ + TEST_EQUAL(mbedtls_md_type_from_psa_alg(psa), md); /* END_HEADER */ /* BEGIN_DEPENDENCIES @@ -36,6 +41,27 @@ exit: } /* END_CASE */ +/* BEGIN_CASE depends_on:MBEDTLS_PSA_CRYPTO_C */ +void md_to_from_psa() +{ + /* We use a simplified implementation that relies on numerical values + * being aligned, so make sure they remain so. */ + MD_PSA(MBEDTLS_MD_MD5, PSA_ALG_MD5); + MD_PSA(MBEDTLS_MD_RIPEMD160, PSA_ALG_RIPEMD160); + MD_PSA(MBEDTLS_MD_SHA1, PSA_ALG_SHA_1); + MD_PSA(MBEDTLS_MD_SHA224, PSA_ALG_SHA_224); + MD_PSA(MBEDTLS_MD_SHA256, PSA_ALG_SHA_256); + MD_PSA(MBEDTLS_MD_SHA384, PSA_ALG_SHA_384); + MD_PSA(MBEDTLS_MD_SHA512, PSA_ALG_SHA_512); + MD_PSA(MBEDTLS_MD_SHA3_224, PSA_ALG_SHA3_224); + MD_PSA(MBEDTLS_MD_SHA3_256, PSA_ALG_SHA3_256); + MD_PSA(MBEDTLS_MD_SHA3_384, PSA_ALG_SHA3_384); + MD_PSA(MBEDTLS_MD_SHA3_512, PSA_ALG_SHA3_512); + + MD_PSA(MBEDTLS_MD_NONE, PSA_ALG_NONE); +} +/* END_CASE */ + /* BEGIN_CASE */ void md_null_args() { From 44176b00ad983fcd135d9487d6f5b0b6b5982f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 7 Jun 2023 11:23:26 +0200 Subject: [PATCH 7/9] Remove guarantee about converting NONE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Pégourié-Gonnard --- library/md.c | 3 --- library/md_psa.h | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library/md.c b/library/md.c index d0ea66b9c7..d8066e2a3c 100644 --- a/library/md.c +++ b/library/md.c @@ -773,9 +773,6 @@ mbedtls_md_type_t mbedtls_md_get_type(const mbedtls_md_info_t *md_info) #if defined(MBEDTLS_PSA_CRYPTO_C) psa_algorithm_t mbedtls_md_psa_alg_from_type(mbedtls_md_type_t md_type) { - if (md_type == MBEDTLS_MD_NONE) { - return PSA_ALG_NONE; - } return PSA_ALG_CATEGORY_HASH | (psa_algorithm_t) md_type; } diff --git a/library/md_psa.h b/library/md_psa.h index 2f6c7017dc..20da5c22be 100644 --- a/library/md_psa.h +++ b/library/md_psa.h @@ -31,7 +31,10 @@ * \brief This function returns the PSA algorithm identifier * associated with the given digest type. * - * \param md_type The type of digest to search for. + * \param md_type The type of digest to search for. Must not be NONE. + * + * \warning If \p md_type is \c MBEDTLS_MD_NONE, this function will + * not return \c PSA_ALG_NONE, but an invalid algorithm. * * \warning This function does not check if the algorithm is * supported, it always returns the corresponding identifier. From 001cbc98bcbc26c4bb95409d62e848a8fc572f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 7 Jun 2023 12:06:06 +0200 Subject: [PATCH 8/9] Make MD<->PSA translation static inline MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Pégourié-Gonnard --- library/md.c | 10 ---------- library/md_psa.h | 10 ++++++++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/library/md.c b/library/md.c index d8066e2a3c..93fe8c5276 100644 --- a/library/md.c +++ b/library/md.c @@ -771,16 +771,6 @@ mbedtls_md_type_t mbedtls_md_get_type(const mbedtls_md_info_t *md_info) } #if defined(MBEDTLS_PSA_CRYPTO_C) -psa_algorithm_t mbedtls_md_psa_alg_from_type(mbedtls_md_type_t md_type) -{ - return PSA_ALG_CATEGORY_HASH | (psa_algorithm_t) md_type; -} - -mbedtls_md_type_t mbedtls_md_type_from_psa_alg(psa_algorithm_t psa_alg) -{ - return (mbedtls_md_type_t) (psa_alg & PSA_ALG_HASH_MASK); -} - int mbedtls_md_error_from_psa(psa_status_t status) { return PSA_TO_MBEDTLS_ERR_LIST(status, psa_to_md_errors, diff --git a/library/md_psa.h b/library/md_psa.h index 20da5c22be..8e00bb1492 100644 --- a/library/md_psa.h +++ b/library/md_psa.h @@ -42,7 +42,10 @@ * \return The PSA algorithm identifier associated with \p md_type, * regardless of whether it is supported or not. */ -psa_algorithm_t mbedtls_md_psa_alg_from_type(mbedtls_md_type_t md_type); +static inline psa_algorithm_t mbedtls_md_psa_alg_from_type(mbedtls_md_type_t md_type) +{ + return PSA_ALG_CATEGORY_HASH | (psa_algorithm_t) md_type; +} /** * \brief This function returns the given digest type @@ -56,7 +59,10 @@ psa_algorithm_t mbedtls_md_psa_alg_from_type(mbedtls_md_type_t md_type); * \return The MD type associated with \p psa_alg, * regardless of whether it is supported or not. */ -mbedtls_md_type_t mbedtls_md_type_from_psa_alg(psa_algorithm_t psa_alg); +static inline mbedtls_md_type_t mbedtls_md_type_from_psa_alg(psa_algorithm_t psa_alg) +{ + return (mbedtls_md_type_t) (psa_alg & PSA_ALG_HASH_MASK); +} /** Convert PSA status to MD error code. * From 0f5fc1ad31664c7ddecce5406485234fcd59ad7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 28 Jun 2023 09:42:04 +0200 Subject: [PATCH 9/9] Actually run MD<->PSA test, and fix it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Pégourié-Gonnard --- tests/suites/test_suite_md.data | 3 +++ tests/suites/test_suite_md.function | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/suites/test_suite_md.data b/tests/suites/test_suite_md.data index 0b0afee723..9b39e9f523 100644 --- a/tests/suites/test_suite_md.data +++ b/tests/suites/test_suite_md.data @@ -2,6 +2,9 @@ MD list mbedtls_md_list: +MD <-> PSA conversion +md_to_from_psa: + MD NULL/uninitialised arguments md_null_args: diff --git a/tests/suites/test_suite_md.function b/tests/suites/test_suite_md.function index 687b1029e8..e3f0e15db7 100644 --- a/tests/suites/test_suite_md.function +++ b/tests/suites/test_suite_md.function @@ -58,7 +58,7 @@ void md_to_from_psa() MD_PSA(MBEDTLS_MD_SHA3_384, PSA_ALG_SHA3_384); MD_PSA(MBEDTLS_MD_SHA3_512, PSA_ALG_SHA3_512); - MD_PSA(MBEDTLS_MD_NONE, PSA_ALG_NONE); + /* Don't test for NONE<->NONE as this is not guaranteed */ } /* END_CASE */