commit d49cbc1493a5d0823b57b160fede60a949445133
author Valerio Setti <valerio.setti@nordicsemi.no> Wed Apr 05 18:21:48 2023 +0200
committer Valerio Setti <valerio.setti@nordicsemi.no> Tue Apr 11 11:33:50 2023 +0200
tree 1dea90079656f1781ff3a29fb204b043296acd0a
parent 29b395c8543e022dca60990a03e7ec9a78c0c7fd

test: fix remaining failures in test due to the ECP_LIGHT symbol

Changes in test_suite_psa_crypto are to enforce the dependency
on ECP_C which is mandatory for some key's derivation.

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>

tests/suites/test_suite_pk.function

diff --git a/tests/suites/test_suite_pk.function b/tests/suites/test_suite_pk.function
index dc4604a..5a4e77f 100644
--- a/tests/suites/test_suite_pk.function
+++ b/tests/suites/test_suite_pk.function
@@ -23,7 +23,7 @@
 #define RSA_KEY_SIZE 512
 #define RSA_KEY_LEN   64
 
-#if defined(MBEDTLS_USE_PSA_CRYPTO) && defined(MBEDTLS_ECP_C)
+#if defined(MBEDTLS_USE_PSA_CRYPTO) && defined(MBEDTLS_ECP_LIGHT)
 static int pk_genkey_ec(mbedtls_ecp_group *grp,
                         mbedtls_mpi *d, mbedtls_ecp_point *Q)
 {
@@ -71,7 +71,7 @@
 
     return ret;
 }
-#endif /* MBEDTLS_USE_PSA_CRYPTO && MBEDTLS_ECP_C */
+#endif /* MBEDTLS_USE_PSA_CRYPTO && MBEDTLS_ECP_LIGHT */
 
 /** Generate a key of the desired type.
  *
@@ -96,7 +96,7 @@
                                    parameter, 3);
     }
 #endif
-#if defined(MBEDTLS_ECP_C)
+#if defined(MBEDTLS_ECP_LIGHT)
     if (mbedtls_pk_get_type(pk) == MBEDTLS_PK_ECKEY ||
         mbedtls_pk_get_type(pk) == MBEDTLS_PK_ECKEY_DH ||
         mbedtls_pk_get_type(pk) == MBEDTLS_PK_ECDSA) {
@@ -110,14 +110,15 @@
         return pk_genkey_ec(&mbedtls_pk_ec(*pk)->grp,
                             &mbedtls_pk_ec(*pk)->d,
                             &mbedtls_pk_ec(*pk)->Q);
-#else /* MBEDTLS_USE_PSA_CRYPTO */
+#endif /* MBEDTLS_USE_PSA_CRYPTO */
+#if defined(MBEDTLS_ECP_C)
         return mbedtls_ecp_gen_keypair(&mbedtls_pk_ec(*pk)->grp,
                                        &mbedtls_pk_ec(*pk)->d,
                                        &mbedtls_pk_ec(*pk)->Q,
                                        mbedtls_test_rnd_std_rand, NULL);
-#endif /* MBEDTLS_USE_PSA_CRYPTO */
-    }
 #endif /* MBEDTLS_ECP_C */
+    }
+#endif /* MBEDTLS_ECP_LIGHT */
     return -1;
 }