commit 5fcbe4c1f802b5532a198f91d7cfa33f211c7cbc
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu Jul 06 13:02:51 2023 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon Oct 16 10:25:44 2023 +0200
tree 397cad09f7015f6fdaba2ac55ef2bba9f47631b5
parent da88c380bd9674efef64b91b9ff34057c6b537d3

Further rationalize includes

- only include psa_util when we use PSA Crypto
- re-order includes

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

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 1dd5653..3fca2c4 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -25,10 +25,16 @@
 #include "mbedtls/asn1.h"
 #include "mbedtls/oid.h"
 #include "mbedtls/platform_util.h"
+#include "mbedtls/platform.h"
 #include "mbedtls/error.h"
 
 #include <string.h>
 
+#if defined(MBEDTLS_USE_PSA_CRYPTO)
+#include "mbedtls/psa_util.h"
+#include "psa/crypto.h"
+#endif
+
 /* Key types */
 #if defined(MBEDTLS_RSA_C)
 #include "mbedtls/rsa.h"
@@ -49,16 +55,6 @@
 #include "mbedtls/pkcs12.h"
 #endif
 
-#if defined(MBEDTLS_PSA_CRYPTO_C)
-#include "psa_util_internal.h"
-#endif
-
-#if defined(MBEDTLS_USE_PSA_CRYPTO)
-#include "psa/crypto.h"
-#endif
-
-#include "mbedtls/platform.h"
-
 /* Helper for Montgomery curves */
 #if defined(MBEDTLS_PK_HAVE_ECC_KEYS) && defined(MBEDTLS_PK_HAVE_RFC8410_CURVES)
 #define MBEDTLS_PK_IS_RFC8410_GROUP_ID(id)  \