From 1243f93ccaeb1b4b41e67cbb89af42270de4969e Mon Sep 17 00:00:00 2001 From: Paul Elliott Date: Tue, 7 Feb 2023 11:21:10 +0000 Subject: [PATCH] Fix build fails with non ECDSA / restartable builds Signed-off-by: Paul Elliott --- library/psa_crypto.c | 6 ++++-- tests/suites/test_suite_psa_crypto.function | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/library/psa_crypto.c b/library/psa_crypto.c index 62828bdb43..b8abfd09e4 100644 --- a/library/psa_crypto.c +++ b/library/psa_crypto.c @@ -3575,13 +3575,14 @@ psa_status_t mbedtls_psa_sign_hash_complete( 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 @@ psa_status_t mbedtls_psa_verify_hash_start( (void) signature; (void) signature_length; (void) status; + (void) coordinate_bytes; return PSA_ERROR_NOT_SUPPORTED; #endif /* defined(MBEDTLS_PSA_BUILTIN_ALG_ECDSA) || diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function index a1b3c902b6..7ad856924e 100644 --- a/tests/suites/test_suite_psa_crypto.function +++ b/tests/suites/test_suite_psa_crypto.function @@ -1220,6 +1220,10 @@ typedef enum { 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 @@ static void interruptible_signverify_get_minmax_completes(uint32_t max_ops, *max_completes = 1; } } +#endif /* defined(MBEDTLS_PSA_BUILTIN_ALG_ECDSA) || + * defined(MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA) && + * defined( MBEDTLS_ECP_RESTARTABLE ) */ /* END_HEADER */