From cb87403560351aef105c9a5dc80300939896e1bb Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Fri, 8 Apr 2022 15:14:40 +0200 Subject: [PATCH] Use 1024 bits RSA key size for RSA PK Opaque tests Signed-off-by: Neil Armstrong --- tests/suites/test_suite_pk.data | 2 +- tests/suites/test_suite_pk.function | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/suites/test_suite_pk.data b/tests/suites/test_suite_pk.data index 18e165b43..323efc2c4 100644 --- a/tests/suites/test_suite_pk.data +++ b/tests/suites/test_suite_pk.data @@ -348,7 +348,7 @@ pk_psa_sign:MBEDTLS_ECP_DP_BP512R1:PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_BRAI PSA wrapped sign: RSA PKCS1 v1.5 depends_on:MBEDTLS_RSA_C:MBEDTLS_PKCS1_V15:MBEDTLS_GENPRIME -pk_psa_sign:512:PSA_KEY_TYPE_RSA_KEY_PAIR:512 +pk_psa_sign:1024:PSA_KEY_TYPE_RSA_KEY_PAIR:1024 PK Sign ext:RSA2048,PK_RSA,MD_SHA256 depends_on:MBEDTLS_PKCS1_V15:MBEDTLS_SHA256_C:MBEDTLS_RSA_C diff --git a/tests/suites/test_suite_pk.function b/tests/suites/test_suite_pk.function index 7f2b2b8d5..6c4f9e44d 100644 --- a/tests/suites/test_suite_pk.function +++ b/tests/suites/test_suite_pk.function @@ -119,7 +119,7 @@ mbedtls_svc_key_id_t pk_psa_genkey_rsa( void ) mbedtls_svc_key_id_t key; psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; const psa_key_type_t type = PSA_KEY_TYPE_RSA_KEY_PAIR; - const size_t bits = 256; + const size_t bits = 1024; psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_SIGN_HASH ); psa_set_key_algorithm( &attributes, PSA_ALG_RSA_PKCS1V15_SIGN_RAW ); @@ -146,7 +146,7 @@ void pk_psa_utils( int key_is_rsa ) psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; const char * const name = "Opaque"; - const size_t bitlen = 256; /* harcoded in genkey() */ + size_t bitlen; mbedtls_md_type_t md_alg = MBEDTLS_MD_NONE; unsigned char b1[1], b2[1]; @@ -167,9 +167,15 @@ void pk_psa_utils( int key_is_rsa ) mbedtls_pk_init( &pk ); if( key_is_rsa ) + { + bitlen = 1024; /* harcoded in genkey() */ key = pk_psa_genkey_rsa(); + } else + { + bitlen = 256; /* harcoded in genkey() */ key = pk_psa_genkey_ecc(); + } if( mbedtls_svc_key_id_is_null( key ) ) goto exit;