Introduce MBEDTLS_OR_PSA_WANT_xxx helper macros
Currently just replacing existing uses, but the real point of having
these conditions as a single macro is that we'll be able to use them in
tests case dependencies, see next commit.
Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
diff --git a/library/md_internal.h b/library/md_internal.h
index 12bc218..1f21643 100644
--- a/library/md_internal.h
+++ b/library/md_internal.h
@@ -24,6 +24,7 @@
#include "common.h"
#include "mbedtls/md.h"
+#include "or_psa_helpers.h"
/** Get the output length of the given hash type
*
@@ -35,29 +36,29 @@
{
switch( md_type )
{
-#if defined(MBEDTLS_MD5_C) || defined(PSA_WANT_ALG_MD5)
+#if defined(MBEDTLS_OR_PSA_WANT_ALG_MD5)
case MBEDTLS_MD_MD5:
return( 16 );
#endif
-#if defined(MBEDTLS_RIPEMD160_C) || defined(PSA_WANT_ALG_RIPEMD160) || \
- defined(MBEDTLS_SHA1_C) || defined(PSA_WANT_ALG_SHA_1)
+#if defined(MBEDTLS_OR_PSA_WANT_ALG_RIPEMD160) || \
+ defined(MBEDTLS_OR_PSA_WANT_ALG_SHA_1)
case MBEDTLS_MD_RIPEMD160:
case MBEDTLS_MD_SHA1:
return( 20 );
#endif
-#if defined(MBEDTLS_SHA224_C) || defined(PSA_WANT_ALG_SHA_224)
+#if defined(MBEDTLS_OR_PSA_WANT_ALG_SHA_224)
case MBEDTLS_MD_SHA224:
return( 28 );
#endif
-#if defined(MBEDTLS_SHA256_C) || defined(PSA_WANT_ALG_SHA_256)
+#if defined(MBEDTLS_OR_PSA_WANT_ALG_SHA_256)
case MBEDTLS_MD_SHA256:
return( 32 );
#endif
-#if defined(MBEDTLS_SHA384_C) || defined(PSA_WANT_ALG_SHA_384)
+#if defined(MBEDTLS_OR_PSA_WANT_ALG_SHA_384)
case MBEDTLS_MD_SHA384:
return( 48 );
#endif
-#if defined(MBEDTLS_SHA512_C) || defined(PSA_WANT_ALG_SHA_512)
+#if defined(MBEDTLS_OR_PSA_WANT_ALG_SHA_512)
case MBEDTLS_MD_SHA512:
return( 64 );
#endif