yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ensure generate nonce unavailable in decrypt

Browse source 
Signed-off-by: Paul Elliott <paul.elliott@arm.com>
This commit is contained in:
Paul Elliott 2021-06-22 17:25:57 +01:00
parent 5e3bb13111
commit 7220cae93c
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/psa/crypto_struct.h
View file

@ -172,11 +172,12 @@ struct psa_aead_operation_s
unsigned int lengths_set : 1; unsigned int lengths_set : 1;
unsigned int ad_started : 1; unsigned int ad_started : 1;
unsigned int body_started : 1; unsigned int body_started : 1;
unsigned int is_encrypt : 1;
psa_driver_aead_context_t ctx; psa_driver_aead_context_t ctx;
}; };
#define PSA_AEAD_OPERATION_INIT {0, 0, 0, 0, 0, 0, 0, 0, 0, {0}} #define PSA_AEAD_OPERATION_INIT {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0}}
static inline struct psa_aead_operation_s psa_aead_operation_init( void ) static inline struct psa_aead_operation_s psa_aead_operation_init( void )
{ {
const struct psa_aead_operation_s v = PSA_AEAD_OPERATION_INIT; const struct psa_aead_operation_s v = PSA_AEAD_OPERATION_INIT;

9
library/psa_crypto.c
View file

@ -3469,7 +3469,10 @@ exit:
status = unlock_status; status = unlock_status;
if( status == PSA_SUCCESS ) if( status == PSA_SUCCESS )
{
operation->alg = psa_aead_get_base_algorithm( alg ); operation->alg = psa_aead_get_base_algorithm( alg );
operation->is_encrypt = 1;
}
else else
psa_aead_abort( operation ); psa_aead_abort( operation );
@ -3531,7 +3534,10 @@ exit:
status = unlock_status; status = unlock_status;
if( status == PSA_SUCCESS ) if( status == PSA_SUCCESS )
{
operation->alg = psa_aead_get_base_algorithm( alg ); operation->alg = psa_aead_get_base_algorithm( alg );
operation->is_encrypt = 0;
}
else else
psa_aead_abort( operation ); psa_aead_abort( operation );
@ -3556,7 +3562,7 @@ psa_status_t psa_aead_generate_nonce( psa_aead_operation_t *operation,
} }
if( operation->nonce_set || operation->ad_started || if( operation->nonce_set || operation->ad_started ||
operation->body_started ) operation->body_started || operation->is_encrypt == 0 )
{ {
status = PSA_ERROR_BAD_STATE; status = PSA_ERROR_BAD_STATE;
goto exit; goto exit;
@ -3881,6 +3887,7 @@ psa_status_t psa_aead_abort( psa_aead_operation_t *operation )
operation->lengths_set = 0; operation->lengths_set = 0;
operation->ad_started = 0; operation->ad_started = 0;
operation->body_started = 0; operation->body_started = 0;
operation->is_encrypt = 0;
return( status ); return( status );
} }

13
tests/suites/test_suite_psa_crypto.function
View file

@ -3913,6 +3913,19 @@ void aead_multipart_state_test( int key_type_arg, data_t *key_data,
psa_aead_abort( &operation ); psa_aead_abort( &operation );
/* Test for generating nonce in decrypt setup. */
operation = psa_aead_operation_init( );
PSA_ASSERT( psa_aead_decrypt_setup( &operation, key, alg ) );
TEST_EQUAL( psa_aead_generate_nonce( &operation, nonce_buffer,
PSA_AEAD_NONCE_MAX_SIZE,
&nonce_length ),
PSA_ERROR_BAD_STATE );
psa_aead_abort( &operation );
/* Test for setting lengths twice. */ /* Test for setting lengths twice. */
operation = psa_aead_operation_init( ); operation = psa_aead_operation_init( );