andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #844 from antonio-nino-diaz-arm/an/no-timingsafe 

Revert "tbbr: Use constant-time bcmp() to compare hashes"
This commit is contained in:
danh-arm 2017-02-20 14:00:05 +00:00 committed by GitHub
parent 8da12f612e fabd21ad36
commit 93f398205a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/auth/mbedtls/mbedtls_crypto.c
View File

@ -217,7 +217,7 @@ static int verify_hash(void *data_ptr, unsigned int data_len,
}
/* Compare values */
rc = timingsafe_bcmp(data_hash, hash, mbedtls_md_get_size(md_info));
rc = memcmp(data_hash, hash, mbedtls_md_get_size(md_info));
if (rc != 0) {
return CRYPTO_ERR_HASH;
}

2
drivers/auth/mbedtls/mbedtls_x509_parser.c
View File

@ -393,7 +393,7 @@ static int cert_parse(void *img, unsigned int img_len)
if (sig_alg1.len != sig_alg2.len) {
return IMG_PARSER_ERR_FORMAT;
}
if (0 != timingsafe_bcmp(sig_alg1.p, sig_alg2.p, sig_alg1.len)) {
if (0 != memcmp(sig_alg1.p, sig_alg2.p, sig_alg1.len)) {
return IMG_PARSER_ERR_FORMAT;
}
memcpy(&sig_alg, &sig_alg1, sizeof(sig_alg));