Improve style

This commit is contained in:
Janos Follath 2019-06-28 13:35:36 +01:00
parent 40e1393816
commit 0c1ed84258
2 changed files with 4 additions and 0 deletions

View file

@ -5012,8 +5012,10 @@ static psa_status_t psa_tls12_prf_psk_to_ms_input(
size_t data_length ) size_t data_length )
{ {
if( step == PSA_KEY_DERIVATION_INPUT_SECRET ) if( step == PSA_KEY_DERIVATION_INPUT_SECRET )
{
return( psa_tls12_prf_psk_to_ms_set_key( prf, hash_alg, return( psa_tls12_prf_psk_to_ms_set_key( prf, hash_alg,
data, data_length ) ); data, data_length ) );
}
return( psa_tls12_prf_input( prf, hash_alg, step, data, data_length ) ); return( psa_tls12_prf_input( prf, hash_alg, step, data, data_length ) );
} }

View file

@ -1803,10 +1803,12 @@ void derive_key_policy( int policy_usage,
if( PSA_ALG_IS_TLS12_PRF( exercise_alg ) || if( PSA_ALG_IS_TLS12_PRF( exercise_alg ) ||
PSA_ALG_IS_TLS12_PSK_TO_MS( exercise_alg ) ) PSA_ALG_IS_TLS12_PSK_TO_MS( exercise_alg ) )
{
PSA_ASSERT( psa_key_derivation_input_bytes( PSA_ASSERT( psa_key_derivation_input_bytes(
&operation, &operation,
PSA_KEY_DERIVATION_INPUT_SEED, PSA_KEY_DERIVATION_INPUT_SEED,
(const uint8_t*) "", 0) ); (const uint8_t*) "", 0) );
}
status = psa_key_derivation_input_key( &operation, status = psa_key_derivation_input_key( &operation,
PSA_KEY_DERIVATION_INPUT_SECRET, PSA_KEY_DERIVATION_INPUT_SECRET,