Index: net/cert/x509_util_nss_unittest.cc |
diff --git a/net/cert/x509_util_nss_unittest.cc b/net/cert/x509_util_nss_unittest.cc |
index 0ad5ecddfaa99ba0600093d41539f64f93402622..03c1fe8a1443e323d7e927da56ce01c69f95ad42 100644 |
--- a/net/cert/x509_util_nss_unittest.cc |
+++ b/net/cert/x509_util_nss_unittest.cc |
@@ -23,12 +23,12 @@ namespace { |
CERTCertificate* CreateNSSCertHandleFromBytes(const char* data, size_t length) { |
SECItem der_cert; |
der_cert.data = reinterpret_cast<unsigned char*>(const_cast<char*>(data)); |
- der_cert.len = length; |
+ der_cert.len = length; |
der_cert.type = siDERCertBuffer; |
// Parse into a certificate structure. |
- return CERT_NewTempCertificate(CERT_GetDefaultCertDB(), &der_cert, NULL, |
- PR_FALSE, PR_TRUE); |
+ return CERT_NewTempCertificate( |
+ CERT_GetDefaultCertDB(), &der_cert, NULL, PR_FALSE, PR_TRUE); |
} |
#if !defined(OS_WIN) && !defined(OS_MACOSX) |
@@ -40,22 +40,20 @@ void VerifyCertificateSignature(const std::string& der_cert, |
memset(&sd, 0, sizeof(sd)); |
SECItem der_cert_item = { |
- siDERCertBuffer, |
- reinterpret_cast<unsigned char*>(const_cast<char*>(der_cert.data())), |
- static_cast<unsigned int>(der_cert.size()) |
- }; |
- SECStatus rv = SEC_ASN1DecodeItem(arena.get(), &sd, |
- SEC_ASN1_GET(CERT_SignedDataTemplate), |
- &der_cert_item); |
+ siDERCertBuffer, |
+ reinterpret_cast<unsigned char*>(const_cast<char*>(der_cert.data())), |
+ static_cast<unsigned int>(der_cert.size())}; |
+ SECStatus rv = SEC_ASN1DecodeItem( |
+ arena.get(), &sd, SEC_ASN1_GET(CERT_SignedDataTemplate), &der_cert_item); |
ASSERT_EQ(SECSuccess, rv); |
// The CERTSignedData.signatureAlgorithm is decoded, but SignatureVerifier |
// wants the DER encoded form, so re-encode it again. |
- SECItem* signature_algorithm = SEC_ASN1EncodeItem( |
- arena.get(), |
- NULL, |
- &sd.signatureAlgorithm, |
- SEC_ASN1_GET(SECOID_AlgorithmIDTemplate)); |
+ SECItem* signature_algorithm = |
+ SEC_ASN1EncodeItem(arena.get(), |
+ NULL, |
+ &sd.signatureAlgorithm, |
+ SEC_ASN1_GET(SECOID_AlgorithmIDTemplate)); |
ASSERT_TRUE(signature_algorithm); |
crypto::SignatureVerifier verifier; |
@@ -68,8 +66,7 @@ void VerifyCertificateSignature(const std::string& der_cert, |
der_spki.size()); |
ASSERT_TRUE(ok); |
- verifier.VerifyUpdate(sd.data.data, |
- sd.data.len); |
+ verifier.VerifyUpdate(sd.data.data, sd.data.len); |
ok = verifier.VerifyFinal(); |
EXPECT_TRUE(ok); |
@@ -82,25 +79,19 @@ void VerifyDomainBoundCert(const std::string& domain, |
static const char oid_string[] = "1.3.6.1.4.1.11129.2.1.6"; |
// Create object neccessary for extension lookup call. |
- SECItem extension_object = { |
- siAsciiString, |
- (unsigned char*)domain.data(), |
- static_cast<unsigned int>(domain.size()) |
- }; |
+ SECItem extension_object = {siAsciiString, (unsigned char*)domain.data(), |
+ static_cast<unsigned int>(domain.size())}; |
// IA5Encode and arena allocate SECItem. |
PLArenaPool* arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); |
- SECItem* expected = SEC_ASN1EncodeItem(arena, |
- NULL, |
- &extension_object, |
- SEC_ASN1_GET(SEC_IA5StringTemplate)); |
+ SECItem* expected = SEC_ASN1EncodeItem( |
+ arena, NULL, &extension_object, SEC_ASN1_GET(SEC_IA5StringTemplate)); |
ASSERT_NE(static_cast<SECItem*>(NULL), expected); |
// Create OID SECItem. |
- SECItem ob_cert_oid = { siDEROID, NULL, 0 }; |
- SECStatus ok = SEC_StringToOID(arena, &ob_cert_oid, |
- oid_string, 0); |
+ SECItem ob_cert_oid = {siDEROID, NULL, 0}; |
+ SECStatus ok = SEC_StringToOID(arena, &ob_cert_oid, oid_string, 0); |
ASSERT_EQ(SECSuccess, ok); |
@@ -113,8 +104,8 @@ void VerifyDomainBoundCert(const std::string& domain, |
// can use CERT_FindCertExtension. We also check the subject and validity |
// times using NSS since X509Certificate will fail with EC certs on OSX 10.5 |
// (http://crbug.com/101231). |
- CERTCertificate* nss_cert = CreateNSSCertHandleFromBytes( |
- der_cert.data(), der_cert.size()); |
+ CERTCertificate* nss_cert = |
+ CreateNSSCertHandleFromBytes(der_cert.data(), der_cert.size()); |
char* common_name = CERT_GetCommonName(&nss_cert->subject); |
ASSERT_TRUE(common_name); |
@@ -123,10 +114,8 @@ void VerifyDomainBoundCert(const std::string& domain, |
EXPECT_EQ(SECSuccess, CERT_CertTimesValid(nss_cert)); |
// Lookup Origin Bound Cert extension in generated cert. |
- SECItem actual = { siBuffer, NULL, 0 }; |
- ok = CERT_FindCertExtension(nss_cert, |
- ob_cert_oid_tag, |
- &actual); |
+ SECItem actual = {siBuffer, NULL, 0}; |
+ ok = CERT_FindCertExtension(nss_cert, ob_cert_oid_tag, &actual); |
CERT_DestroyCertificate(nss_cert); |
ASSERT_EQ(SECSuccess, ok); |
@@ -151,7 +140,8 @@ TEST(X509UtilNSSTest, CreateKeyAndDomainBoundCertEC) { |
scoped_ptr<crypto::ECPrivateKey> private_key; |
std::string der_cert; |
ASSERT_TRUE(x509_util::CreateKeyAndDomainBoundCertEC( |
- domain, 1, |
+ domain, |
+ 1, |
now, |
now + base::TimeDelta::FromDays(1), |
&private_key, |