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

Remove key_set and use id instead

Browse source 
In keeping with the other PSA multipart operations.

Signed-off-by: Paul Elliott <paul.elliott@arm.com>
This commit is contained in:
Paul Elliott 2021-05-12 12:12:07 +01:00
parent bbe90b5f7f
commit a559b3ce56
2 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/psa/crypto_struct.h
View file

@ -165,7 +165,6 @@ struct psa_aead_operation_s
psa_algorithm_t alg;
psa_key_type_t key_type;
unsigned int key_set : 1;
unsigned int nonce_set : 1;
unsigned int lengths_set : 1;
unsigned int ad_started : 1;
@ -174,7 +173,7 @@ struct psa_aead_operation_s
psa_driver_aead_context_t ctx;
};
#define PSA_AEAD_OPERATION_INIT {0, 0, 0, 0, 0, 0, 0, 0, {0}}
#define PSA_AEAD_OPERATION_INIT {0, 0, 0, 0, 0, 0, 0, {0}}
static inline struct psa_aead_operation_s psa_aead_operation_init( void )
{
const struct psa_aead_operation_s v = PSA_AEAD_OPERATION_INIT;

25
library/psa_crypto.c
View file

@ -3248,7 +3248,7 @@ psa_status_t psa_aead_encrypt_setup( psa_aead_operation_t *operation,
goto exit;
}
if( operation->key_set || operation->nonce_set ||
if( operation->id || operation->nonce_set ||
operation->ad_started || operation->body_started )
{
status = PSA_ERROR_BAD_STATE;
@ -3288,10 +3288,7 @@ psa_status_t psa_aead_encrypt_setup( psa_aead_operation_t *operation,
exit:
if( status == PSA_SUCCESS )
{
operation->alg = psa_aead_get_base_algorithm( alg );
operation->key_set = 1;
}
else
psa_aead_abort( operation );
@ -3313,7 +3310,7 @@ psa_status_t psa_aead_decrypt_setup( psa_aead_operation_t *operation,
goto exit;
}
if( operation->key_set || operation->nonce_set ||
if( operation->id || operation->nonce_set ||
operation->ad_started || operation->body_started )
{
status = PSA_ERROR_BAD_STATE;
@ -3344,10 +3341,7 @@ psa_status_t psa_aead_decrypt_setup( psa_aead_operation_t *operation,
exit:
if( status == PSA_SUCCESS )
{
operation->alg = psa_aead_get_base_algorithm( alg );
operation->key_set = 1;
}
else
psa_aead_abort( operation );
@ -3365,7 +3359,7 @@ psa_status_t psa_aead_generate_nonce( psa_aead_operation_t *operation,
*nonce_length = 0;
if( !operation->key_set || operation->nonce_set ||
if( !operation->id || operation->nonce_set ||
operation->ad_started || operation->body_started )
{
status = PSA_ERROR_BAD_STATE;
@ -3407,7 +3401,7 @@ psa_status_t psa_aead_set_nonce( psa_aead_operation_t *operation,
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
if( !operation->key_set || operation->nonce_set ||
if( !operation->id || operation->nonce_set ||
operation->ad_started || operation->body_started )
{
status = PSA_ERROR_BAD_STATE;
@ -3434,7 +3428,7 @@ psa_status_t psa_aead_set_lengths( psa_aead_operation_t *operation,
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
if( !operation->key_set || operation->lengths_set )
if( !operation->id || operation->lengths_set )
{
status = PSA_ERROR_BAD_STATE;
goto exit;
@ -3459,7 +3453,7 @@ psa_status_t psa_aead_update_ad( psa_aead_operation_t *operation,
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
if( !operation->nonce_set || !operation->key_set )
if( !operation->id || !operation->nonce_set )
{
status = PSA_ERROR_BAD_STATE;
goto exit;
@ -3491,7 +3485,7 @@ psa_status_t psa_aead_update( psa_aead_operation_t *operation,
*output_length = 0;
if( !operation->nonce_set || !operation->key_set || !operation->ad_started )
if( !operation->id || !operation->nonce_set || !operation->ad_started )
{
status = PSA_ERROR_BAD_STATE;
goto exit;
@ -3525,7 +3519,7 @@ psa_status_t psa_aead_finish( psa_aead_operation_t *operation,
*ciphertext_length = 0;
*tag_length = 0;
if( !operation->key_set || !operation->nonce_set ||
if( !operation->id || !operation->nonce_set ||
!operation->ad_started || !operation->body_started )
{
status = PSA_ERROR_BAD_STATE;
@ -3557,7 +3551,7 @@ psa_status_t psa_aead_verify( psa_aead_operation_t *operation,
*plaintext_length = 0;
if( !operation->key_set || !operation->nonce_set ||
if( !operation->id || !operation->nonce_set ||
!operation->ad_started || !operation->body_started )
{
status = PSA_ERROR_BAD_STATE;
@ -3592,7 +3586,6 @@ psa_status_t psa_aead_abort( psa_aead_operation_t *operation )
status = psa_driver_wrapper_aead_abort( operation );
operation->id = 0;
operation->key_set = 0;
operation->nonce_set = 0;
operation->lengths_set = 0;
operation->ad_started = 0;