author | Brian Smith <brian@briansmith.org> |
Fri, 20 Jun 2014 19:43:09 -0700 | |
changeset 190366 | 1dbdfb30254168353d2e47fe007aaa851ee87951 |
parent 190365 | e5e0bb1653b5d4f6567c6ad088c5ed83438b021a |
child 190367 | 3a1aa8745a6fae5d8a7d994107e23d0570ef89dc |
push id | 27004 |
push user | emorley@mozilla.com |
push date | Tue, 24 Jun 2014 15:52:34 +0000 |
treeherder | mozilla-central@7b174d47f3cc [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mmc |
bugs | 1028493 |
milestone | 33.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
security/manager/ssl/src/SSLServerCertVerification.cpp | file | annotate | diff | comparison | revisions |
--- a/security/manager/ssl/src/SSLServerCertVerification.cpp +++ b/security/manager/ssl/src/SSLServerCertVerification.cpp @@ -544,17 +544,16 @@ CertErrorRunnable::RunOnTargetThread() // Returns null with the error code (PR_GetError()) set if it does not create // the CertErrorRunnable. CertErrorRunnable* CreateCertErrorRunnable(CertVerifier& certVerifier, PRErrorCode defaultErrorCodeToReport, TransportSecurityInfo* infoObject, CERTCertificate* cert, - const SECItem* stapledOCSPResponse, const void* fdForLogging, uint32_t providerFlags, PRTime now) { MOZ_ASSERT(infoObject); MOZ_ASSERT(cert); uint32_t collected_errors = 0; @@ -898,18 +897,18 @@ SSLServerCertVerificationJob::Run() { TimeStamp now = TimeStamp::Now(); MutexAutoLock telemetryMutex(*gSSLVerificationTelemetryMutex); Telemetry::AccumulateTimeDelta(failureTelemetry, mJobStartTime, now); } if (error != 0) { RefPtr<CertErrorRunnable> runnable( CreateCertErrorRunnable(*mCertVerifier, error, mInfoObject, - mCert.get(), mStapledOCSPResponse, - mFdForLogging, mProviderFlags, mTime)); + mCert.get(), mFdForLogging, mProviderFlags, + mTime)); if (!runnable) { // CreateCertErrorRunnable set a new error code error = PR_GetError(); } else { // We must block the the socket transport service thread while the // main thread executes the CertErrorRunnable. The CertErrorRunnable // will dispatch the result asynchronously, so we don't have to block // this thread waiting for it. @@ -1043,17 +1042,16 @@ AuthCertificateHook(void* arg, PRFileDes Telemetry::Accumulate(Telemetry::SSL_CERT_ERROR_OVERRIDES, 1); return SECSuccess; } PRErrorCode error = PR_GetError(); if (error != 0) { RefPtr<CertErrorRunnable> runnable( CreateCertErrorRunnable(*certVerifier, error, socketInfo, serverCert, - stapledOCSPResponse, static_cast<const void*>(fd), providerFlags, now)); if (!runnable) { // CreateCertErrorRunnable sets a new error code when it fails error = PR_GetError(); } else { // We have to return SECSuccess or SECFailure based on the result of the // override processing, so we must block this thread waiting for it. The