diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-12 01:25:43 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-12 01:25:43 +0100 |
| commit | 263d8500ce68b279a2d055c322f0ab3eab634989 (patch) | |
| tree | 9f258c3d6186346dc4435427ce6565ec376efd5d /security/certverifier/NSSCertDBTrustDomain.cpp | |
| parent | b06821da15b7ab2573cd18aea8048b94266e3a97 (diff) | |
| parent | 8beab28bfff78ccefc8677c5bdddd6f60c544600 (diff) | |
| download | UXP-263d8500ce68b279a2d055c322f0ab3eab634989.tar UXP-263d8500ce68b279a2d055c322f0ab3eab634989.tar.gz UXP-263d8500ce68b279a2d055c322f0ab3eab634989.tar.lz UXP-263d8500ce68b279a2d055c322f0ab3eab634989.tar.xz UXP-263d8500ce68b279a2d055c322f0ab3eab634989.zip | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/components/preferences/advanced.xul
# application/palemoon/config/version.txt
# modules/libpref/init/all.js
Diffstat (limited to 'security/certverifier/NSSCertDBTrustDomain.cpp')
| -rw-r--r-- | security/certverifier/NSSCertDBTrustDomain.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/security/certverifier/NSSCertDBTrustDomain.cpp b/security/certverifier/NSSCertDBTrustDomain.cpp index 39f7d3e9e..5e89c2484 100644 --- a/security/certverifier/NSSCertDBTrustDomain.cpp +++ b/security/certverifier/NSSCertDBTrustDomain.cpp @@ -60,7 +60,6 @@ NSSCertDBTrustDomain::NSSCertDBTrustDomain(SECTrustType certDBTrustType, NetscapeStepUpPolicy netscapeStepUpPolicy, const NeckoOriginAttributes& originAttributes, UniqueCERTCertList& builtChain, - /*optional*/ PinningTelemetryInfo* pinningTelemetryInfo, /*optional*/ const char* hostname) : mCertDBTrustType(certDBTrustType) , mOCSPFetching(ocspFetching) @@ -75,7 +74,6 @@ NSSCertDBTrustDomain::NSSCertDBTrustDomain(SECTrustType certDBTrustType, , mNetscapeStepUpPolicy(netscapeStepUpPolicy) , mOriginAttributes(originAttributes) , mBuiltChain(builtChain) - , mPinningTelemetryInfo(pinningTelemetryInfo) , mHostname(hostname) , mCertBlocklist(do_GetService(NS_CERTBLOCKLIST_CONTRACTID)) , mOCSPStaplingStatus(CertVerifier::OCSP_STAPLING_NEVER_CHECKED) @@ -874,8 +872,7 @@ NSSCertDBTrustDomain::IsChainValid(const DERArray& certArray, Time time) (mPinningMode == CertVerifier::pinningEnforceTestMode); bool chainHasValidPins; nsresult nsrv = PublicKeyPinningService::ChainHasValidPins( - certList, mHostname, time, enforceTestMode, chainHasValidPins, - mPinningTelemetryInfo); + certList, mHostname, time, enforceTestMode, chainHasValidPins); if (NS_FAILED(nsrv)) { return Result::FATAL_ERROR_LIBRARY_FAILURE; } |