diff --git a/include/psa/crypto.h b/include/psa/crypto.h
index c4aab46..959af96 100644
--- a/include/psa/crypto.h
+++ b/include/psa/crypto.h
@@ -3033,8 +3033,9 @@
  * \retval #PSA_ERROR_BAD_STATE
  * \retval #PSA_ERROR_COMMUNICATION_FAILURE
  */
-psa_status_t psa_key_derivation_get_capacity(const psa_key_derivation_operation_t *operation,
-                                        size_t *capacity);
+psa_status_t psa_key_derivation_get_capacity(
+    const psa_key_derivation_operation_t *operation,
+    size_t *capacity);
 
 /** Set the maximum capacity of a key derivation operation.
  *
@@ -3054,8 +3055,9 @@
  * \retval #PSA_ERROR_BAD_STATE
  * \retval #PSA_ERROR_COMMUNICATION_FAILURE
  */
-psa_status_t psa_key_derivation_set_capacity(psa_key_derivation_operation_t *operation,
-                                        size_t capacity);
+psa_status_t psa_key_derivation_set_capacity(
+    psa_key_derivation_operation_t *operation,
+    size_t capacity);
 
 /** Read some data from a key derivation operation.
  *
@@ -3084,9 +3086,10 @@
  * \retval #PSA_ERROR_HARDWARE_FAILURE
  * \retval #PSA_ERROR_TAMPERING_DETECTED
  */
-psa_status_t psa_key_derivation_output_bytes(psa_key_derivation_operation_t *operation,
-                                uint8_t *output,
-                                size_t output_length);
+psa_status_t psa_key_derivation_output_bytes(
+    psa_key_derivation_operation_t *operation,
+    uint8_t *output,
+    size_t output_length);
 
 /** Derive a key from an ongoing key derivation operation.
  *
@@ -3101,8 +3104,8 @@
  * the key is derived, depends on the key type:
  *
  * - For key types for which the key is an arbitrary sequence of bytes
- *   of a given size,
- *   this function is functionally equivalent to calling #psa_key_derivation_output_bytes
+ *   of a given size, this function is functionally equivalent to
+ *   calling #psa_key_derivation_output_bytes
  *   and passing the resulting output to #psa_import_key.
  *   However, this function has a security benefit:
  *   if the implementation provides an isolation boundary then
@@ -3202,9 +3205,10 @@
  *         It is implementation-dependent whether a failure to initialize
  *         results in this error code.
  */
-psa_status_t psa_key_derivation_output_key(const psa_key_attributes_t *attributes,
-                                      psa_key_derivation_operation_t *operation,
-                                      psa_key_handle_t *handle);
+psa_status_t psa_key_derivation_output_key(
+    const psa_key_attributes_t *attributes,
+    psa_key_derivation_operation_t *operation,
+    psa_key_handle_t *handle);
 
 /** Abort a key derivation operation.
  *
@@ -3214,9 +3218,9 @@
  *
  * This function may be called at any time as long as the operation
  * object has been initialized to #PSA_KEY_DERIVATION_OPERATION_INIT, to
- * psa_key_derivation_operation_init() or a zero value. In particular, it is valid
- * to call psa_key_derivation_abort() twice, or to call psa_key_derivation_abort()
- * on an operation that has not been set up.
+ * psa_key_derivation_operation_init() or a zero value. In particular,
+ * it is valid to call psa_key_derivation_abort() twice, or to call
+ * psa_key_derivation_abort() on an operation that has not been set up.
  *
  * Once aborted, the key derivation operation object may be called.
  *
@@ -3228,7 +3232,8 @@
  * \retval #PSA_ERROR_HARDWARE_FAILURE
  * \retval #PSA_ERROR_TAMPERING_DETECTED
  */
-psa_status_t psa_key_derivation_abort(psa_key_derivation_operation_t *operation);
+psa_status_t psa_key_derivation_abort(
+    psa_key_derivation_operation_t *operation);
 
 /** Use the maximum possible capacity for a key derivation operation.
  *
@@ -3254,15 +3259,16 @@
  *   as appropriate. Which inputs are needed, in what order, and whether
  *   they may be keys and if so of what type depends on the algorithm.
  * - Optionally set the operation's maximum capacity with
- *   psa_key_derivation_set_capacity(). You may do this before, in the middle of
- *   or after providing inputs. For some algorithms, this step is mandatory
+ *   psa_key_derivation_set_capacity(). You may do this before, in the middle
+ *   of or after providing inputs. For some algorithms, this step is mandatory
  *   because the output depends on the maximum capacity.
  * - To derive a key, call psa_key_derivation_output_key().
  *   To derive a byte string for a different purpose, call
  * - psa_key_derivation_output_bytes().
  *   Successive calls to these functions use successive output bytes
  *   calculated by the key derivation algorithm.
- * - Clean up the key derivation operation object with psa_key_derivation_abort().
+ * - Clean up the key derivation operation object with
+ *   psa_key_derivation_abort().
  *
  * \param[in,out] operation       The key derivation operation object
  *                                to set up. It must
@@ -3283,8 +3289,9 @@
  * \retval #PSA_ERROR_TAMPERING_DETECTED
  * \retval #PSA_ERROR_BAD_STATE
  */
-psa_status_t psa_key_derivation_setup(psa_key_derivation_operation_t *operation,
-                                      psa_algorithm_t alg);
+psa_status_t psa_key_derivation_setup(
+    psa_key_derivation_operation_t *operation,
+    psa_algorithm_t alg);
 
 /** Provide an input for key derivation or key agreement.
  *
@@ -3321,10 +3328,11 @@
  *         It is implementation-dependent whether a failure to initialize
  *         results in this error code.
  */
-psa_status_t psa_key_derivation_input_bytes(psa_key_derivation_operation_t *operation,
-                                            psa_key_derivation_step_t step,
-                                            const uint8_t *data,
-                                            size_t data_length);
+psa_status_t psa_key_derivation_input_bytes(
+    psa_key_derivation_operation_t *operation,
+    psa_key_derivation_step_t step,
+    const uint8_t *data,
+    size_t data_length);
 
 /** Provide an input for key derivation in the form of a key.
  *
@@ -3366,9 +3374,10 @@
  *         It is implementation-dependent whether a failure to initialize
  *         results in this error code.
  */
-psa_status_t psa_key_derivation_input_key(psa_key_derivation_operation_t *operation,
-                                          psa_key_derivation_step_t step,
-                                          psa_key_handle_t handle);
+psa_status_t psa_key_derivation_input_key(
+    psa_key_derivation_operation_t *operation,
+    psa_key_derivation_step_t step,
+    psa_key_handle_t handle);
 
 /** Perform a key agreement and use the shared secret as input to a key
  * derivation.
@@ -3423,11 +3432,12 @@
  * \retval #PSA_ERROR_HARDWARE_FAILURE
  * \retval #PSA_ERROR_TAMPERING_DETECTED
  */
-psa_status_t psa_key_derivation_key_agreement(psa_key_derivation_operation_t *operation,
-                               psa_key_derivation_step_t step,
-                               psa_key_handle_t private_key,
-                               const uint8_t *peer_key,
-                               size_t peer_key_length);
+psa_status_t psa_key_derivation_key_agreement(
+    psa_key_derivation_operation_t *operation,
+    psa_key_derivation_step_t step,
+    psa_key_handle_t private_key,
+    const uint8_t *peer_key,
+    size_t peer_key_length);
 
 /** Perform a key agreement and use the shared secret as input to a key
  * derivation.
@@ -3439,8 +3449,8 @@
  * Diffie-Hellman or elliptic curve Diffie-Hellman has biases and should
  * not be used directly as key material. It should instead be passed as
  * input to a key derivation algorithm. To chain a key agreement with
- * a key derivation, use psa_key_derivation_key_agreement() and other functions from
- * the key derivation interface.
+ * a key derivation, use psa_key_derivation_key_agreement() and other
+ * functions from the key derivation interface.
  *
  * \param alg                     The key agreement algorithm to compute
  *                                (\c PSA_ALG_XXX value such that