diff options
| -rw-r--r-- | lib/mozpkix/include/pkix/pkix.h | 2 | ||||
| -rw-r--r-- | lib/mozpkix/include/pkix/pkixnss.h | 3 | ||||
| -rw-r--r-- | lib/mozpkix/include/pkix/pkixtypes.h | 9 | ||||
| -rw-r--r-- | lib/mozpkix/lib/pkixnss.cpp | 4 | ||||
| -rw-r--r-- | lib/mozpkix/test/lib/pkixtestutil.h | 6 |
5 files changed, 15 insertions, 9 deletions
diff --git a/lib/mozpkix/include/pkix/pkix.h b/lib/mozpkix/include/pkix/pkix.h index 771ef51da..6a3b1e2f7 100644 --- a/lib/mozpkix/include/pkix/pkix.h +++ b/lib/mozpkix/include/pkix/pkix.h @@ -122,7 +122,7 @@ Result CheckCertHostname(Input cert, Input hostname); // responder, for the provided CertID. The request has no extensions. static const size_t OCSP_REQUEST_MAX_LENGTH = 127; Result CreateEncodedOCSPRequest(TrustDomain& trustDomain, - const struct CertID& certID, + const CertID& certID, /*out*/ uint8_t (&out)[OCSP_REQUEST_MAX_LENGTH], /*out*/ size_t& outLen); diff --git a/lib/mozpkix/include/pkix/pkixnss.h b/lib/mozpkix/include/pkix/pkixnss.h index a26d47fe6..20a052d96 100644 --- a/lib/mozpkix/include/pkix/pkixnss.h +++ b/lib/mozpkix/include/pkix/pkixnss.h @@ -69,7 +69,8 @@ PRErrorCode MapResultToPRErrorCode(Result result); static const PRErrorCode ERROR_BASE = -0x4000; static const PRErrorCode ERROR_LIMIT = ERROR_BASE + 1000; -enum ErrorCode { +enum ErrorCode +{ MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE = ERROR_BASE + 0, MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY = ERROR_BASE + 1, MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE = ERROR_BASE + 2, diff --git a/lib/mozpkix/include/pkix/pkixtypes.h b/lib/mozpkix/include/pkix/pkixtypes.h index 0a86d1af6..e84db6155 100644 --- a/lib/mozpkix/include/pkix/pkixtypes.h +++ b/lib/mozpkix/include/pkix/pkixtypes.h @@ -85,7 +85,8 @@ public: enum class EndEntityOrCA { MustBeEndEntity = 0, MustBeCA = 1 }; -enum class KeyUsage : uint8_t { +enum class KeyUsage : uint8_t +{ digitalSignature = 0, nonRepudiation = 1, keyEncipherment = 2, @@ -98,7 +99,8 @@ enum class KeyUsage : uint8_t { noParticularKeyUsageRequired = 0xff, }; -enum class KeyPurposeId { +enum class KeyPurposeId +{ anyExtendedKeyUsage = 0, id_kp_serverAuth = 1, // id-kp-serverAuth id_kp_clientAuth = 2, // id-kp-clientAuth @@ -118,7 +120,8 @@ struct CertPolicyId final static const CertPolicyId anyPolicy; }; -enum class TrustLevel { +enum class TrustLevel +{ TrustAnchor = 1, // certificate is a trusted root CA certificate or // equivalent *for the given policy*. ActivelyDistrusted = 2, // certificate is known to be bad diff --git a/lib/mozpkix/lib/pkixnss.cpp b/lib/mozpkix/lib/pkixnss.cpp index 6c38d4228..a3e355334 100644 --- a/lib/mozpkix/lib/pkixnss.cpp +++ b/lib/mozpkix/lib/pkixnss.cpp @@ -221,7 +221,7 @@ RegisterErrorTable() { // Note that these error strings are not localizable. // When these strings change, update the localization information too. - static const struct PRErrorMessage ErrorTableText[] = { + static const PRErrorMessage ErrorTableText[] = { { "MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE", "The server uses key pinning (HPKP) but no trusted certificate chain " "could be constructed that matches the pinset. Key pinning violations " @@ -243,7 +243,7 @@ RegisterErrorTable() // Note that these error strings are not localizable. // When these strings change, update the localization information too. - static const struct PRErrorTable ErrorTable = { + static const PRErrorTable ErrorTable = { ErrorTableText, "pkixerrors", ERROR_BASE, diff --git a/lib/mozpkix/test/lib/pkixtestutil.h b/lib/mozpkix/test/lib/pkixtestutil.h index b7360c171..4eaa9d3a4 100644 --- a/lib/mozpkix/test/lib/pkixtestutil.h +++ b/lib/mozpkix/test/lib/pkixtestutil.h @@ -323,7 +323,8 @@ public: // The fields below are in the order that they appear in an OCSP response. - enum OCSPResponseStatus { + enum OCSPResponseStatus + { successful = 0, malformedRequest = 1, internalError = 2, @@ -353,7 +354,8 @@ public: // The following fields are on a per-SingleResponse basis. In the future we // may support including multiple SingleResponses per response. - enum CertStatus { + enum CertStatus + { good = 0, revoked = 1, unknown = 2, |