diff --git a/include/psa/crypto_accel_driver.h b/include/psa/crypto_accel_driver.h
index 57bc18dad..125d4c246 100644
--- a/include/psa/crypto_accel_driver.h
+++ b/include/psa/crypto_accel_driver.h
@@ -381,7 +381,7 @@ typedef struct psa_drv_accel_cipher_context_s psa_drv_accel_cipher_context_t;
  * Where
  * - `CIPHER_NAME` is the name of the underlying block cipher (i.e. AES or DES)
  * - `MODE` is the block mode of the cipher operation (i.e. CBC or CTR)
- * 
+ *
  * For stream ciphers:
  * ~~~~~~~~~~~~~{.c}
  * psa_drv_accel_cipher_setup_<CIPHER_NAME>
@@ -643,10 +643,10 @@ typedef psa_status_t (*psa_drv_accel_aead_decrypt_t)(const uint8_t *p_key,
  * ~~~~~~~~~~~~~
  * Where `ALGO` is the name of the signing algorithm
  *
- * This function supports any asymmetric-key output from psa_export_key() as 
+ * This function supports any asymmetric-key output from psa_export_key() as
  * the buffer in \ref p_key. Refer to the documentation of \ref
  * psa_export_key() for the formats.
- * 
+ *
  * \param[in] p_key                 A buffer containing the private key
  *                                  material
  * \param[in] key_size              The size in bytes of the `p_key` data
@@ -686,7 +686,7 @@ typedef psa_status_t (*psa_drv_accel_asymmetric_sign_t)(const uint8_t *p_key,
  * buffer in \ref p_key. Refer to the documentation of \ref
  * psa_export_public_key() for the format of public keys and to the
  * documentation of \ref psa_export_key() for the format for other key types.
- * 
+ *
  * \param[in] p_key             A buffer containing the public key material
  * \param[in] key_size          The size in bytes of the `p_key` data
  * \param[in] alg               A signature algorithm that is compatible with
@@ -719,7 +719,7 @@ typedef psa_status_t (*psa_drv_accel_asymmetric_verify_t)(const uint8_t *p_key,
  * psa_drv_accel_asymmetric_<ALGO>_encrypt
  * ~~~~~~~~~~~~~
  * Where `ALGO` is the name of the encryption algorithm
- * 
+ *
  * This function supports any output from \ref psa_export_public_key() as the
  * buffer in \ref p_key. Refer to the documentation of \ref
  * psa_export_public_key() for the format of public keys and to the
@@ -772,8 +772,8 @@ typedef psa_status_t (*psa_drv_accel_asymmetric_encrypt_t)(const uint8_t *p_key,
  * psa_drv_accel_asymmetric_<ALGO>_decrypt
  * ~~~~~~~~~~~~~
  * Where `ALGO` is the name of the encryption algorithm
- * 
- * This function supports any asymmetric-key output from psa_export_key() as 
+ *
+ * This function supports any asymmetric-key output from psa_export_key() as
  * the buffer in \ref p_key. Refer to the documentation of \ref
  * psa_export_key() for the formats.
  *
diff --git a/include/psa/crypto_se_driver.h b/include/psa/crypto_se_driver.h
index 18ef1c47b..870f69d06 100644
--- a/include/psa/crypto_se_driver.h
+++ b/include/psa/crypto_se_driver.h
@@ -766,16 +766,16 @@ typedef psa_status_t (*psa_drv_se_export_key_t)(psa_key_slot_number_t key,
 /**
  * \brief A function that generates a symmetric or asymmetric key on a secure
  * element
- * 
- * If `type` is asymmetric (`#define PSA_KEY_TYPE_IS_ASYMMETRIC(type) == 1`), 
+ *
+ * If `type` is asymmetric (`#define PSA_KEY_TYPE_IS_ASYMMETRIC(type) == 1`),
  * the public component of the generated key will be placed in `p_pubkey_out`.
  * The format of the public key information will match the format specified for
  * the `psa_export_key()` function for the key type.
- * 
+ *
  * \param[in] key_slot      Slot where the generated key will be placed
  * \param[in] type          The type of the key to be generated
  * \param[in] usage         The prescribed usage of the generated key
- *                          Note: Not all Secure Elements support the same 
+ *                          Note: Not all Secure Elements support the same
  *                          restrictions that PSA Crypto does (and vice versa).
  *                          Driver developers should endeavor to match the
  *                          usages as close as possible.
@@ -785,7 +785,7 @@ typedef psa_status_t (*psa_drv_se_export_key_t)(psa_key_slot_number_t key,
  *                          interpretation in the `extra` parameter is the
  *                          `psa_generate_key` function
  * \param[in] extra_size    The size in bytes of the \ref extra buffer
- * \param[out] p_pubkey_out The buffer where the public key information will 
+ * \param[out] p_pubkey_out The buffer where the public key information will
  *                          be placed
  * \param[in] pubkey_out_size   The size in bytes of the `p_pubkey_out` buffer
  * \param[out] p_pubkey_length  Upon successful completion, will contain the
@@ -909,7 +909,7 @@ typedef psa_status_t (*psa_drv_se_key_derivation_collateral_t)(void *p_context,
 
 /** \brief A function that performs the final secure element key derivation
  * step and place the generated key material in a slot
- * 
+ *
  * \param[in,out] p_context     A hardware-specific structure containing any
  *                              context information for the implementation
  * \param[in] dest_key          The slot where the generated key material