Switch storage functions over to psa_core_key_attributes_t
diff --git a/library/psa_crypto_storage.h b/library/psa_crypto_storage.h
index 938cc4f..1b7dbd6 100644
--- a/library/psa_crypto_storage.h
+++ b/library/psa_crypto_storage.h
@@ -88,7 +88,7 @@
* already occupied non-persistent key, as well as validating the key data.
*
*
- * \param[in] attributes The attributes of the key to save.
+ * \param[in] attr The attributes of the key to save.
* The key identifier field in the attributes
* determines the key's location.
* \param[in] data Buffer containing the key data.
@@ -100,7 +100,7 @@
* \retval PSA_ERROR_STORAGE_FAILURE
* \retval PSA_ERROR_ALREADY_EXISTS
*/
-psa_status_t psa_save_persistent_key( const psa_key_attributes_t *attributes,
+psa_status_t psa_save_persistent_key( const psa_core_key_attributes_t *attr,
const uint8_t *data,
const size_t data_length );
@@ -116,8 +116,7 @@
* this function to zeroize and free this buffer, regardless of whether this
* function succeeds or fails.
*
- * \param[in,out] attributes
- * On input, the key identifier field identifies
+ * \param[in,out] attr On input, the key identifier field identifies
* the key to load. Other fields are ignored.
* On success, the attribute structure contains
* the key metadata that was loaded from storage.
@@ -129,7 +128,7 @@
* \retval PSA_ERROR_STORAGE_FAILURE
* \retval PSA_ERROR_DOES_NOT_EXIST
*/
-psa_status_t psa_load_persistent_key( psa_key_attributes_t *attributes,
+psa_status_t psa_load_persistent_key( psa_core_key_attributes_t *attr,
uint8_t **data,
size_t *data_length );
@@ -163,13 +162,13 @@
*
* \param[in] data Buffer containing the key data.
* \param data_length Length of the key data buffer.
- * \param[in] attributes The attributes of the key.
+ * \param[in] attr The core attributes of the key.
* \param[out] storage_data Output buffer for the formatted data.
*
*/
void psa_format_key_data_for_storage( const uint8_t *data,
const size_t data_length,
- const psa_key_attributes_t *attributes,
+ const psa_core_key_attributes_t *attr,
uint8_t *storage_data );
/**
@@ -181,7 +180,7 @@
* containing the key data. This must be freed
* using psa_free_persistent_key_data()
* \param[out] key_data_length Length of the key data buffer
- * \param[out] attributes On success, the attribute structure is filled
+ * \param[out] attr On success, the attribute structure is filled
* with the loaded key metadata.
*
* \retval PSA_SUCCESS
@@ -193,7 +192,7 @@
size_t storage_data_length,
uint8_t **key_data,
size_t *key_data_length,
- psa_key_attributes_t *attributes );
+ psa_core_key_attributes_t *attr );
#if defined(MBEDTLS_PSA_CRYPTO_SE_C)
/** This symbol is defined if transaction support is required. */