diff options
author | Sebastian Hengst <archaeopteryx@coole-files.de> | 2018-04-13 16:01:28 +0300 |
---|---|---|
committer | Sebastian Hengst <archaeopteryx@coole-files.de> | 2018-04-13 16:01:28 +0300 |
commit | ca6f595869107b06288c8164996fc57f18169b24 (patch) | |
tree | 2c543ec01919bfead2ded8ca0688a3f8d76740ba | |
parent | 2fa51cc6471c43873ad98c8de040fde4b2e55c54 (diff) | |
download | nss-hg-ca6f595869107b06288c8164996fc57f18169b24.tar.gz |
Backed out 4 changesets (bug 525063) on request from Andi. a=backout
Backed out changeset 9d7f1e63d6f7 (bug 525063)
Backed out changeset 9d7f1e63d6f7 (bug 525063)
Backed out changeset 9d7f1e63d6f7 (bug 525063)
Backed out changeset 9d7f1e63d6f7 (bug 525063)
-rw-r--r-- | lib/mozpkix/include/pkix/Time.h | 5 | ||||
-rw-r--r-- | lib/mozpkix/lib/pkixbuild.cpp | 10 | ||||
-rw-r--r-- | lib/mozpkix/lib/pkixutil.h | 4 |
3 files changed, 5 insertions, 14 deletions
diff --git a/lib/mozpkix/include/pkix/Time.h b/lib/mozpkix/include/pkix/Time.h index 24c84d430..e997682b3 100644 --- a/lib/mozpkix/include/pkix/Time.h +++ b/lib/mozpkix/include/pkix/Time.h @@ -49,10 +49,7 @@ public: // This will succeed, leaving the time uninitialized: // Time x(Time::uninitialized); enum Uninitialized { uninitialized }; - explicit Time(Uninitialized) - : elapsedSecondsAD{} - { - } + explicit Time(Uninitialized) { } bool operator==(const Time& other) const { diff --git a/lib/mozpkix/lib/pkixbuild.cpp b/lib/mozpkix/lib/pkixbuild.cpp index 94f01d33a..db65d6021 100644 --- a/lib/mozpkix/lib/pkixbuild.cpp +++ b/lib/mozpkix/lib/pkixbuild.cpp @@ -47,14 +47,11 @@ TrustDomain::IssuerChecker::~IssuerChecker() { } class PathBuildingStep final : public TrustDomain::IssuerChecker { public: - PathBuildingStep(TrustDomain& aTrustDomain, - const BackCert& aSubject, - Time aTime, - KeyPurposeId aRequiredEKUIfPresent, + PathBuildingStep(TrustDomain& aTrustDomain, const BackCert& aSubject, + Time aTime, KeyPurposeId aRequiredEKUIfPresent, const CertPolicyId& aRequiredPolicy, /*optional*/ const Input* aStapledOCSPResponse, - unsigned int aSubCACount, - Result aDeferredSubjectError, + unsigned int aSubCACount, Result aDeferredSubjectError, unsigned int& aBuildForwardCallBudget) : trustDomain(aTrustDomain) , subject(aSubject) @@ -64,7 +61,6 @@ public: , stapledOCSPResponse(aStapledOCSPResponse) , subCACount(aSubCACount) , deferredSubjectError(aDeferredSubjectError) - , subjectSignaturePublicKeyAlg{ static_cast<der::PublicKeyAlgorithm>(0) } , result(Result::FATAL_ERROR_LIBRARY_FAILURE) , resultWasSet(false) , buildForwardCallBudget(aBuildForwardCallBudget) diff --git a/lib/mozpkix/lib/pkixutil.h b/lib/mozpkix/lib/pkixutil.h index 3bde8f792..c22ffbefe 100644 --- a/lib/mozpkix/lib/pkixutil.h +++ b/lib/mozpkix/lib/pkixutil.h @@ -42,13 +42,11 @@ class BackCert final { public: // certDER and childCert must be valid for the lifetime of BackCert. - BackCert(Input aCertDER, - EndEntityOrCA aEndEntityOrCA, + BackCert(Input aCertDER, EndEntityOrCA aEndEntityOrCA, const BackCert* aChildCert) : der(aCertDER) , endEntityOrCA(aEndEntityOrCA) , childCert(aChildCert) - , version{ static_cast<der::Version>(0) } { } |