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

unify the concatenation of the tag and update output length

Browse source
This commit is contained in:
mohammad1603 2018-04-26 12:08:21 +03:00 committed by itayzafrir
parent 9e5a515aa8
commit ce5cba9a6a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/psa_crypto.c
View file

@ -1562,6 +1562,7 @@ psa_status_t psa_aead_encrypt( psa_key_slot_t key,
mbedtls_ccm_free( &ccm ); mbedtls_ccm_free( &ccm );
} }
memcpy( ciphertext + plaintext_length, tag, sizeof( tag ) ); memcpy( ciphertext + plaintext_length, tag, sizeof( tag ) );
*ciphertext_length = plaintext_length + sizeof( tag );
return( PSA_SUCCESS ); return( PSA_SUCCESS );
} }
@ -1629,7 +1630,6 @@ psa_status_t psa_aead_decrypt( psa_key_slot_t key,
} }
mbedtls_gcm_free( &gcm ); mbedtls_gcm_free( &gcm );
memcpy( plaintext + ciphertext_length + 8, tag, sizeof( tag ) );
} }
else if( alg == PSA_ALG_CCM ) else if( alg == PSA_ALG_CCM )
{ {
@ -1659,8 +1659,10 @@ psa_status_t psa_aead_decrypt( psa_key_slot_t key,
} }
mbedtls_ccm_free( &ccm ); mbedtls_ccm_free( &ccm );
memcpy( plaintext + ciphertext_length, tag, sizeof( tag ) );
} }
memcpy( plaintext + ciphertext_length, tag, sizeof( tag ) );
*plaintext_length = ciphertext_length + sizeof( tag );
return( PSA_SUCCESS ); return( PSA_SUCCESS );
} }