yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

psa: Change psa_driver_wrapper_export_public_key() signature

Browse source 
Change psa_driver_wrapper_export_public_key() signature
to the signature of an export_public_key driver entry point.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron 2020-11-25 14:30:05 +01:00
parent 8328287956
commit 84cc99420c
3 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/psa_crypto.c
View file

@ -1758,10 +1758,12 @@ static psa_status_t psa_internal_export_key( const psa_key_slot_t *slot,
/* Need to export the public part of a private key, /* Need to export the public part of a private key,
* so conversion is needed. Try the accelerators first. */ * so conversion is needed. Try the accelerators first. */
psa_status_t status = psa_driver_wrapper_export_public_key( slot, psa_key_attributes_t attributes = {
data, .core = slot->attr
data_size, };
data_length ); psa_status_t status = psa_driver_wrapper_export_public_key(
&attributes, slot->key.data, slot->key.bytes,
data, data_size, data_length );
if( status != PSA_ERROR_NOT_SUPPORTED || if( status != PSA_ERROR_NOT_SUPPORTED ||
psa_key_lifetime_is_external( slot->attr.lifetime ) ) psa_key_lifetime_is_external( slot->attr.lifetime ) )

31
library/psa_crypto_driver_wrappers.c
View file

@ -444,17 +444,16 @@ psa_status_t psa_driver_wrapper_import_key(
#endif /* PSA_CRYPTO_DRIVER_PRESENT */ #endif /* PSA_CRYPTO_DRIVER_PRESENT */
} }
psa_status_t psa_driver_wrapper_export_public_key( const psa_key_slot_t *slot, psa_status_t psa_driver_wrapper_export_public_key(
uint8_t *data, const psa_key_attributes_t *attributes,
size_t data_size, const uint8_t *key_buffer, size_t key_buffer_size,
size_t *data_length ) uint8_t *data, size_t data_size, size_t *data_length )
{ {
#if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT) #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
psa_status_t status = PSA_ERROR_INVALID_ARGUMENT; psa_status_t status = PSA_ERROR_INVALID_ARGUMENT;
psa_key_location_t location = PSA_KEY_LIFETIME_GET_LOCATION(slot->attr.lifetime); psa_key_location_t location = PSA_KEY_LIFETIME_GET_LOCATION(
psa_key_attributes_t attributes = { psa_get_key_lifetime( attributes ) );
.core = slot->attr
};
switch( location ) switch( location )
{ {
@ -462,9 +461,9 @@ psa_status_t psa_driver_wrapper_export_public_key( const psa_key_slot_t *slot,
/* Key is stored in the slot in export representation, so /* Key is stored in the slot in export representation, so
* cycle through all known transparent accelerators */ * cycle through all known transparent accelerators */
#if defined(PSA_CRYPTO_DRIVER_TEST) #if defined(PSA_CRYPTO_DRIVER_TEST)
status = test_transparent_export_public_key( &attributes, status = test_transparent_export_public_key( attributes,
slot->key.data, key_buffer,
slot->key.bytes, key_buffer_size,
data, data,
data_size, data_size,
data_length ); data_length );
@ -477,9 +476,9 @@ psa_status_t psa_driver_wrapper_export_public_key( const psa_key_slot_t *slot,
/* Add cases for opaque driver here */ /* Add cases for opaque driver here */
#if defined(PSA_CRYPTO_DRIVER_TEST) #if defined(PSA_CRYPTO_DRIVER_TEST)
case PSA_CRYPTO_TEST_DRIVER_LIFETIME: case PSA_CRYPTO_TEST_DRIVER_LIFETIME:
return( test_opaque_export_public_key( &attributes, return( test_opaque_export_public_key( attributes,
slot->key.data, key_buffer,
slot->key.bytes, key_buffer_size,
data, data,
data_size, data_size,
data_length ) ); data_length ) );
@ -489,7 +488,9 @@ psa_status_t psa_driver_wrapper_export_public_key( const psa_key_slot_t *slot,
return( status ); return( status );
} }
#else /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */ #else /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */
(void) slot; (void) attributes;
(void) key_buffer;
(void) key_buffer_size;
(void) data; (void) data;
(void) data_size; (void) data_size;
(void) data_length; (void) data_length;

15
library/psa_crypto_driver_wrappers.h
View file

@ -47,19 +47,20 @@ psa_status_t psa_driver_wrapper_verify_hash( psa_key_slot_t *slot,
* Key handling functions * Key handling functions
*/ */
psa_status_t psa_driver_wrapper_generate_key( const psa_key_attributes_t *attributes,
psa_key_slot_t *slot );
psa_status_t psa_driver_wrapper_import_key( psa_status_t psa_driver_wrapper_import_key(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes,
const uint8_t *data, size_t data_length, const uint8_t *data, size_t data_length,
uint8_t *key_buffer, size_t key_buffer_size, uint8_t *key_buffer, size_t key_buffer_size,
size_t *key_buffer_length, size_t *bits ); size_t *key_buffer_length, size_t *bits );
psa_status_t psa_driver_wrapper_export_public_key( const psa_key_slot_t *slot, psa_status_t psa_driver_wrapper_export_public_key(
uint8_t *data, const psa_key_attributes_t *attributes,
size_t data_size, const uint8_t *key_buffer, size_t key_buffer_size,
size_t *data_length ); uint8_t *data, size_t data_size, size_t *data_length );
psa_status_t psa_driver_wrapper_generate_key(
const psa_key_attributes_t *attributes,
psa_key_slot_t *slot );
/* /*
* Cipher functions * Cipher functions