commit 5c5b116a4909842738c530295878a43e50020885
author Neil Armstrong <narmstrong@baylibre.com> Thu May 19 18:07:53 2022 +0200
committer Neil Armstrong <narmstrong@baylibre.com> Thu May 19 18:07:53 2022 +0200
tree b876f08504560fdc787e0376a5c9b47131c32ead
parent 084338d3366a5b550c2e0c9e480a5794384a065d

Add pk_can_do_ext test for non-opaque keys

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

tests/suites/test_suite_pk.function

diff --git a/tests/suites/test_suite_pk.function b/tests/suites/test_suite_pk.function
index 468f22a..bfdd93f 100644
--- a/tests/suites/test_suite_pk.function
+++ b/tests/suites/test_suite_pk.function
@@ -245,8 +245,9 @@
 /* END_CASE */
 
 /* BEGIN_CASE depends_on:MBEDTLS_USE_PSA_CRYPTO */
-void pk_can_do_ext( int key_type, int key_usage, int key_alg, int key_alg2,
-                    int key_bits, int alg_check, int usage_check, int result )
+void pk_can_do_ext( int opaque_key, int key_type, int key_usage, int key_alg,
+                    int key_alg2, int parameter, int alg_check, int usage_check,
+                    int result )
 {
     mbedtls_pk_context pk;
     mbedtls_svc_key_id_t key = MBEDTLS_SVC_KEY_ID_INIT;
@@ -256,21 +257,31 @@
 
     mbedtls_pk_init( &pk );
 
-    psa_set_key_usage_flags( &attributes, key_usage );
-    psa_set_key_algorithm( &attributes, key_alg );
-    if( key_alg2 != 0 )
-        psa_set_key_enrollment_algorithm( &attributes, key_alg2 );
-    psa_set_key_type( &attributes, key_type );
-    psa_set_key_bits( &attributes, key_bits );
+    if( opaque_key == 1 )
+    {
+        psa_set_key_usage_flags( &attributes, key_usage );
+        psa_set_key_algorithm( &attributes, key_alg );
+        if( key_alg2 != 0 )
+            psa_set_key_enrollment_algorithm( &attributes, key_alg2 );
+        psa_set_key_type( &attributes, key_type );
+        psa_set_key_bits( &attributes, parameter );
 
-    PSA_ASSERT( psa_generate_key( &attributes, &key ) );
+        PSA_ASSERT( psa_generate_key( &attributes, &key ) );
 
-    if( mbedtls_svc_key_id_is_null( key ) )
-        goto exit;
+        if( mbedtls_svc_key_id_is_null( key ) )
+            goto exit;
 
-    TEST_EQUAL( mbedtls_pk_setup_opaque( &pk, key ), 0 );
+        TEST_EQUAL( mbedtls_pk_setup_opaque( &pk, key ), 0 );
 
-    TEST_EQUAL( mbedtls_pk_get_type( &pk ), MBEDTLS_PK_OPAQUE );
+        TEST_EQUAL( mbedtls_pk_get_type( &pk ), MBEDTLS_PK_OPAQUE );
+    }
+    else
+    {
+        TEST_EQUAL( mbedtls_pk_setup( &pk,
+                            mbedtls_pk_info_from_type( key_type ) ), 0 );
+        TEST_EQUAL( pk_genkey( &pk, parameter ), 0 );
+        TEST_EQUAL( mbedtls_pk_get_type( &pk ), key_type );
+    }
 
     TEST_EQUAL( mbedtls_pk_can_do_ext( &pk, alg_check, usage_check ), result );