From 95974974d2eee39baf3e264c67ef261ba6a36c21 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Fri, 22 Apr 2022 13:57:44 +0200 Subject: [PATCH] Update mbedtls_pk_wrap_as_opaque() usage in PK & X509write tests Signed-off-by: Neil Armstrong --- tests/suites/test_suite_pk.function | 20 +++++++++++--- tests/suites/test_suite_x509write.function | 31 +++++++++++++++++----- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/tests/suites/test_suite_pk.function b/tests/suites/test_suite_pk.function index 4b3af4c8da..32c2644060 100644 --- a/tests/suites/test_suite_pk.function +++ b/tests/suites/test_suite_pk.function @@ -1080,6 +1080,7 @@ void pk_psa_sign( int parameter_arg, unsigned char pkey_legacy[200]; unsigned char pkey_psa[200]; unsigned char *pkey_legacy_start, *pkey_psa_start; + psa_algorithm_t alg_psa; size_t sig_len, klen_legacy, klen_psa; int ret; mbedtls_svc_key_id_t key_id; @@ -1107,6 +1108,7 @@ void pk_psa_sign( int parameter_arg, TEST_ASSERT( mbedtls_rsa_gen_key( mbedtls_pk_rsa( pk ), mbedtls_test_rnd_std_rand, NULL, parameter_arg, 3 ) == 0 ); + alg_psa = PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_SHA_256 ); } else #endif /* MBEDTLS_RSA_C && MBEDTLS_GENPRIME */ @@ -1122,6 +1124,7 @@ void pk_psa_sign( int parameter_arg, TEST_ASSERT( mbedtls_ecp_gen_key( grpid, (mbedtls_ecp_keypair*) pk.pk_ctx, mbedtls_test_rnd_std_rand, NULL ) == 0 ); + alg_psa = PSA_ALG_ECDSA( PSA_ALG_SHA_256 ); } else #endif /* MBEDTLS_ECDSA_C */ @@ -1139,8 +1142,9 @@ void pk_psa_sign( int parameter_arg, pkey_legacy_start = pkey_legacy + sizeof( pkey_legacy ) - klen_legacy; /* Turn PK context into an opaque one. */ - TEST_ASSERT( mbedtls_pk_wrap_as_opaque( &pk, &key_id, - PSA_ALG_SHA_256 ) == 0 ); + TEST_ASSERT( mbedtls_pk_wrap_as_opaque( &pk, &key_id, alg_psa, + PSA_KEY_USAGE_SIGN_HASH, + PSA_ALG_NONE ) == 0 ); PSA_ASSERT( psa_get_key_attributes( key_id, &attributes ) ); TEST_EQUAL( psa_get_key_type( &attributes ), expected_type ); @@ -1241,6 +1245,7 @@ void pk_psa_wrap_sign_ext( int pk_type, int parameter, int key_pk_type, int md_a unsigned char *pkey_start; unsigned char hash[MBEDTLS_MD_MAX_SIZE]; psa_algorithm_t psa_md_alg = mbedtls_psa_translate_md( md_alg ); + psa_algorithm_t psa_alg; size_t hash_len = PSA_HASH_LENGTH( psa_md_alg ); const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type( md_alg ); void const *options = NULL; @@ -1266,8 +1271,17 @@ void pk_psa_wrap_sign_ext( int pk_type, int parameter, int key_pk_type, int md_a /* mbedtls_pk_write_pubkey_der() writes backwards in the data buffer. */ pkey_start = pkey + sizeof( pkey ) - pkey_len; + if( key_pk_type == MBEDTLS_PK_RSA ) + psa_alg = PSA_ALG_RSA_PKCS1V15_SIGN( psa_md_alg ); + else if( key_pk_type == MBEDTLS_PK_RSASSA_PSS ) + psa_alg = PSA_ALG_RSA_PSS( psa_md_alg ); + else + TEST_ASSUME( ! "PK key type not supported in this configuration" ); + /* Turn PK context into an opaque one. */ - TEST_EQUAL( mbedtls_pk_wrap_as_opaque( &pk, &key_id, psa_md_alg ), 0 ); + TEST_EQUAL( mbedtls_pk_wrap_as_opaque( &pk, &key_id, psa_alg, + PSA_KEY_USAGE_SIGN_HASH, + PSA_ALG_NONE ), 0 ); memset( hash, 0x2a, sizeof( hash ) ); memset( sig, 0, sizeof( sig ) ); diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function index 485bbe255b..f5001bd8c5 100644 --- a/tests/suites/test_suite_x509write.function +++ b/tests/suites/test_suite_x509write.function @@ -170,7 +170,7 @@ void x509_csr_check_opaque( char *key_file, int md_type, int key_usage, { mbedtls_pk_context key; mbedtls_svc_key_id_t key_id = MBEDTLS_SVC_KEY_ID_INIT; - psa_algorithm_t md_alg_psa; + psa_algorithm_t md_alg_psa, alg_psa; mbedtls_x509write_csr req; unsigned char buf[4096]; int ret; @@ -187,7 +187,17 @@ void x509_csr_check_opaque( char *key_file, int md_type, int key_usage, mbedtls_pk_init( &key ); TEST_ASSERT( mbedtls_pk_parse_keyfile( &key, key_file, NULL, mbedtls_test_rnd_std_rand, NULL ) == 0 ); - TEST_ASSERT( mbedtls_pk_wrap_as_opaque( &key, &key_id, md_alg_psa ) == 0 ); + + if( mbedtls_pk_get_type( &key ) == MBEDTLS_PK_ECKEY ) + alg_psa = PSA_ALG_ECDSA( md_alg_psa ); + else if( mbedtls_pk_get_type( &key ) == MBEDTLS_PK_RSA ) + alg_psa = PSA_ALG_RSA_PKCS1V15_SIGN( md_alg_psa ); + else + TEST_ASSUME( ! "PK key type not supported in this configuration" ); + + TEST_ASSERT( mbedtls_pk_wrap_as_opaque( &key, &key_id, alg_psa, + PSA_KEY_USAGE_SIGN_HASH, + PSA_ALG_NONE ) == 0 ); mbedtls_x509write_csr_init( &req ); mbedtls_x509write_csr_set_md_alg( &req, md_type ); @@ -280,12 +290,21 @@ void x509_crt_check( char *subject_key_file, char *subject_pwd, /* For Opaque PK contexts, wrap key as an Opaque RSA context. */ if( pk_wrap == 2 ) { - psa_algorithm_t md_alg_psa = - mbedtls_psa_translate_md( (mbedtls_md_type_t) md_type ); + psa_algorithm_t alg_psa, md_alg_psa; + md_alg_psa = mbedtls_psa_translate_md( (mbedtls_md_type_t) md_type ); TEST_ASSERT( md_alg_psa != MBEDTLS_MD_NONE ); - TEST_ASSERT( mbedtls_pk_wrap_as_opaque( &issuer_key, &key_id, - md_alg_psa ) == 0 ); + + if( mbedtls_pk_get_type( &issuer_key ) == MBEDTLS_PK_ECKEY ) + alg_psa = PSA_ALG_ECDSA( md_alg_psa ); + else if( mbedtls_pk_get_type( &issuer_key ) == MBEDTLS_PK_RSA ) + alg_psa = PSA_ALG_RSA_PKCS1V15_SIGN( md_alg_psa ); + else + TEST_ASSUME( ! "PK key type not supported in this configuration" ); + + TEST_ASSERT( mbedtls_pk_wrap_as_opaque( &issuer_key, &key_id, alg_psa, + PSA_KEY_USAGE_SIGN_HASH, + PSA_ALG_NONE ) == 0 ); } #endif /* MBEDTLS_USE_PSA_CRYPTO */