diff options
| author | danh-arm <dan.handley@arm.com> | 2017-02-20 14:00:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-20 14:00:05 +0000 |
| commit | 93f398205a8ebd2c1cef780251a0d24576ab1b28 (patch) | |
| tree | bf743038d7035ec13468a7c8ce113b37fd438027 /drivers/auth | |
| parent | 8da12f612e72f269272bb674c59c60fcf7393737 (diff) | |
| parent | fabd21ad36a4ae405fbc6a938151620cda8bc31e (diff) | |
Merge pull request #844 from antonio-nino-diaz-arm/an/no-timingsafe
Revert "tbbr: Use constant-time bcmp() to compare hashes"
Diffstat (limited to 'drivers/auth')
| -rw-r--r-- | drivers/auth/mbedtls/mbedtls_crypto.c | 2 | ||||
| -rw-r--r-- | drivers/auth/mbedtls/mbedtls_x509_parser.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/auth/mbedtls/mbedtls_crypto.c b/drivers/auth/mbedtls/mbedtls_crypto.c index 11d3ede4..1a96e8f8 100644 --- a/drivers/auth/mbedtls/mbedtls_crypto.c +++ b/drivers/auth/mbedtls/mbedtls_crypto.c @@ -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; } diff --git a/drivers/auth/mbedtls/mbedtls_x509_parser.c b/drivers/auth/mbedtls/mbedtls_x509_parser.c index 36c279f6..092c346b 100644 --- a/drivers/auth/mbedtls/mbedtls_x509_parser.c +++ b/drivers/auth/mbedtls/mbedtls_x509_parser.c @@ -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)); |