PSA code depends on MBEDTLS_SSL_PROTO_TLS1_3
With TLS 1.3 support MBEDTLS_PSA_CRYPTO_C is enabled so PSA support
is always enabled.
Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 5e02d10..81a0f48 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -3885,7 +3885,7 @@
}
/* END_CASE */
-/* BEGIN_CASE depends_on:MBEDTLS_USE_PSA_CRYPTO:MBEDTLS_TEST_HOOKS:MBEDTLS_SSL_PROTO_TLS1_3 */
+/* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS:MBEDTLS_SSL_PROTO_TLS1_3 */
void psa_hkdf_extract( int alg,
data_t *ikm,
data_t *salt,
@@ -3913,7 +3913,7 @@
}
/* END_CASE */
-/* BEGIN_CASE depends_on:MBEDTLS_USE_PSA_CRYPTO:MBEDTLS_TEST_HOOKS:MBEDTLS_SSL_PROTO_TLS1_3 */
+/* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS:MBEDTLS_SSL_PROTO_TLS1_3 */
void psa_hkdf_extract_ret( int alg, int ret )
{
int output_ret;
@@ -3942,7 +3942,7 @@
}
/* END_CASE */
-/* BEGIN_CASE depends_on:MBEDTLS_USE_PSA_CRYPTO:MBEDTLS_TEST_HOOKS:MBEDTLS_SSL_PROTO_TLS1_3 */
+/* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS:MBEDTLS_SSL_PROTO_TLS1_3 */
void psa_hkdf_expand( int alg,
data_t *info,
data_t *prk,
@@ -3970,7 +3970,7 @@
}
/* END_CASE */
-/* BEGIN_CASE depends_on:MBEDTLS_USE_PSA_CRYPTO:MBEDTLS_TEST_HOOKS:MBEDTLS_SSL_PROTO_TLS1_3 */
+/* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS:MBEDTLS_SSL_PROTO_TLS1_3 */
void psa_hkdf_expand_ret( int alg, int prk_len, int okm_len, int ret )
{
int output_ret;
@@ -4062,7 +4062,7 @@
TEST_ASSERT( (size_t) desired_length <= sizeof(dst) );
TEST_ASSERT( (size_t) desired_length == expected->len );
- USE_PSA_INIT( );
+ PSA_INIT( );
TEST_ASSERT( mbedtls_ssl_tls13_hkdf_expand_label(
(mbedtls_md_type_t) hash_alg,
@@ -4074,7 +4074,7 @@
ASSERT_COMPARE( dst, (size_t) desired_length,
expected->x, (size_t) expected->len );
- USE_PSA_DONE( );
+ PSA_DONE( );
}
/* END_CASE */
@@ -4098,7 +4098,7 @@
TEST_ASSERT( expected_client_write_key->len == expected_server_write_key->len &&
expected_client_write_key->len == (size_t) desired_key_len );
- USE_PSA_INIT( );
+ PSA_INIT( );
TEST_ASSERT( mbedtls_ssl_tls13_make_traffic_keys(
(mbedtls_md_type_t) hash_alg,
@@ -4125,7 +4125,7 @@
expected_server_write_iv->x,
(size_t) desired_iv_len );
- USE_PSA_DONE( );
+ PSA_DONE( );
}
/* END_CASE */
@@ -4156,7 +4156,7 @@
TEST_ASSERT( (size_t) desired_length <= sizeof(dst) );
TEST_ASSERT( (size_t) desired_length == expected->len );
- USE_PSA_INIT( );
+ PSA_INIT( );
TEST_ASSERT( mbedtls_ssl_tls13_derive_secret(
(mbedtls_md_type_t) hash_alg,
@@ -4169,7 +4169,7 @@
ASSERT_COMPARE( dst, desired_length,
expected->x, desired_length );
- USE_PSA_DONE( );
+ PSA_DONE( );
}
/* END_CASE */
@@ -4192,7 +4192,7 @@
traffic_expected->len == md_size &&
exporter_expected->len == md_size );
- USE_PSA_INIT( );
+ PSA_INIT( );
TEST_ASSERT( mbedtls_ssl_tls13_derive_early_secrets(
md_type, secret->x, transcript->x, transcript->len,
@@ -4203,7 +4203,7 @@
ASSERT_COMPARE( secrets.early_exporter_master_secret, md_size,
exporter_expected->x, exporter_expected->len );
- USE_PSA_DONE( );
+ PSA_DONE( );
}
/* END_CASE */
@@ -4226,7 +4226,7 @@
client_expected->len == md_size &&
server_expected->len == md_size );
- USE_PSA_INIT( );
+ PSA_INIT( );
TEST_ASSERT( mbedtls_ssl_tls13_derive_handshake_secrets(
md_type, secret->x, transcript->x, transcript->len,
@@ -4237,7 +4237,7 @@
ASSERT_COMPARE( secrets.server_handshake_traffic_secret, md_size,
server_expected->x, server_expected->len );
- USE_PSA_DONE( );
+ PSA_DONE( );
}
/* END_CASE */
@@ -4262,7 +4262,7 @@
server_expected->len == md_size &&
exporter_expected->len == md_size );
- USE_PSA_INIT( );
+ PSA_INIT( );
TEST_ASSERT( mbedtls_ssl_tls13_derive_application_secrets(
md_type, secret->x, transcript->x, transcript->len,
@@ -4275,7 +4275,7 @@
ASSERT_COMPARE( secrets.exporter_master_secret, md_size,
exporter_expected->x, exporter_expected->len );
- USE_PSA_DONE( );
+ PSA_DONE( );
}
/* END_CASE */
@@ -4296,7 +4296,7 @@
transcript->len == md_size &&
resumption_expected->len == md_size );
- USE_PSA_INIT( );
+ PSA_INIT( );
TEST_ASSERT( mbedtls_ssl_tls13_derive_resumption_master_secret(
md_type, secret->x, transcript->x, transcript->len,
@@ -4305,7 +4305,7 @@
ASSERT_COMPARE( secrets.resumption_master_secret, md_size,
resumption_expected->x, resumption_expected->len );
- USE_PSA_DONE( );
+ PSA_DONE( );
}
/* END_CASE */
@@ -4326,7 +4326,7 @@
transcript->len == md_size &&
binder_expected->len == md_size );
- USE_PSA_INIT( );
+ PSA_INIT( );
TEST_ASSERT( mbedtls_ssl_tls13_create_psk_binder(
NULL, /* SSL context for debugging only */
@@ -4339,7 +4339,7 @@
ASSERT_COMPARE( binder, md_size,
binder_expected->x, binder_expected->len );
- USE_PSA_DONE( );
+ PSA_DONE( );
}
/* END_CASE */
@@ -4452,7 +4452,7 @@
{
unsigned char secret_new[ MBEDTLS_MD_MAX_SIZE ];
- USE_PSA_INIT();
+ PSA_INIT();
TEST_ASSERT( mbedtls_ssl_tls13_evolve_secret(
(mbedtls_md_type_t) hash_alg,
@@ -4463,7 +4463,7 @@
ASSERT_COMPARE( secret_new, (size_t) expected->len,
expected->x, (size_t) expected->len );
- USE_PSA_DONE();
+ PSA_DONE();
}
/* END_CASE */