commit acec7b6fa11ff0f48cf6ba4e3226e1620fa5a545
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Sep 13 20:34:11 2018 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Mon Sep 17 14:33:43 2018 +0200
tree 8894965f41f7007135c6d1db22f46bd3f6492e3d
parent d1efab58b80384a5e96a132858a5c9d84bb14366

exercise_export_key: fix public key case

Public keys are always exportable, even if their usage doesn't include
the EXPORT flag.

tests/suites/test_suite_psa_crypto.function

diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index 2b1a946..81ddee0 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -692,14 +692,16 @@
     size_t exported_length = 0;
     int ok = 0;
 
-    if( ( usage & PSA_KEY_USAGE_EXPORT ) == 0 )
+    TEST_ASSERT( psa_get_key_information( slot, &type, &bits ) == PSA_SUCCESS );
+
+    if( ( usage & PSA_KEY_USAGE_EXPORT ) == 0 &&
+        ! PSA_KEY_TYPE_IS_PUBLIC_KEY( type ) )
     {
         TEST_ASSERT( psa_export_key( slot, NULL, 0, &exported_length ) ==
                      PSA_ERROR_NOT_PERMITTED );
         return( 1 );
     }
 
-    TEST_ASSERT( psa_get_key_information( slot, &type, &bits ) == PSA_SUCCESS );
     exported_size = PSA_KEY_EXPORT_MAX_SIZE( type, bits );
     exported = mbedtls_calloc( 1, exported_size );
     TEST_ASSERT( exported != NULL );