mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-25 04:55:36 +00:00
fix code offsets after rebase
This commit is contained in:
parent
ee652a344c
commit
9375f8403a
|
@ -1544,14 +1544,6 @@ psa_status_t psa_aead_encrypt( psa_key_slot_t key,
|
||||||
if( nonce_length < 7 || nonce_length > 13 )
|
if( nonce_length < 7 || nonce_length > 13 )
|
||||||
return( PSA_ERROR_INVALID_ARGUMENT );
|
return( PSA_ERROR_INVALID_ARGUMENT );
|
||||||
|
|
||||||
tag_length = 16;
|
|
||||||
status = psa_aead_unpadded_locate_tag( tag_length,
|
|
||||||
ciphertext, ciphertext_length,
|
|
||||||
plaintext_size, plaintext_length,
|
|
||||||
&tag );
|
|
||||||
if( status != PSA_SUCCESS )
|
|
||||||
return( status );
|
|
||||||
|
|
||||||
mbedtls_ccm_init( &ccm );
|
mbedtls_ccm_init( &ccm );
|
||||||
ret = mbedtls_ccm_setkey( &ccm, cipher_id,
|
ret = mbedtls_ccm_setkey( &ccm, cipher_id,
|
||||||
slot->data.raw.data, key_bits );
|
slot->data.raw.data, key_bits );
|
||||||
|
@ -1685,6 +1677,14 @@ psa_status_t psa_aead_decrypt( psa_key_slot_t key,
|
||||||
if( nonce_length < 7 || nonce_length > 13 )
|
if( nonce_length < 7 || nonce_length > 13 )
|
||||||
return( PSA_ERROR_INVALID_ARGUMENT );
|
return( PSA_ERROR_INVALID_ARGUMENT );
|
||||||
|
|
||||||
|
tag_length = 16;
|
||||||
|
status = psa_aead_unpadded_locate_tag( tag_length,
|
||||||
|
ciphertext, ciphertext_length,
|
||||||
|
plaintext_size, plaintext_length,
|
||||||
|
&tag );
|
||||||
|
if( status != PSA_SUCCESS )
|
||||||
|
return( status );
|
||||||
|
|
||||||
mbedtls_ccm_init( &ccm );
|
mbedtls_ccm_init( &ccm );
|
||||||
ret = mbedtls_ccm_setkey( &ccm, cipher_id,
|
ret = mbedtls_ccm_setkey( &ccm, cipher_id,
|
||||||
slot->data.raw.data, key_bits );
|
slot->data.raw.data, key_bits );
|
||||||
|
|
Loading…
Reference in a new issue