commit 38e64fbce0b24587cbd8b8412bded66e8ed53bb1
author Thomas Daubney <thomas.daubney@arm.com> Wed Jul 31 15:32:15 2024 +0100
committer Thomas Daubney <thomas.daubney@arm.com> Tue Aug 06 15:20:07 2024 +0100
tree a0c20ef5329df536fe606e59712a117f47ae8663
parent 7070d26fa02ef931e677cc8c8a581bf532b04dd5

Merge if blocks in SHA256/512 code

Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>

tf-psa-crypto/drivers/builtin/src/sha256.c

diff --git a/tf-psa-crypto/drivers/builtin/src/sha256.c b/tf-psa-crypto/drivers/builtin/src/sha256.c
index 339fa84..aff626f 100644
--- a/tf-psa-crypto/drivers/builtin/src/sha256.c
+++ b/tf-psa-crypto/drivers/builtin/src/sha256.c
@@ -552,10 +552,6 @@
     return 0;
 }
 
-#endif /* !MBEDTLS_SHA256_USE_ARMV8_A_CRYPTO_ONLY */
-
-#if !defined(MBEDTLS_SHA256_USE_ARMV8_A_CRYPTO_ONLY)
-
 static size_t mbedtls_internal_sha256_process_many_c(
     mbedtls_sha256_context *ctx, const uint8_t *data, size_t len)
 {

tf-psa-crypto/drivers/builtin/src/sha512.c

diff --git a/tf-psa-crypto/drivers/builtin/src/sha512.c b/tf-psa-crypto/drivers/builtin/src/sha512.c
index a5ed782..c1d5e59 100644
--- a/tf-psa-crypto/drivers/builtin/src/sha512.c
+++ b/tf-psa-crypto/drivers/builtin/src/sha512.c
@@ -671,11 +671,6 @@
     return 0;
 }
 
-#endif /* !MBEDTLS_SHA512_USE_A64_CRYPTO_ONLY */
-
-
-#if !defined(MBEDTLS_SHA512_USE_A64_CRYPTO_ONLY)
-
 static size_t mbedtls_internal_sha512_process_many_c(
     mbedtls_sha512_context *ctx, const uint8_t *data, size_t len)
 {