diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-04 20:53:31 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-04 20:53:31 +0200 |
| commit | 580084e9e1d0355c96a54a9641df6c1fee894948 (patch) | |
| tree | 5aff416b5aed2ca9e326054567d837f28c20ed25 /security/certverifier/ExtendedValidation.cpp | |
| parent | fc61780b35af913801d72086456f493f63197da6 (diff) | |
| parent | b28ab55f9675f2e97dda9a4fcac0d4f5267a2bb9 (diff) | |
| download | UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar.gz UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar.lz UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar.xz UXP-580084e9e1d0355c96a54a9641df6c1fee894948.zip | |
Merge branch 'master' into Basilisk-releasev2018.09.05
Diffstat (limited to 'security/certverifier/ExtendedValidation.cpp')
| -rw-r--r-- | security/certverifier/ExtendedValidation.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/security/certverifier/ExtendedValidation.cpp b/security/certverifier/ExtendedValidation.cpp index 8ac5828de..37c028c54 100644 --- a/security/certverifier/ExtendedValidation.cpp +++ b/security/certverifier/ExtendedValidation.cpp @@ -1285,15 +1285,7 @@ LoadExtendedValidationInfo() UniqueCERTCertificate cert(CERT_FindCertByIssuerAndSN(nullptr, &ias)); - // If an entry is missing in the NSS root database, it may be because the - // root database is out of sync with what we expect (e.g. a different - // version of system NSS is installed). - if (!cert) { - // The entries for the debug EV roots are at indices 0 through - // NUM_TEST_EV_ROOTS - 1. Since they're not built-in, they probably - // haven't been loaded yet. - MOZ_ASSERT(iEV < NUM_TEST_EV_ROOTS, "Could not find built-in EV root"); - } else { + if (cert) { unsigned char certFingerprint[SHA256_LENGTH]; srv = PK11_HashBuf(SEC_OID_SHA256, certFingerprint, cert->derCert.data, AssertedCast<int32_t>(cert->derCert.len)); |