commit 1243f93ccaeb1b4b41e67cbb89af42270de4969e
author Paul Elliott <paul.elliott@arm.com> Tue Feb 07 11:21:10 2023 +0000
committer Paul Elliott <paul.elliott@arm.com> Wed Feb 15 23:34:29 2023 +0000
tree 97005727f340bcb1c7255f7317fcfe81f6f11e4b
parent 6f60037589394947ebc08bfc3030231b2e08cd66

Fix build fails with non ECDSA / restartable builds

Signed-off-by: Paul Elliott <paul.elliott@arm.com>

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 62828bd..b8abfd0 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3575,13 +3575,14 @@
     size_t *signature_length)
 {
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
-    mbedtls_mpi r;
-    mbedtls_mpi s;
 
 #if (defined(MBEDTLS_PSA_BUILTIN_ALG_ECDSA) || \
     defined(MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA)) && \
     defined(MBEDTLS_ECP_RESTARTABLE)
 
+    mbedtls_mpi r;
+    mbedtls_mpi s;
+
     if (signature_size < 2 * operation->coordinate_bytes) {
         return PSA_ERROR_BUFFER_TOO_SMALL;
     }
@@ -3790,6 +3791,7 @@
     (void) signature;
     (void) signature_length;
     (void) status;
+    (void) coordinate_bytes;
 
     return PSA_ERROR_NOT_SUPPORTED;
 #endif /* defined(MBEDTLS_PSA_BUILTIN_ALG_ECDSA) ||

tests/suites/test_suite_psa_crypto.function

diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index a1b3c90..7ad8569 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -1220,6 +1220,10 @@
     INJECT_ANTICIPATE_KEY_DERIVATION_2,
 } ecjpake_injected_failure_t;
 
+#if (defined(MBEDTLS_PSA_BUILTIN_ALG_ECDSA) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA)) && \
+    defined(MBEDTLS_ECP_RESTARTABLE)
+
 static void interruptible_signverify_get_minmax_completes(uint32_t max_ops,
                                                           psa_status_t expected_status,
                                                           size_t *min_completes,
@@ -1244,6 +1248,9 @@
         *max_completes = 1;
     }
 }
+#endif /* defined(MBEDTLS_PSA_BUILTIN_ALG_ECDSA) ||
+        * defined(MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA) &&
+        * defined( MBEDTLS_ECP_RESTARTABLE ) */
 
 /* END_HEADER */