aboutsummaryrefslogtreecommitdiff
path: root/tests/suites
diff options
context:
space:
mode:
authorGilles Peskine <gilles.peskine@arm.com>2022-12-15 19:47:44 +0100
committerGitHub <noreply@github.com>2022-12-15 19:47:44 +0100
commitd1dd41f3fc7123fe734766951da800c606200a48 (patch)
tree8d64be4510d4bd2b1a662b5e0ab2a822c916cfd1 /tests/suites
parent6b21820bd3983c5972b75d690664cb539befd0ea (diff)
parent67bad73e870477a2c44f843eac50f91c148db6fc (diff)
downloadmbedtls-d1dd41f3fc7123fe734766951da800c606200a48.zip
mbedtls-d1dd41f3fc7123fe734766951da800c606200a48.tar.gz
mbedtls-d1dd41f3fc7123fe734766951da800c606200a48.tar.bz2
Merge pull request #6723 from mpg/restartable-vs-use-psa
Document ECP_RESTARTABLE and make it compatible with USE_PSA
Diffstat (limited to 'tests/suites')
-rw-r--r--tests/suites/test_suite_ecp.function2
-rw-r--r--tests/suites/test_suite_x509parse.function3
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/suites/test_suite_ecp.function b/tests/suites/test_suite_ecp.function
index 7d29e52..2971c57 100644
--- a/tests/suites/test_suite_ecp.function
+++ b/tests/suites/test_suite_ecp.function
@@ -237,7 +237,7 @@ exit:
}
/* END_CASE */
-/* BEGIN_CASE depends_on:MBEDTLS_ECP_RESTARTABLE */
+/* BEGIN_CASE depends_on:MBEDTLS_ECP_RESTARTABLE:MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED */
void ecp_muladd_restart( int id, char *xR_str, char *yR_str,
char *u1_str, char *u2_str,
char *xQ_str, char *yQ_str,
diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 2585720..dc36b81 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -579,6 +579,8 @@ void x509_verify_restart( char *crt_file, char *ca_file,
mbedtls_x509_crt_init( &crt );
mbedtls_x509_crt_init( &ca );
+ USE_PSA_INIT( );
+
TEST_ASSERT( mbedtls_x509_crt_parse_file( &crt, crt_file ) == 0 );
TEST_ASSERT( mbedtls_x509_crt_parse_file( &ca, ca_file ) == 0 );
@@ -607,6 +609,7 @@ exit:
mbedtls_x509_crt_restart_free( &rs_ctx );
mbedtls_x509_crt_free( &crt );
mbedtls_x509_crt_free( &ca );
+ USE_PSA_DONE( );
}
/* END_CASE */