diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-11-20 09:47:03 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-11-20 09:47:03 +0000 |
| commit | 5165ed02285315cc0bed7977c7bac6d0a90ca43c (patch) | |
| tree | 9b761a21eb924915e51c2d803208e6c01b505a45 /security/manager/ssl/nsNSSComponent.cpp | |
| parent | e1db27e19989db11fef70f439cf95821316535b3 (diff) | |
| parent | ca9abcdf1702c37bf00048dab3f460b2252873a3 (diff) | |
| download | UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.tar UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.tar.gz UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.tar.lz UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.tar.xz UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.zip | |
Merge branch 'redwood' into releaseRELBASE_20201124RELBASE_20201120RC_20201120
Diffstat (limited to 'security/manager/ssl/nsNSSComponent.cpp')
| -rw-r--r-- | security/manager/ssl/nsNSSComponent.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp index 897b5743c..6e6d61441 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp @@ -1579,14 +1579,6 @@ void nsNSSComponent::setValidationOptions(bool isInitialSetting, PublicSSLState()->SetSignedCertTimestampsEnabled(sctsEnabled); PrivateSSLState()->SetSignedCertTimestampsEnabled(sctsEnabled); - CertVerifier::PinningMode pinningMode = - static_cast<CertVerifier::PinningMode> - (Preferences::GetInt("security.cert_pinning.enforcement_level", - CertVerifier::pinningDisabled)); - if (pinningMode > CertVerifier::pinningEnforceTestMode) { - pinningMode = CertVerifier::pinningDisabled; - } - CertVerifier::SHA1Mode sha1Mode = static_cast<CertVerifier::SHA1Mode> (Preferences::GetInt("security.pki.sha1_enforcement_level", static_cast<int32_t>(CertVerifier::SHA1Mode::Allowed))); @@ -1646,7 +1638,7 @@ void nsNSSComponent::setValidationOptions(bool isInitialSetting, lock); mDefaultCertVerifier = new SharedCertVerifier(odc, osc, ogc, certShortLifetimeInDays, - pinningMode, sha1Mode, + sha1Mode, nameMatchingMode, netscapeStepUpPolicy, ctMode); |