commit 6ab314f71d0fe0f4c39d78cdd57e0b65ea1a10b8
author Dave Rodgman <dave.rodgman@arm.com> Tue Oct 10 14:00:17 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Tue Oct 10 14:00:17 2023 +0100
tree d25096e3b8fa5f2ab22a16197048b15381a99ed0
parent 5d4ef83e01645a40d07b945f8b70501f190ffd90

More config option renaming

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

include/mbedtls/config_adjust_legacy_crypto.h

diff --git a/include/mbedtls/config_adjust_legacy_crypto.h b/include/mbedtls/config_adjust_legacy_crypto.h
index 78a5bb1..bd356da 100644
--- a/include/mbedtls/config_adjust_legacy_crypto.h
+++ b/include/mbedtls/config_adjust_legacy_crypto.h
@@ -186,16 +186,16 @@
 
 /* Backwards compatibility for some macros which were renamed to reflect that
  * they are related to Armv8, not aarch64. */
-#if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT)
+#if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT) && !defined(MBEDTLS_SHA256_USE_ARMV8_CRYPTO_IF_PRESENT)
 #define MBEDTLS_SHA256_USE_ARMV8_CRYPTO_IF_PRESENT
 #endif
-#if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY)
+#if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY) && !defined(MBEDTLS_SHA256_USE_ARMV8_CRYPTO_ONLY)
 #define MBEDTLS_SHA256_USE_ARMV8_CRYPTO_ONLY
 #endif
-#if defined(MBEDTLS_SHA512_USE_A64_CRYPTO_IF_PRESENT)
+#if defined(MBEDTLS_SHA512_USE_A64_CRYPTO_IF_PRESENT) && !defined(MBEDTLS_SHA512_USE_ARMV8_CRYPTO_IF_PRESENT)
 #define MBEDTLS_SHA512_USE_ARMV8_CRYPTO_IF_PRESENT
 #endif
-#if defined(MBEDTLS_SHA512_USE_A64_CRYPTO_ONLY)
+#if defined(MBEDTLS_SHA512_USE_A64_CRYPTO_ONLY) && !defined(MBEDTLS_SHA512_USE_ARMV8_CRYPTO_ONLY)
 #define MBEDTLS_SHA512_USE_ARMV8_CRYPTO_ONLY
 #endif