Add opaque test driver support for copy key
A minimal test driver extension is added to support
copy of opaque keys within the same location.
Test vector support is extended to cover opaque keys.
Signed-off-by: Archana <archana.madhavan@silabs.com>
diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index aea9f9c..ee16983 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -2015,10 +2015,11 @@
psa_key_slot_t *target_slot = NULL;
psa_key_attributes_t actual_attributes = *specified_attributes;
psa_se_drv_table_entry_t *driver = NULL;
+ size_t storage_size = 0;
*target_key = MBEDTLS_SVC_KEY_ID_INIT;
- status = psa_get_and_lock_transparent_key_slot_with_policy(
+ status = psa_get_and_lock_key_slot_with_policy(
source_key, &source_slot, PSA_KEY_USAGE_COPY, 0 );
if( status != PSA_SUCCESS )
goto exit;
@@ -2038,31 +2039,49 @@
&target_slot, &driver );
if( status != PSA_SUCCESS )
goto exit;
-
-#if defined(MBEDTLS_PSA_CRYPTO_SE_C)
- if( driver != NULL )
+ if( PSA_KEY_LIFETIME_GET_LOCATION( target_slot->attr.lifetime ) !=
+ PSA_KEY_LIFETIME_GET_LOCATION( source_slot->attr.lifetime ) )
{
- /* Copying to a secure element is not implemented yet. */
+ /*
+ * If the source and target keys are stored across different locations,
+ * the source key would need to be exported as plaintext and re-imported
+ * in the other location. This has security implications which have not
+ * been fully mapped.For now, this can be acheived through
+ * appropriate API invocations from the application, if needed.
+ * */
status = PSA_ERROR_NOT_SUPPORTED;
goto exit;
}
-#endif /* MBEDTLS_PSA_CRYPTO_SE_C */
-
+ /*
+ * When the source and target keys are within the same location,
+ * - For transparent keys it is a blind copy sans any driver invocation,
+ * - For opaque keys this translates to an invocation of the drivers'
+ * copy_key entry point through the dispatch layer.
+ * */
if( psa_key_lifetime_is_external( actual_attributes.core.lifetime ) )
{
- /*
- * Copying through an opaque driver is not implemented yet, consider
- * a lifetime with an external location as an invalid parameter for
- * now.
- */
- status = PSA_ERROR_INVALID_ARGUMENT;
- goto exit;
+ status = psa_driver_wrapper_get_key_buffer_size( &actual_attributes,
+ &storage_size );
+ if( status != PSA_SUCCESS )
+ goto exit;
+ status = psa_allocate_buffer_to_slot( target_slot, storage_size );
+ if( status != PSA_SUCCESS )
+ goto exit;
+ status = psa_driver_wrapper_copy_key( &actual_attributes,
+ source_slot->key.data,
+ source_slot->key.bytes,
+ target_slot->key.data,
+ target_slot->key.bytes,
+ &target_slot->key.bytes );
+ if( status != PSA_SUCCESS )
+ goto exit;
}
-
- status = psa_copy_key_material( source_slot, target_slot );
- if( status != PSA_SUCCESS )
- goto exit;
-
+ else
+ {
+ status = psa_copy_key_material( source_slot, target_slot );
+ if( status != PSA_SUCCESS )
+ goto exit;
+ }
status = psa_finish_key_creation( target_slot, driver, target_key );
exit:
if( status != PSA_SUCCESS )
diff --git a/library/psa_crypto_driver_wrappers.c b/library/psa_crypto_driver_wrappers.c
index e145dd4..1597b00 100644
--- a/library/psa_crypto_driver_wrappers.c
+++ b/library/psa_crypto_driver_wrappers.c
@@ -782,6 +782,47 @@
}
}
+psa_status_t psa_driver_wrapper_copy_key(
+ psa_key_attributes_t *attributes,
+ const uint8_t *source_key, size_t source_key_size,
+ uint8_t *target_key_buffer, size_t target_buffer_size, size_t *key_length )
+{
+ psa_status_t status = PSA_ERROR_INVALID_ARGUMENT;
+ psa_key_location_t location = PSA_KEY_LIFETIME_GET_LOCATION( attributes->core.lifetime );
+#if defined(MBEDTLS_PSA_CRYPTO_SE_C)
+ const psa_drv_se_t *drv;
+ psa_drv_se_context_t *drv_context;
+
+ if( psa_get_se_driver( attributes->core.lifetime, &drv, &drv_context ) )
+ {
+ /* Copying to a secure element is not implemented yet. */
+ return( PSA_ERROR_NOT_SUPPORTED );
+ }
+#endif /* MBEDTLS_PSA_CRYPTO_SE_C */
+
+ switch( location )
+ {
+#if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
+#if defined(PSA_CRYPTO_DRIVER_TEST)
+ case PSA_CRYPTO_TEST_DRIVER_LOCATION:
+ return( mbedtls_test_opaque_copy_key( attributes, source_key,
+ source_key_size,
+ target_key_buffer,
+ target_buffer_size,
+ key_length ) );
+#endif /* PSA_CRYPTO_DRIVER_TEST */
+#endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */
+ default:
+ (void)source_key;
+ (void)source_key_size;
+ (void)target_key_buffer;
+ (void)target_buffer_size;
+ (void)key_length;
+ status = PSA_ERROR_INVALID_ARGUMENT;
+ }
+ return( status );
+}
+
/*
* Cipher functions
*/
diff --git a/library/psa_crypto_driver_wrappers.h b/library/psa_crypto_driver_wrappers.h
index 99455a8..7c45fbf 100644
--- a/library/psa_crypto_driver_wrappers.h
+++ b/library/psa_crypto_driver_wrappers.h
@@ -100,6 +100,10 @@
psa_key_attributes_t *attributes,
uint8_t *key_buffer, size_t key_buffer_size, size_t *key_buffer_length );
+psa_status_t psa_driver_wrapper_copy_key(
+ psa_key_attributes_t *attributes,
+ const uint8_t *source_key, size_t source_key_size,
+ uint8_t *target_key_buffer, size_t target_buffer_size, size_t *key_length );
/*
* Cipher functions
*/