yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-10-19 06:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use bool variable instead of enum values

Browse source 
Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com>
This commit is contained in:
gabor-mezei-arm 2021-05-05 13:56:27 +02:00
parent 12ff4d581e
commit 5698048cc6
No known key found for this signature in database
GPG key ID: 106F5A41ECC305BD
1 changed files with 41 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
library/psa_crypto.c
View file

@ -2842,22 +2842,31 @@ cleanup:
/* Asymmetric cryptography */ /* Asymmetric cryptography */
/****************************************************************/ /****************************************************************/
typedef enum static psa_status_t psa_sign_verify_check_alg( uint8_t do_hash,
psa_algorithm_t alg )
{ {
PSA_SIGN_INVALID = 0, if( do_hash )
PSA_SIGN_HASH = 1, {
PSA_SIGN_MESSAGE if( ! PSA_ALG_IS_SIGN_MESSAGE( alg ) )
} psa_sign_operation_t; return( PSA_ERROR_INVALID_ARGUMENT );
typedef enum if ( PSA_ALG_IS_HASH_AND_SIGN( alg ) )
{ {
PSA_VERIFY_INVALID = 0, if( ! PSA_ALG_IS_HASH( PSA_ALG_SIGN_GET_HASH( alg ) ) )
PSA_VERIFY_HASH = 1, return( PSA_ERROR_INVALID_ARGUMENT );
PSA_VERIFY_MESSAGE }
} psa_verify_operation_t; }
else
{
if( ! PSA_ALG_IS_HASH_AND_SIGN( alg ) )
return( PSA_ERROR_INVALID_ARGUMENT );
}
return( PSA_SUCCESS );
}
static psa_status_t psa_sign_internal( mbedtls_svc_key_id_t key, static psa_status_t psa_sign_internal( mbedtls_svc_key_id_t key,
psa_sign_operation_t operation, uint8_t do_hash,
psa_algorithm_t alg, psa_algorithm_t alg,
const uint8_t * input, const uint8_t * input,
size_t input_length, size_t input_length,
@ -2871,27 +2880,9 @@ static psa_status_t psa_sign_internal( mbedtls_svc_key_id_t key,
*signature_length = 0; *signature_length = 0;
switch( operation ) status = psa_sign_verify_check_alg( do_hash, alg );
{ if( status != PSA_SUCCESS )
case PSA_SIGN_HASH: return status;
if( ! PSA_ALG_IS_HASH_AND_SIGN( alg ) )
return( PSA_ERROR_INVALID_ARGUMENT );
break;
case PSA_SIGN_MESSAGE:
if( ! PSA_ALG_IS_SIGN_MESSAGE( alg ) )
return( PSA_ERROR_INVALID_ARGUMENT );
if ( PSA_ALG_IS_HASH_AND_SIGN( alg ) )
{
if( ! PSA_ALG_IS_HASH( PSA_ALG_SIGN_GET_HASH( alg ) ) )
return( PSA_ERROR_INVALID_ARGUMENT );
}
break;
default:
return( PSA_ERROR_INVALID_ARGUMENT );
}
/* Immediately reject a zero-length signature buffer. This guarantees /* Immediately reject a zero-length signature buffer. This guarantees
* that signature must be a valid pointer. (On the other hand, the input * that signature must be a valid pointer. (On the other hand, the input
@ -2902,8 +2893,8 @@ static psa_status_t psa_sign_internal( mbedtls_svc_key_id_t key,
status = psa_get_and_lock_key_slot_with_policy( status = psa_get_and_lock_key_slot_with_policy(
key, &slot, key, &slot,
operation == PSA_SIGN_HASH ? PSA_KEY_USAGE_SIGN_HASH : do_hash ? PSA_KEY_USAGE_SIGN_MESSAGE :
PSA_KEY_USAGE_SIGN_MESSAGE, PSA_KEY_USAGE_SIGN_HASH,
alg ); alg );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
@ -2919,14 +2910,14 @@ static psa_status_t psa_sign_internal( mbedtls_svc_key_id_t key,
.core = slot->attr .core = slot->attr
}; };
if( operation == PSA_SIGN_MESSAGE ) if( do_hash )
{ {
status = psa_driver_wrapper_sign_message( status = psa_driver_wrapper_sign_message(
&attributes, slot->key.data, slot->key.bytes, &attributes, slot->key.data, slot->key.bytes,
alg, input, input_length, alg, input, input_length,
signature, signature_size, signature_length ); signature, signature_size, signature_length );
} }
else if( operation == PSA_SIGN_HASH ) else
{ {
status = psa_driver_wrapper_sign_hash( status = psa_driver_wrapper_sign_hash(
@ -2955,7 +2946,7 @@ exit:
} }
static psa_status_t psa_verify_internal( mbedtls_svc_key_id_t key, static psa_status_t psa_verify_internal( mbedtls_svc_key_id_t key,
psa_verify_operation_t operation, uint8_t do_hash,
psa_algorithm_t alg, psa_algorithm_t alg,
const uint8_t * input, const uint8_t * input,
size_t input_length, size_t input_length,
@ -2966,32 +2957,14 @@ static psa_status_t psa_verify_internal( mbedtls_svc_key_id_t key,
psa_status_t unlock_status = PSA_ERROR_CORRUPTION_DETECTED; psa_status_t unlock_status = PSA_ERROR_CORRUPTION_DETECTED;
psa_key_slot_t *slot; psa_key_slot_t *slot;
switch( operation ) status = psa_sign_verify_check_alg( do_hash, alg );
{ if( status != PSA_SUCCESS )
case PSA_VERIFY_HASH: return status;
if( ! PSA_ALG_IS_HASH_AND_SIGN( alg ) )
return( PSA_ERROR_INVALID_ARGUMENT );
break;
case PSA_VERIFY_MESSAGE:
if( ! PSA_ALG_IS_SIGN_MESSAGE( alg ) )
return( PSA_ERROR_INVALID_ARGUMENT );
if ( PSA_ALG_IS_HASH_AND_SIGN( alg ) )
{
if( ! PSA_ALG_IS_HASH( PSA_ALG_SIGN_GET_HASH( alg ) ) )
return( PSA_ERROR_INVALID_ARGUMENT );
}
break;
default:
return( PSA_ERROR_INVALID_ARGUMENT );
}
status = psa_get_and_lock_key_slot_with_policy( status = psa_get_and_lock_key_slot_with_policy(
key, &slot, key, &slot,
operation == PSA_VERIFY_HASH ? PSA_KEY_USAGE_VERIFY_HASH : do_hash ? PSA_KEY_USAGE_VERIFY_MESSAGE :
PSA_KEY_USAGE_VERIFY_MESSAGE, PSA_KEY_USAGE_VERIFY_HASH,
alg ); alg );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
@ -3001,14 +2974,14 @@ static psa_status_t psa_verify_internal( mbedtls_svc_key_id_t key,
.core = slot->attr .core = slot->attr
}; };
if( operation == PSA_VERIFY_MESSAGE ) if( do_hash )
{ {
status = psa_driver_wrapper_verify_message( status = psa_driver_wrapper_verify_message(
&attributes, slot->key.data, slot->key.bytes, &attributes, slot->key.data, slot->key.bytes,
alg, input, input_length, alg, input, input_length,
signature, signature_length ); signature, signature_length );
} }
else if( operation == PSA_VERIFY_HASH ) else
{ {
status = psa_driver_wrapper_verify_hash( status = psa_driver_wrapper_verify_hash(
&attributes, slot->key.data, slot->key.bytes, &attributes, slot->key.data, slot->key.bytes,
@ -3054,10 +3027,7 @@ psa_status_t psa_sign_message_internal(
signature, signature_size, signature_length ); signature, signature_size, signature_length );
} }
return psa_driver_wrapper_sign_hash( return( PSA_ERROR_NOT_SUPPORTED );
attributes, key_buffer, key_buffer_size,
alg, input, input_length,
signature, signature_size, signature_length );
} }
psa_status_t psa_sign_message( mbedtls_svc_key_id_t key, psa_status_t psa_sign_message( mbedtls_svc_key_id_t key,
@ -3069,7 +3039,7 @@ psa_status_t psa_sign_message( mbedtls_svc_key_id_t key,
size_t * signature_length ) size_t * signature_length )
{ {
return psa_sign_internal( return psa_sign_internal(
key, PSA_SIGN_MESSAGE, alg, input, input_length, key, 1, alg, input, input_length,
signature, signature_size, signature_length ); signature, signature_size, signature_length );
} }
@ -3118,7 +3088,7 @@ psa_status_t psa_verify_message( mbedtls_svc_key_id_t key,
size_t signature_length ) size_t signature_length )
{ {
return psa_verify_internal( return psa_verify_internal(
key, PSA_VERIFY_MESSAGE, alg, input, input_length, key, 1, alg, input, input_length,
signature, signature_length ); signature, signature_length );
} }
@ -3189,7 +3159,7 @@ psa_status_t psa_sign_hash( mbedtls_svc_key_id_t key,
size_t *signature_length ) size_t *signature_length )
{ {
return psa_sign_internal( return psa_sign_internal(
key, PSA_SIGN_HASH, alg, hash, hash_length, key, 0, alg, hash, hash_length,
signature, signature_size, signature_length ); signature, signature_size, signature_length );
} }
@ -3258,7 +3228,7 @@ psa_status_t psa_verify_hash( mbedtls_svc_key_id_t key,
size_t signature_length ) size_t signature_length )
{ {
return psa_verify_internal( return psa_verify_internal(
key, PSA_VERIFY_HASH, alg, hash, hash_length, key, 0, alg, hash, hash_length,
signature, signature_length ); signature, signature_length );
} }