commit 43874e0a848eb5a054c60fb3776e16cc5df7e461
author Thomas Daubney <thomas.daubney@arm.com> Tue Jul 16 17:45:52 2024 +0100
committer Thomas Daubney <thomas.daubney@arm.com> Mon Aug 05 15:56:09 2024 +0100
tree 131b3eaa317837be34922aba4a9122612f254ae6
parent 3ab1b2d00b071fc2122289ed0304a916acb161d2

Remove MBEDTLS_DES_SETKEY_ALT

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

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

diff --git a/tf-psa-crypto/drivers/builtin/src/des.c b/tf-psa-crypto/drivers/builtin/src/des.c
index 5410bd3..7fd7100 100644
--- a/tf-psa-crypto/drivers/builtin/src/des.c
+++ b/tf-psa-crypto/drivers/builtin/src/des.c
@@ -389,8 +389,10 @@
     return 0;
 }
 
-#if !defined(MBEDTLS_DES_SETKEY_ALT)
-void mbedtls_des_setkey(uint32_t SK[32], const unsigned char key[MBEDTLS_DES_KEY_SIZE])
+/*
+ * Internal function for key expansion.
+ */
+static void mbedtls_des_setkey(uint32_t SK[32], const unsigned char key[MBEDTLS_DES_KEY_SIZE])
 {
     int i;
     uint32_t X, Y, T;
@@ -454,7 +456,6 @@
                 | ((Y <<  2) & 0x00000004) | ((Y >> 21) & 0x00000002);
     }
 }
-#endif /* !MBEDTLS_DES_SETKEY_ALT */
 
 /*
  * DES key schedule (56-bit, encryption)