diff --git a/include/psa/crypto_values.h b/include/psa/crypto_values.h index 242ba90d2..06e978e49 100644 --- a/include/psa/crypto_values.h +++ b/include/psa/crypto_values.h @@ -1818,7 +1818,7 @@ * HKDF-Expand using HMAC-SHA-256. * * This key derivation algorithm uses the following inputs: - * - PSA_KEY_DERIVATION_INPUT_SECRET is the pseudoramdom key (PRK). + * - PSA_KEY_DERIVATION_INPUT_SECRET is the pseudorandom key (PRK). * - PSA_KEY_DERIVATION_INPUT_INFO is the info string. * * The inputs are mandatory and must be passed in the order above. diff --git a/library/psa_crypto.c b/library/psa_crypto.c index 9a73bc945..fb04fe95f 100644 --- a/library/psa_crypto.c +++ b/library/psa_crypto.c @@ -4414,7 +4414,6 @@ static psa_status_t psa_key_derivation_hkdf_read( psa_hkdf_key_derivation_t *hkd if( hkdf->block_number == last_block ) return( PSA_ERROR_BAD_STATE ); - /* We need a new block */ ++hkdf->block_number; hkdf->offset_in_block = 0; @@ -4429,24 +4428,24 @@ static psa_status_t psa_key_derivation_hkdf_read( psa_hkdf_key_derivation_t *hkd if( hkdf->block_number != 1 ) { status = psa_mac_update( &hkdf->hmac, - hkdf->output_block, - hash_length ); + hkdf->output_block, + hash_length ); if( status != PSA_SUCCESS ) return( status ); } status = psa_mac_update( &hkdf->hmac, - hkdf->info, - hkdf->info_length ); + hkdf->info, + hkdf->info_length ); if( status != PSA_SUCCESS ) return( status ); status = psa_mac_update( &hkdf->hmac, - &hkdf->block_number, 1 ); + &hkdf->block_number, 1 ); if( status != PSA_SUCCESS ) return( status ); status = psa_mac_sign_finish( &hkdf->hmac, - hkdf->output_block, - sizeof( hkdf->output_block ), - &hmac_output_length ); + hkdf->output_block, + sizeof( hkdf->output_block ), + &hmac_output_length ); if( status != PSA_SUCCESS ) return( status ); }