mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-31 10:20:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move safer_memcmp to psa_crypto_core.h

Browse Source 
Same change as made by Steven Cooreman, although not yet merged.

Signed-off-by: Paul Elliott <paul.elliott@arm.com>
This commit is contained in:
Paul Elliott 2021-05-10 19:29:35 +01:00
parent 7f0a180107
commit 6edb7473db
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/psa_crypto_aead.c
View File

@ -38,21 +38,6 @@
#include "mbedtls/gcm.h" #include "mbedtls/gcm.h"
#include "mbedtls/error.h" #include "mbedtls/error.h"
/* Constant-time buffer comparison. This is duplication of code from
* psa_crypto.c, but has nowhere private I can put it for the minute. Really
belongs in the constant time module, when that gets implemented */
static inline int safer_memcmp( const uint8_t *a, const uint8_t *b, size_t n )
{
size_t i;
unsigned char diff = 0;
for( i = 0; i < n; i++ )
diff |= a[i] ^ b[i];
return( diff );
}
static psa_status_t psa_aead_setup( static psa_status_t psa_aead_setup(
mbedtls_psa_aead_operation_t *operation, mbedtls_psa_aead_operation_t *operation,
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes,
@ -1014,7 +999,8 @@ psa_status_t mbedtls_psa_aead_verify( mbedtls_psa_aead_operation_t *operation,
{ {
*plaintext_length = finish_output_size; *plaintext_length = finish_output_size;
if( do_tag_check && safer_memcmp(tag, check_tag, tag_length) != 0 ) if( do_tag_check &&
mbedtls_psa_safer_memcmp(tag, check_tag, tag_length) != 0 )
{ {
status = PSA_ERROR_INVALID_SIGNATURE; status = PSA_ERROR_INVALID_SIGNATURE;
} }