yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-03-24 22:35:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

external_rng_failure_sign: more robust buffer management

Browse source 
Don't microoptimize memory usage in tests: use separate buffers for
the input and the output. Allocate the input buffer dynamically
because the size is a parameter of the test case. Allocate the output
buffer dynamically because it's generally good practice in tests so
that a memory sanitizer can detect a buffer overflow.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2021-01-06 20:16:26 +01:00
parent 3aa5a6414e
commit 6beb327a5e
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tests/suites/test_suite_psa_crypto_entropy.function
View file

@ -79,18 +79,20 @@ void external_rng_failure_sign( int key_type, data_t *key_data, int alg,
psa_set_key_algorithm( &attributes, alg ); psa_set_key_algorithm( &attributes, alg );
mbedtls_svc_key_id_t key = MBEDTLS_SVC_KEY_ID_INIT; mbedtls_svc_key_id_t key = MBEDTLS_SVC_KEY_ID_INIT;
size_t input_size = input_size_arg; size_t input_size = input_size_arg;
uint8_t signature[PSA_SIGNATURE_MAX_SIZE]; uint8_t *input = NULL;
uint8_t *signature = NULL;
size_t signature_size = PSA_SIGNATURE_MAX_SIZE;
size_t signature_length; size_t signature_length;
TEST_ASSERT( input_size <= sizeof( signature ) ); ASSERT_ALLOC( input, input_size );
ASSERT_ALLOC( signature, signature_size );
PSA_ASSERT( psa_crypto_init( ) ); PSA_ASSERT( psa_crypto_init( ) );
PSA_ASSERT( psa_import_key( &attributes, key_data->x, key_data->len, PSA_ASSERT( psa_import_key( &attributes, key_data->x, key_data->len,
&key ) ); &key ) );
memset( signature, 0, input_size );
PSA_ASSERT( psa_sign_hash( key, alg, PSA_ASSERT( psa_sign_hash( key, alg,
signature, input_size, input, input_size,
signature, sizeof( signature ), signature, signature_size,
&signature_length ) ); &signature_length ) );
PSA_ASSERT( psa_destroy_key( key ) ); PSA_ASSERT( psa_destroy_key( key ) );
@ -99,17 +101,18 @@ void external_rng_failure_sign( int key_type, data_t *key_data, int alg,
* in the key object and this could perturb the test. */ * in the key object and this could perturb the test. */
PSA_ASSERT( psa_import_key( &attributes, key_data->x, key_data->len, PSA_ASSERT( psa_import_key( &attributes, key_data->x, key_data->len,
&key ) ); &key ) );
memset( signature, 0, input_size );
TEST_EQUAL( PSA_ERROR_INSUFFICIENT_ENTROPY, TEST_EQUAL( PSA_ERROR_INSUFFICIENT_ENTROPY,
psa_sign_hash( key, alg, psa_sign_hash( key, alg,
signature, input_size, input, input_size,
signature, sizeof( signature ), signature, signature_size,
&signature_length ) ); &signature_length ) );
PSA_ASSERT( psa_destroy_key( key ) ); PSA_ASSERT( psa_destroy_key( key ) );
exit: exit:
psa_destroy_key( key ); psa_destroy_key( key );
PSA_DONE( ); PSA_DONE( );
mbedtls_free( input );
mbedtls_free( signature );
} }
/* END_CASE */ /* END_CASE */