mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-10-19 05:01:28 +00:00
Change ifdefs in psa_crypto.c to new WANT macros
There are a few instances of MBEDTLS_*_C (specifically for DES) in psa_crypto.c. Change to the PSA_WANT_KEY_TYPE_DES macros to reflect the new PSA crypto config. Signed-off-by: David Brown <david.brown@linaro.org>
This commit is contained in:
parent
4b9ec7a598
commit
0baa7b5e98
|
@ -3875,7 +3875,7 @@ static psa_status_t psa_cipher_setup( psa_cipher_operation_t *operation,
|
||||||
if( ret != 0 )
|
if( ret != 0 )
|
||||||
goto exit;
|
goto exit;
|
||||||
|
|
||||||
#if defined(MBEDTLS_DES_C)
|
#if defined(PSA_WANT_KEY_TYPE_DES)
|
||||||
if( slot->attr.type == PSA_KEY_TYPE_DES && key_bits == 128 )
|
if( slot->attr.type == PSA_KEY_TYPE_DES && key_bits == 128 )
|
||||||
{
|
{
|
||||||
/* Two-key Triple-DES is 3-key Triple-DES with K1=K3 */
|
/* Two-key Triple-DES is 3-key Triple-DES with K1=K3 */
|
||||||
|
@ -5063,7 +5063,7 @@ exit:
|
||||||
return( status );
|
return( status );
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(MBEDTLS_DES_C)
|
#if defined(PSA_WANT_KEY_TYPE_DES)
|
||||||
static void psa_des_set_key_parity( uint8_t *data, size_t data_size )
|
static void psa_des_set_key_parity( uint8_t *data, size_t data_size )
|
||||||
{
|
{
|
||||||
if( data_size >= 8 )
|
if( data_size >= 8 )
|
||||||
|
@ -5073,7 +5073,7 @@ static void psa_des_set_key_parity( uint8_t *data, size_t data_size )
|
||||||
if( data_size >= 24 )
|
if( data_size >= 24 )
|
||||||
mbedtls_des_key_set_parity( data + 16 );
|
mbedtls_des_key_set_parity( data + 16 );
|
||||||
}
|
}
|
||||||
#endif /* MBEDTLS_DES_C */
|
#endif /* PSA_WANT_KEY_TYPE_DES */
|
||||||
|
|
||||||
static psa_status_t psa_generate_derived_key_internal(
|
static psa_status_t psa_generate_derived_key_internal(
|
||||||
psa_key_slot_t *slot,
|
psa_key_slot_t *slot,
|
||||||
|
@ -5095,10 +5095,10 @@ static psa_status_t psa_generate_derived_key_internal(
|
||||||
status = psa_key_derivation_output_bytes( operation, data, bytes );
|
status = psa_key_derivation_output_bytes( operation, data, bytes );
|
||||||
if( status != PSA_SUCCESS )
|
if( status != PSA_SUCCESS )
|
||||||
goto exit;
|
goto exit;
|
||||||
#if defined(MBEDTLS_DES_C)
|
#if defined(PSA_WANT_KEY_TYPE_DES)
|
||||||
if( slot->attr.type == PSA_KEY_TYPE_DES )
|
if( slot->attr.type == PSA_KEY_TYPE_DES )
|
||||||
psa_des_set_key_parity( data, bytes );
|
psa_des_set_key_parity( data, bytes );
|
||||||
#endif /* MBEDTLS_DES_C */
|
#endif /* PSA_WANT_KEY_TYPE_DES */
|
||||||
|
|
||||||
status = psa_allocate_buffer_to_slot( slot, bytes );
|
status = psa_allocate_buffer_to_slot( slot, bytes );
|
||||||
if( status != PSA_SUCCESS )
|
if( status != PSA_SUCCESS )
|
||||||
|
@ -6029,7 +6029,7 @@ psa_status_t psa_generate_key_internal(
|
||||||
if( status != PSA_SUCCESS )
|
if( status != PSA_SUCCESS )
|
||||||
return( status );
|
return( status );
|
||||||
|
|
||||||
#if defined(MBEDTLS_DES_C)
|
#if defined(PSA_WANT_KEY_TYPE_DES)
|
||||||
if( type == PSA_KEY_TYPE_DES )
|
if( type == PSA_KEY_TYPE_DES )
|
||||||
psa_des_set_key_parity( key_buffer, key_buffer_size );
|
psa_des_set_key_parity( key_buffer, key_buffer_size );
|
||||||
#endif /* MBEDTLS_DES_C */
|
#endif /* MBEDTLS_DES_C */
|
||||||
|
|
Loading…
Reference in a new issue