commit 73692b75378604b8ef68e0ae0a2200d3d482c1f0
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu Jul 21 10:40:13 2022 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu Jul 21 12:11:53 2022 +0200
tree fe5118fba5a81640881ea6ba6283b1b4ef9850ba
parent bdc8fd630a8d0f4a16dcedf7a5fbe00d7ebd18dc

Rework macros expressing dependencies

Fix usage with sed:

s/MBEDTLS_OR_PSA_WANT_\([A-Z_0-9]*\)/MBEDTLS_HAS_\1_VIA_LOWLEVEL_OR_PSA/
s/MBEDTLS_USE_PSA_WANT_\([A-Z_0-9]*\)/MBEDTLS_HAS_\1_VIA_MD_OR_PSA_BASED_ON_USE_PSA/

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>

library/hash_info.c

diff --git a/library/hash_info.c b/library/hash_info.c
index b45d1d2..f2a4ba0 100644
--- a/library/hash_info.c
+++ b/library/hash_info.c
@@ -21,7 +21,7 @@
  */
 
 #include "hash_info.h"
-#include "or_psa_helpers.h"
+#include "legacy_or_psa.h"
 
 typedef struct
 {
@@ -32,25 +32,25 @@
 } hash_entry;
 
 static const hash_entry hash_table[] = {
-#if defined(MBEDTLS_OR_PSA_WANT_ALG_MD5)
+#if defined(MBEDTLS_HAS_ALG_MD5_VIA_LOWLEVEL_OR_PSA)
     { PSA_ALG_MD5, MBEDTLS_MD_MD5, 16, 64 },
 #endif
-#if defined(MBEDTLS_OR_PSA_WANT_ALG_RIPEMD160)
+#if defined(MBEDTLS_HAS_ALG_RIPEMD160_VIA_LOWLEVEL_OR_PSA)
     { PSA_ALG_RIPEMD160, MBEDTLS_MD_RIPEMD160, 20, 64 },
 #endif
-#if defined(MBEDTLS_OR_PSA_WANT_ALG_SHA_1)
+#if defined(MBEDTLS_HAS_ALG_SHA_1_VIA_LOWLEVEL_OR_PSA)
     { PSA_ALG_SHA_1, MBEDTLS_MD_SHA1, 20, 64 },
 #endif
-#if defined(MBEDTLS_OR_PSA_WANT_ALG_SHA_224)
+#if defined(MBEDTLS_HAS_ALG_SHA_224_VIA_LOWLEVEL_OR_PSA)
     { PSA_ALG_SHA_224, MBEDTLS_MD_SHA224, 28, 64 },
 #endif
-#if defined(MBEDTLS_OR_PSA_WANT_ALG_SHA_256)
+#if defined(MBEDTLS_HAS_ALG_SHA_256_VIA_LOWLEVEL_OR_PSA)
     { PSA_ALG_SHA_256, MBEDTLS_MD_SHA256, 32, 64 },
 #endif
-#if defined(MBEDTLS_OR_PSA_WANT_ALG_SHA_384)
+#if defined(MBEDTLS_HAS_ALG_SHA_384_VIA_LOWLEVEL_OR_PSA)
     { PSA_ALG_SHA_384, MBEDTLS_MD_SHA384, 48, 128 },
 #endif
-#if defined(MBEDTLS_OR_PSA_WANT_ALG_SHA_512)
+#if defined(MBEDTLS_HAS_ALG_SHA_512_VIA_LOWLEVEL_OR_PSA)
     { PSA_ALG_SHA_512, MBEDTLS_MD_SHA512, 64, 128 },
 #endif
     { PSA_ALG_NONE, MBEDTLS_MD_NONE, 0, 0 },