Remove remaining mentions of slots
diff --git a/include/psa/crypto.h b/include/psa/crypto.h
index 84026c9..5f80b13 100644
--- a/include/psa/crypto.h
+++ b/include/psa/crypto.h
@@ -334,6 +334,7 @@
static void psa_set_key_algorithm(psa_key_attributes_t *attributes,
psa_algorithm_t alg);
+
/** Retrieve the algorithm policy from key attributes.
*
* This function may be declared as `static` (i.e. without external
@@ -365,6 +366,7 @@
static void psa_set_key_type(psa_key_attributes_t *attributes,
psa_key_type_t type);
+
/** Declare the size of a key.
*
* This function overwrites any key size previously set in \p attributes.
@@ -537,22 +539,20 @@
* @{
*/
-/** Open a handle to an existing persistent key.
+/** Get a handle to an existing persistent key.
*
- * Open a handle to a key which was previously created with psa_create_key().
+ * Get a handle to a key which was previously created with psa_create_key().
*
* Implementations may provide additional keys that can be opened with
* psa_open_key(). Such keys have a key identifier in the vendor range,
* as documented in the description of #psa_key_id_t.
*
* \param id The persistent identifier of the key.
- * \param[out] handle On success, a handle to a key slot which contains
- * the data and metadata loaded from the specified
- * persistent location.
+ * \param[out] handle On success, a handle to the key.
*
* \retval #PSA_SUCCESS
* Success. The application can now use the value of `*handle`
- * to access the newly allocated key slot.
+ * to access the key.
* \retval #PSA_ERROR_INSUFFICIENT_MEMORY
* \retval #PSA_ERROR_DOES_NOT_EXIST
* \retval #PSA_ERROR_INVALID_ARGUMENT
@@ -568,13 +568,14 @@
psa_status_t psa_open_key(psa_key_id_t id,
psa_key_handle_t *handle);
+
/** Close a key handle.
*
* If the handle designates a volatile key, destroy the key material and
* free all associated resources, just like psa_destroy_key().
*
* If the handle designates a persistent key, free all resources associated
- * with the key in volatile memory. The key slot in persistent storage is
+ * with the key in volatile memory. The key in persistent storage is
* not affected and can be opened again later with psa_open_key().
*
* If the key is currently in use in a multipart operation,
@@ -609,6 +610,7 @@
* minimize the risk that an invalid input is accidentally interpreted
* according to a different format.
*
+
* \param[in] attributes The attributes for the new key.
* The key size is always determined from the
* \p data buffer.
@@ -665,23 +667,20 @@
/**
* \brief Destroy a key.
*
- * This function destroys the content of the key slot from both volatile
+ * This function destroys a key from both volatile
* memory and, if applicable, non-volatile storage. Implementations shall
- * make a best effort to ensure that any previous content of the slot is
+ * make a best effort to ensure that any previous content of the handle is
* unrecoverable.
*
* This function also erases any metadata such as policies and frees all
* resources associated with the key.
*
- * If the key is currently in use in a multipart operation,
- * the multipart operation is aborted.
- *
- * \param handle Handle to the key slot to erase.
+ * \param handle Handle to the key to erase.
*
* \retval #PSA_SUCCESS
- * The slot's content, if any, has been erased.
+ * The handle's content, if any, has been erased.
* \retval #PSA_ERROR_NOT_PERMITTED
- * The slot holds content and cannot be erased because it is
+ * The handle holds content and cannot be erased because it is
* read-only, either due to a policy or due to physical restrictions.
* \retval #PSA_ERROR_INVALID_HANDLE
* \retval #PSA_ERROR_COMMUNICATION_FAILURE
@@ -873,7 +872,7 @@
* to another, since it populates a key using the material from
* another key which may have a different lifetime.
*
- * In an implementation where slots have different ownerships,
+ * In an implementation where handles have different ownerships,
* this function may be used to share a key with a different party,
* subject to implementation-defined restrictions on key sharing.
*
@@ -903,8 +902,7 @@
* The effect of this function on implementation-defined attributes is
* implementation-defined.
*
- * \param source_handle The key to copy. It must be a handle to an
- * occupied slot.
+ * \param source_handle The key to copy. It must be a valid key handle.
* \param[in] attributes The attributes for the new key.
* They are used as follows:
* - The key type and size may be 0. If either is
@@ -3397,7 +3395,7 @@
* this function will not succeed, even with a smaller output buffer.
* \retval #PSA_ERROR_NOT_SUPPORTED
* The key type or key size is not supported, either by the
- * implementation in general or in this particular slot.
+ * implementation in general or in this particular location.
* \retval #PSA_ERROR_BAD_STATE
* \retval #PSA_ERROR_INSUFFICIENT_MEMORY
* \retval #PSA_ERROR_INSUFFICIENT_STORAGE