Skip to content

GitLab

T
tangled
Commit 0424ed6e authored by dcheng's avatar dcheng Committed by Commit bot
Browse files
Options

Remove implicit conversions from scoped_refptr to T* in net/cert/ 

This patch was generated by running the rewrite_scoped_refptr clang tool
on a Linux build.

BUG=110610

Review URL: https://codereview.chromium.org/503163002

Cr-Commit-Position: refs/heads/master@{#291801}
parent 3f63848c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 86 deletions
net/cert/cert_verify_proc_unittest.cc
View file @ 0424ed6e
This diff is collapsed.
net/cert/crl_set_storage.cc
View file @ 0424ed6e
...@@ -350,7 +350,7 @@ bool CRLSetStorage::Parse(base::StringPiece data, ...@@ -350,7 +350,7 @@ bool CRLSetStorage::Parse(base::StringPiece data,
crl_set->crls_index_by_issuer_[back_pair->first] = crl_index; crl_set->crls_index_by_issuer_[back_pair->first] = crl_index;
} }
if (!CopyBlockedSPKIsFromHeader(crl_set, header_dict.get())) if (!CopyBlockedSPKIsFromHeader(crl_set.get(), header_dict.get()))
return false; return false;
*out_crl_set = crl_set; *out_crl_set = crl_set;
...@@ -398,7 +398,7 @@ bool CRLSetStorage::ApplyDelta(const CRLSet* in_crl_set, ...@@ -398,7 +398,7 @@ bool CRLSetStorage::ApplyDelta(const CRLSet* in_crl_set,
crl_set->sequence_ = static_cast<uint32>(sequence); crl_set->sequence_ = static_cast<uint32>(sequence);
crl_set->not_after_ = static_cast<uint64>(not_after); crl_set->not_after_ = static_cast<uint64>(not_after);
if (!CopyBlockedSPKIsFromHeader(crl_set, header_dict.get())) if (!CopyBlockedSPKIsFromHeader(crl_set.get(), header_dict.get()))
return false; return false;
std::vector<uint8> crl_changes; std::vector<uint8> crl_changes;
......
net/cert/crl_set_unittest.cc
View file @ 0424ed6e
...@@ -223,10 +223,10 @@ TEST(CRLSetTest, NoOpDeltaUpdate) { ...@@ -223,10 +223,10 @@ TEST(CRLSetTest, NoOpDeltaUpdate) {
scoped_refptr<net::CRLSet> delta_set; scoped_refptr<net::CRLSet> delta_set;
base::StringPiece delta(reinterpret_cast<const char*>(kNoopDeltaCRL), base::StringPiece delta(reinterpret_cast<const char*>(kNoopDeltaCRL),
sizeof(kNoopDeltaCRL)); sizeof(kNoopDeltaCRL));
EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set, delta, &delta_set)); EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set.get(), delta, &delta_set));
ASSERT_TRUE(delta_set.get() != NULL); ASSERT_TRUE(delta_set.get() != NULL);
std::string out = net::CRLSetStorage::Serialize(delta_set); std::string out = net::CRLSetStorage::Serialize(delta_set.get());
EXPECT_EQ(s.as_string(), out); EXPECT_EQ(s.as_string(), out);
} }
...@@ -240,7 +240,7 @@ TEST(CRLSetTest, AddCRLDelta) { ...@@ -240,7 +240,7 @@ TEST(CRLSetTest, AddCRLDelta) {
scoped_refptr<net::CRLSet> delta_set; scoped_refptr<net::CRLSet> delta_set;
base::StringPiece delta(reinterpret_cast<const char*>(kAddCRLDelta), base::StringPiece delta(reinterpret_cast<const char*>(kAddCRLDelta),
sizeof(kAddCRLDelta)); sizeof(kAddCRLDelta));
EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set, delta, &delta_set)); EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set.get(), delta, &delta_set));
ASSERT_TRUE(delta_set.get() != NULL); ASSERT_TRUE(delta_set.get() != NULL);
const net::CRLSet::CRLList& crls = delta_set->crls(); const net::CRLSet::CRLList& crls = delta_set->crls();
...@@ -262,13 +262,14 @@ TEST(CRLSetTest, AddRemoveCRLDelta) { ...@@ -262,13 +262,14 @@ TEST(CRLSetTest, AddRemoveCRLDelta) {
scoped_refptr<net::CRLSet> delta_set; scoped_refptr<net::CRLSet> delta_set;
base::StringPiece delta(reinterpret_cast<const char*>(kAddCRLDelta), base::StringPiece delta(reinterpret_cast<const char*>(kAddCRLDelta),
sizeof(kAddCRLDelta)); sizeof(kAddCRLDelta));
EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set, delta, &delta_set)); EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set.get(), delta, &delta_set));
ASSERT_TRUE(delta_set.get() != NULL); ASSERT_TRUE(delta_set.get() != NULL);
scoped_refptr<net::CRLSet> delta2_set; scoped_refptr<net::CRLSet> delta2_set;
base::StringPiece delta2(reinterpret_cast<const char*>(kRemoveCRLDelta), base::StringPiece delta2(reinterpret_cast<const char*>(kRemoveCRLDelta),
sizeof(kRemoveCRLDelta)); sizeof(kRemoveCRLDelta));
EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(delta_set, delta2, &delta2_set)); EXPECT_TRUE(
net::CRLSetStorage::ApplyDelta(delta_set.get(), delta2, &delta2_set));
ASSERT_TRUE(delta2_set.get() != NULL); ASSERT_TRUE(delta2_set.get() != NULL);
const net::CRLSet::CRLList& crls = delta2_set->crls(); const net::CRLSet::CRLList& crls = delta2_set->crls();
...@@ -287,7 +288,7 @@ TEST(CRLSetTest, UpdateSerialsDelta) { ...@@ -287,7 +288,7 @@ TEST(CRLSetTest, UpdateSerialsDelta) {
scoped_refptr<net::CRLSet> delta_set; scoped_refptr<net::CRLSet> delta_set;
base::StringPiece delta(reinterpret_cast<const char*>(kUpdateSerialsDelta), base::StringPiece delta(reinterpret_cast<const char*>(kUpdateSerialsDelta),
sizeof(kUpdateSerialsDelta)); sizeof(kUpdateSerialsDelta));
EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set, delta, &delta_set)); EXPECT_TRUE(net::CRLSetStorage::ApplyDelta(set.get(), delta, &delta_set));
ASSERT_TRUE(delta_set.get() != NULL); ASSERT_TRUE(delta_set.get() != NULL);
const net::CRLSet::CRLList& crls = delta_set->crls(); const net::CRLSet::CRLList& crls = delta_set->crls();
......
net/cert/ct_log_verifier_unittest.cc
View file @ 0424ed6e
...@@ -36,7 +36,7 @@ TEST_F(CTLogVerifierTest, VerifiesCertSCT) { ...@@ -36,7 +36,7 @@ TEST_F(CTLogVerifierTest, VerifiesCertSCT) {
scoped_refptr<ct::SignedCertificateTimestamp> cert_sct; scoped_refptr<ct::SignedCertificateTimestamp> cert_sct;
ct::GetX509CertSCT(&cert_sct); ct::GetX509CertSCT(&cert_sct);
EXPECT_TRUE(log_->Verify(cert_entry, *cert_sct)); EXPECT_TRUE(log_->Verify(cert_entry, *cert_sct.get()));
} }
TEST_F(CTLogVerifierTest, VerifiesPrecertSCT) { TEST_F(CTLogVerifierTest, VerifiesPrecertSCT) {
...@@ -46,7 +46,7 @@ TEST_F(CTLogVerifierTest, VerifiesPrecertSCT) { ...@@ -46,7 +46,7 @@ TEST_F(CTLogVerifierTest, VerifiesPrecertSCT) {
scoped_refptr<ct::SignedCertificateTimestamp> precert_sct; scoped_refptr<ct::SignedCertificateTimestamp> precert_sct;
ct::GetPrecertSCT(&precert_sct); ct::GetPrecertSCT(&precert_sct);
EXPECT_TRUE(log_->Verify(precert_entry, *precert_sct)); EXPECT_TRUE(log_->Verify(precert_entry, *precert_sct.get()));
} }
TEST_F(CTLogVerifierTest, FailsInvalidTimestamp) { TEST_F(CTLogVerifierTest, FailsInvalidTimestamp) {
...@@ -59,7 +59,7 @@ TEST_F(CTLogVerifierTest, FailsInvalidTimestamp) { ...@@ -59,7 +59,7 @@ TEST_F(CTLogVerifierTest, FailsInvalidTimestamp) {
// Mangle the timestamp, so that it should fail signature validation. // Mangle the timestamp, so that it should fail signature validation.
cert_sct->timestamp = base::Time::Now(); cert_sct->timestamp = base::Time::Now();
EXPECT_FALSE(log_->Verify(cert_entry, *cert_sct)); EXPECT_FALSE(log_->Verify(cert_entry, *cert_sct.get()));
} }
TEST_F(CTLogVerifierTest, FailsInvalidLogID) { TEST_F(CTLogVerifierTest, FailsInvalidLogID) {
...@@ -73,7 +73,7 @@ TEST_F(CTLogVerifierTest, FailsInvalidLogID) { ...@@ -73,7 +73,7 @@ TEST_F(CTLogVerifierTest, FailsInvalidLogID) {
// attempting signature validation. // attempting signature validation.
cert_sct->log_id.assign(cert_sct->log_id.size(), '\0'); cert_sct->log_id.assign(cert_sct->log_id.size(), '\0');
EXPECT_FALSE(log_->Verify(cert_entry, *cert_sct)); EXPECT_FALSE(log_->Verify(cert_entry, *cert_sct.get()));
} }
TEST_F(CTLogVerifierTest, SetsValidSTH) { TEST_F(CTLogVerifierTest, SetsValidSTH) {
......
net/cert/ct_objects_extractor_unittest.cc
View file @ 0424ed6e
...@@ -107,7 +107,7 @@ TEST_F(CTObjectsExtractorTest, ExtractedSCTVerifies) { ...@@ -107,7 +107,7 @@ TEST_F(CTObjectsExtractorTest, ExtractedSCTVerifies) {
precert_chain_[1]->os_cert_handle(), precert_chain_[1]->os_cert_handle(),
&entry)); &entry));
EXPECT_TRUE(log_->Verify(entry, *sct)); EXPECT_TRUE(log_->Verify(entry, *sct.get()));
} }
// Test that an externally-provided SCT verifies over the LogEntry // Test that an externally-provided SCT verifies over the LogEntry
...@@ -120,7 +120,7 @@ TEST_F(CTObjectsExtractorTest, ComplementarySCTVerifies) { ...@@ -120,7 +120,7 @@ TEST_F(CTObjectsExtractorTest, ComplementarySCTVerifies) {
LogEntry entry; LogEntry entry;
ASSERT_TRUE(GetX509LogEntry(test_cert_->os_cert_handle(), &entry)); ASSERT_TRUE(GetX509LogEntry(test_cert_->os_cert_handle(), &entry));
EXPECT_TRUE(log_->Verify(entry, *sct)); EXPECT_TRUE(log_->Verify(entry, *sct.get()));
} }
// Test that the extractor can parse OCSP responses. // Test that the extractor can parse OCSP responses.
......
net/cert/multi_log_ct_verifier.cc
View file @ 0424ed6e
...@@ -213,7 +213,7 @@ bool MultiLogCTVerifier::VerifySingleSCT( ...@@ -213,7 +213,7 @@ bool MultiLogCTVerifier::VerifySingleSCT(
sct->log_description = it->second->description(); sct->log_description = it->second->description();
if (!it->second->Verify(expected_entry, *sct)) { if (!it->second->Verify(expected_entry, *sct.get())) {
DVLOG(1) << "Unable to verify SCT signature."; DVLOG(1) << "Unable to verify SCT signature.";
result->invalid_scts.push_back(sct); result->invalid_scts.push_back(sct);
LogSCTStatusToUMA(ct::SCT_STATUS_INVALID); LogSCTStatusToUMA(ct::SCT_STATUS_INVALID);
......
net/cert/multi_log_ct_verifier_unittest.cc
View file @ 0424ed6e
...@@ -48,13 +48,13 @@ class MultiLogCTVerifierTest : public ::testing::Test { ...@@ -48,13 +48,13 @@ class MultiLogCTVerifierTest : public ::testing::Test {
chain_ = X509Certificate::CreateFromBytes( chain_ = X509Certificate::CreateFromBytes(
der_test_cert.data(), der_test_cert.data(),
der_test_cert.length()); der_test_cert.length());
ASSERT_TRUE(chain_); ASSERT_TRUE(chain_.get());
embedded_sct_chain_ = embedded_sct_chain_ =
CreateCertificateChainFromFile(GetTestCertsDirectory(), CreateCertificateChainFromFile(GetTestCertsDirectory(),
"ct-test-embedded-cert.pem", "ct-test-embedded-cert.pem",
X509Certificate::FORMAT_AUTO); X509Certificate::FORMAT_AUTO);
ASSERT_TRUE(embedded_sct_chain_); ASSERT_TRUE(embedded_sct_chain_.get());
} }
bool CheckForSingleVerifiedSCTInResult(const ct::CTVerifyResult& result) { bool CheckForSingleVerifiedSCTInResult(const ct::CTVerifyResult& result) {
...@@ -130,9 +130,11 @@ class MultiLogCTVerifierTest : public ::testing::Test { ...@@ -130,9 +130,11 @@ class MultiLogCTVerifierTest : public ::testing::Test {
bool VerifySinglePrecertificateChain(scoped_refptr<X509Certificate> chain, bool VerifySinglePrecertificateChain(scoped_refptr<X509Certificate> chain,
const BoundNetLog& bound_net_log, const BoundNetLog& bound_net_log,
ct::CTVerifyResult* result) { ct::CTVerifyResult* result) {
return verifier_->Verify( return verifier_->Verify(chain.get(),
chain, std::string(), std::string(), result, bound_net_log) == std::string(),
OK; std::string(),
result,
bound_net_log) == OK;
} }
bool VerifySinglePrecertificateChain(scoped_refptr<X509Certificate> chain) { bool VerifySinglePrecertificateChain(scoped_refptr<X509Certificate> chain) {
...@@ -141,9 +143,11 @@ class MultiLogCTVerifierTest : public ::testing::Test { ...@@ -141,9 +143,11 @@ class MultiLogCTVerifierTest : public ::testing::Test {
BoundNetLog bound_net_log = BoundNetLog bound_net_log =
BoundNetLog::Make(&net_log, NetLog::SOURCE_CONNECT_JOB); BoundNetLog::Make(&net_log, NetLog::SOURCE_CONNECT_JOB);
return verifier_->Verify( return verifier_->Verify(chain.get(),
chain, std::string(), std::string(), &result, bound_net_log) == std::string(),
OK; std::string(),
&result,
bound_net_log) == OK;
} }
bool CheckPrecertificateVerification(scoped_refptr<X509Certificate> chain) { bool CheckPrecertificateVerification(scoped_refptr<X509Certificate> chain) {
...@@ -199,7 +203,7 @@ TEST_F(MultiLogCTVerifierTest, VerifiesEmbeddedSCTWithPreCA) { ...@@ -199,7 +203,7 @@ TEST_F(MultiLogCTVerifierTest, VerifiesEmbeddedSCTWithPreCA) {
CreateCertificateChainFromFile(GetTestCertsDirectory(), CreateCertificateChainFromFile(GetTestCertsDirectory(),
"ct-test-embedded-with-preca-chain.pem", "ct-test-embedded-with-preca-chain.pem",
X509Certificate::FORMAT_AUTO)); X509Certificate::FORMAT_AUTO));
ASSERT_TRUE(chain); ASSERT_TRUE(chain.get());
ASSERT_TRUE(CheckPrecertificateVerification(chain)); ASSERT_TRUE(CheckPrecertificateVerification(chain));
} }
...@@ -208,7 +212,7 @@ TEST_F(MultiLogCTVerifierTest, VerifiesEmbeddedSCTWithIntermediate) { ...@@ -208,7 +212,7 @@ TEST_F(MultiLogCTVerifierTest, VerifiesEmbeddedSCTWithIntermediate) {
GetTestCertsDirectory(), GetTestCertsDirectory(),
"ct-test-embedded-with-intermediate-chain.pem", "ct-test-embedded-with-intermediate-chain.pem",
X509Certificate::FORMAT_AUTO)); X509Certificate::FORMAT_AUTO));
ASSERT_TRUE(chain); ASSERT_TRUE(chain.get());
ASSERT_TRUE(CheckPrecertificateVerification(chain)); ASSERT_TRUE(CheckPrecertificateVerification(chain));
} }
...@@ -218,7 +222,7 @@ TEST_F(MultiLogCTVerifierTest, ...@@ -218,7 +222,7 @@ TEST_F(MultiLogCTVerifierTest,
GetTestCertsDirectory(), GetTestCertsDirectory(),
"ct-test-embedded-with-intermediate-preca-chain.pem", "ct-test-embedded-with-intermediate-preca-chain.pem",
X509Certificate::FORMAT_AUTO)); X509Certificate::FORMAT_AUTO));
ASSERT_TRUE(chain); ASSERT_TRUE(chain.get());
ASSERT_TRUE(CheckPrecertificateVerification(chain)); ASSERT_TRUE(CheckPrecertificateVerification(chain));
} }
...@@ -231,8 +235,8 @@ TEST_F(MultiLogCTVerifierTest, ...@@ -231,8 +235,8 @@ TEST_F(MultiLogCTVerifierTest,
ct::CTVerifyResult result; ct::CTVerifyResult result;
EXPECT_EQ(OK, EXPECT_EQ(OK,
verifier_->Verify(chain_, std::string(), sct_list, &result, verifier_->Verify(
BoundNetLog())); chain_.get(), std::string(), sct_list, &result, BoundNetLog()));
ASSERT_TRUE(CheckForSingleVerifiedSCTInResult(result)); ASSERT_TRUE(CheckForSingleVerifiedSCTInResult(result));
ASSERT_TRUE(CheckForSCTOrigin( ASSERT_TRUE(CheckForSCTOrigin(
result, ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION)); result, ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION));
...@@ -245,7 +249,7 @@ TEST_F(MultiLogCTVerifierTest, ...@@ -245,7 +249,7 @@ TEST_F(MultiLogCTVerifierTest,
EXPECT_NE(OK, EXPECT_NE(OK,
verifier_->Verify( verifier_->Verify(
chain_, std::string(), sct_list, &result, BoundNetLog())); chain_.get(), std::string(), sct_list, &result, BoundNetLog()));
EXPECT_EQ(1U, result.unknown_logs_scts.size()); EXPECT_EQ(1U, result.unknown_logs_scts.size());
EXPECT_EQ("", result.unknown_logs_scts[0]->log_description); EXPECT_EQ("", result.unknown_logs_scts[0]->log_description);
} }
...@@ -266,8 +270,8 @@ TEST_F(MultiLogCTVerifierTest, CountsInvalidSCTsInStatusHistogram) { ...@@ -266,8 +270,8 @@ TEST_F(MultiLogCTVerifierTest, CountsInvalidSCTsInStatusHistogram) {
"Net.CertificateTransparency.SCTStatus", ct::SCT_STATUS_LOG_UNKNOWN); "Net.CertificateTransparency.SCTStatus", ct::SCT_STATUS_LOG_UNKNOWN);
EXPECT_NE(OK, EXPECT_NE(OK,
verifier_->Verify(chain_, std::string(), sct_list, &result, verifier_->Verify(
BoundNetLog())); chain_.get(), std::string(), sct_list, &result, BoundNetLog()));
ASSERT_EQ(num_valid_scts, NumValidSCTsInStatusHistogram()); ASSERT_EQ(num_valid_scts, NumValidSCTsInStatusHistogram());
ASSERT_EQ(num_invalid_scts + 1, ASSERT_EQ(num_invalid_scts + 1,
......
net/cert/multi_threaded_cert_verifier.cc
View file @ 0424ed6e
...@@ -93,9 +93,9 @@ base::Value* CertVerifyResultCallback(const CertVerifyResult& verify_result, ...@@ -93,9 +93,9 @@ base::Value* CertVerifyResultCallback(const CertVerifyResult& verify_result,
results->SetBoolean("common_name_fallback_used", results->SetBoolean("common_name_fallback_used",
verify_result.common_name_fallback_used); verify_result.common_name_fallback_used);
results->SetInteger("cert_status", verify_result.cert_status); results->SetInteger("cert_status", verify_result.cert_status);
results->Set( results->Set("verified_cert",
"verified_cert", NetLogX509CertificateCallback(verify_result.verified_cert.get(),
NetLogX509CertificateCallback(verify_result.verified_cert, log_level)); log_level));
base::ListValue* hashes = new base::ListValue(); base::ListValue* hashes = new base::ListValue();
for (std::vector<HashValue>::const_iterator it = for (std::vector<HashValue>::const_iterator it =
......
net/cert/multi_threaded_cert_verifier_unittest.cc
View file @ 0424ed6e
...@@ -79,7 +79,7 @@ TEST_F(MultiThreadedCertVerifierTest, CacheHit) { ...@@ -79,7 +79,7 @@ TEST_F(MultiThreadedCertVerifierTest, CacheHit) {
base::FilePath certs_dir = GetTestCertsDirectory(); base::FilePath certs_dir = GetTestCertsDirectory();
scoped_refptr<X509Certificate> test_cert( scoped_refptr<X509Certificate> test_cert(
ImportCertFromFile(certs_dir, "ok_cert.pem")); ImportCertFromFile(certs_dir, "ok_cert.pem"));
ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
int error; int error;
CertVerifyResult verify_result; CertVerifyResult verify_result;
...@@ -129,15 +129,15 @@ TEST_F(MultiThreadedCertVerifierTest, DifferentCACerts) { ...@@ -129,15 +129,15 @@ TEST_F(MultiThreadedCertVerifierTest, DifferentCACerts) {
scoped_refptr<X509Certificate> server_cert = scoped_refptr<X509Certificate> server_cert =
ImportCertFromFile(certs_dir, "salesforce_com_test.pem"); ImportCertFromFile(certs_dir, "salesforce_com_test.pem");
ASSERT_NE(static_cast<X509Certificate*>(NULL), server_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), server_cert.get());
scoped_refptr<X509Certificate> intermediate_cert1 = scoped_refptr<X509Certificate> intermediate_cert1 =
ImportCertFromFile(certs_dir, "verisign_intermediate_ca_2011.pem"); ImportCertFromFile(certs_dir, "verisign_intermediate_ca_2011.pem");
ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert1); ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert1.get());
scoped_refptr<X509Certificate> intermediate_cert2 = scoped_refptr<X509Certificate> intermediate_cert2 =
ImportCertFromFile(certs_dir, "verisign_intermediate_ca_2016.pem"); ImportCertFromFile(certs_dir, "verisign_intermediate_ca_2016.pem");
ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert2); ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert2.get());
X509Certificate::OSCertHandles intermediates; X509Certificate::OSCertHandles intermediates;
intermediates.push_back(intermediate_cert1->os_cert_handle()); intermediates.push_back(intermediate_cert1->os_cert_handle());
...@@ -196,7 +196,7 @@ TEST_F(MultiThreadedCertVerifierTest, InflightJoin) { ...@@ -196,7 +196,7 @@ TEST_F(MultiThreadedCertVerifierTest, InflightJoin) {
base::FilePath certs_dir = GetTestCertsDirectory(); base::FilePath certs_dir = GetTestCertsDirectory();
scoped_refptr<X509Certificate> test_cert( scoped_refptr<X509Certificate> test_cert(
ImportCertFromFile(certs_dir, "ok_cert.pem")); ImportCertFromFile(certs_dir, "ok_cert.pem"));
ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
int error; int error;
CertVerifyResult verify_result; CertVerifyResult verify_result;
...@@ -240,7 +240,7 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequest) { ...@@ -240,7 +240,7 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequest) {
base::FilePath certs_dir = GetTestCertsDirectory(); base::FilePath certs_dir = GetTestCertsDirectory();
scoped_refptr<X509Certificate> test_cert( scoped_refptr<X509Certificate> test_cert(
ImportCertFromFile(certs_dir, "ok_cert.pem")); ImportCertFromFile(certs_dir, "ok_cert.pem"));
ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
int error; int error;
CertVerifyResult verify_result; CertVerifyResult verify_result;
...@@ -289,7 +289,7 @@ TEST_F(MultiThreadedCertVerifierTest, MAYBE_CancelRequestThenQuit) { ...@@ -289,7 +289,7 @@ TEST_F(MultiThreadedCertVerifierTest, MAYBE_CancelRequestThenQuit) {
base::FilePath certs_dir = GetTestCertsDirectory(); base::FilePath certs_dir = GetTestCertsDirectory();
scoped_refptr<X509Certificate> test_cert( scoped_refptr<X509Certificate> test_cert(
ImportCertFromFile(certs_dir, "ok_cert.pem")); ImportCertFromFile(certs_dir, "ok_cert.pem"));
ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
int error; int error;
CertVerifyResult verify_result; CertVerifyResult verify_result;
......
net/cert/nss_cert_database.cc
View file @ 0424ed6e
...@@ -422,7 +422,7 @@ void NSSCertDatabase::ListCertsImpl(crypto::ScopedPK11Slot slot, ...@@ -422,7 +422,7 @@ void NSSCertDatabase::ListCertsImpl(crypto::ScopedPK11Slot slot,
} }
scoped_refptr<base::TaskRunner> NSSCertDatabase::GetSlowTaskRunner() const { scoped_refptr<base::TaskRunner> NSSCertDatabase::GetSlowTaskRunner() const {
if (slow_task_runner_for_test_) if (slow_task_runner_for_test_.get())
return slow_task_runner_for_test_; return slow_task_runner_for_test_;
return base::WorkerPool::GetTaskRunner(true /*task is slow*/); return base::WorkerPool::GetTaskRunner(true /*task is slow*/);
} }
...@@ -432,7 +432,7 @@ void NSSCertDatabase::NotifyCertRemovalAndCallBack( ...@@ -432,7 +432,7 @@ void NSSCertDatabase::NotifyCertRemovalAndCallBack(
const DeleteCertCallback& callback, const DeleteCertCallback& callback,
bool success) { bool success) {
if (success) if (success)
NotifyObserversOfCertRemoved(cert); NotifyObserversOfCertRemoved(cert.get());
callback.Run(success); callback.Run(success);
} }
......
net/cert/x509_certificate_unittest.cc
View file @ 0424ed6e
...@@ -91,7 +91,7 @@ const double kGoogleParseValidTo = 1324252799; ...@@ -91,7 +91,7 @@ const double kGoogleParseValidTo = 1324252799;
void CheckGoogleCert(const scoped_refptr<X509Certificate>& google_cert, void CheckGoogleCert(const scoped_refptr<X509Certificate>& google_cert,
uint8* expected_fingerprint, uint8* expected_fingerprint,
double valid_from, double valid_to) { double valid_from, double valid_to) {
ASSERT_NE(static_cast<X509Certificate*>(NULL), google_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), google_cert.get());
const CertPrincipal& subject = google_cert->subject(); const CertPrincipal& subject = google_cert->subject();
EXPECT_EQ("www.google.com", subject.common_name); EXPECT_EQ("www.google.com", subject.common_name);
...@@ -146,7 +146,7 @@ TEST(X509CertificateTest, WebkitCertParsing) { ...@@ -146,7 +146,7 @@ TEST(X509CertificateTest, WebkitCertParsing) {
scoped_refptr<X509Certificate> webkit_cert(X509Certificate::CreateFromBytes( scoped_refptr<X509Certificate> webkit_cert(X509Certificate::CreateFromBytes(
reinterpret_cast<const char*>(webkit_der), sizeof(webkit_der))); reinterpret_cast<const char*>(webkit_der), sizeof(webkit_der)));
ASSERT_NE(static_cast<X509Certificate*>(NULL), webkit_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), webkit_cert.get());
const CertPrincipal& subject = webkit_cert->subject(); const CertPrincipal& subject = webkit_cert->subject();
EXPECT_EQ("Cupertino", subject.locality_name); EXPECT_EQ("Cupertino", subject.locality_name);
...@@ -202,7 +202,7 @@ TEST(X509CertificateTest, ThawteCertParsing) { ...@@ -202,7 +202,7 @@ TEST(X509CertificateTest, ThawteCertParsing) {
scoped_refptr<X509Certificate> thawte_cert(X509Certificate::CreateFromBytes( scoped_refptr<X509Certificate> thawte_cert(X509Certificate::CreateFromBytes(
reinterpret_cast<const char*>(thawte_der), sizeof(thawte_der))); reinterpret_cast<const char*>(thawte_der), sizeof(thawte_der)));
ASSERT_NE(static_cast<X509Certificate*>(NULL), thawte_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), thawte_cert.get());
const CertPrincipal& subject = thawte_cert->subject(); const CertPrincipal& subject = thawte_cert->subject();
EXPECT_EQ("www.thawte.com", subject.common_name); EXPECT_EQ("www.thawte.com", subject.common_name);
...@@ -254,7 +254,7 @@ TEST(X509CertificateTest, MultivalueRDN) { ...@@ -254,7 +254,7 @@ TEST(X509CertificateTest, MultivalueRDN) {
scoped_refptr<X509Certificate> multivalue_rdn_cert = scoped_refptr<X509Certificate> multivalue_rdn_cert =
ImportCertFromFile(certs_dir, "multivalue_rdn.pem"); ImportCertFromFile(certs_dir, "multivalue_rdn.pem");
ASSERT_NE(static_cast<X509Certificate*>(NULL), multivalue_rdn_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), multivalue_rdn_cert.get());
const CertPrincipal& subject = multivalue_rdn_cert->subject(); const CertPrincipal& subject = multivalue_rdn_cert->subject();
EXPECT_EQ("Multivalue RDN Test", subject.common_name); EXPECT_EQ("Multivalue RDN Test", subject.common_name);
...@@ -278,7 +278,7 @@ TEST(X509CertificateTest, UnescapedSpecialCharacters) { ...@@ -278,7 +278,7 @@ TEST(X509CertificateTest, UnescapedSpecialCharacters) {
scoped_refptr<X509Certificate> unescaped_cert = scoped_refptr<X509Certificate> unescaped_cert =
ImportCertFromFile(certs_dir, "unescaped.pem"); ImportCertFromFile(certs_dir, "unescaped.pem");
ASSERT_NE(static_cast<X509Certificate*>(NULL), unescaped_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), unescaped_cert.get());
const CertPrincipal& subject = unescaped_cert->subject(); const CertPrincipal& subject = unescaped_cert->subject();
EXPECT_EQ("127.0.0.1", subject.common_name); EXPECT_EQ("127.0.0.1", subject.common_name);
...@@ -328,15 +328,15 @@ TEST(X509CertificateTest, CAFingerprints) { ...@@ -328,15 +328,15 @@ TEST(X509CertificateTest, CAFingerprints) {
scoped_refptr<X509Certificate> server_cert = scoped_refptr<X509Certificate> server_cert =
ImportCertFromFile(certs_dir, "salesforce_com_test.pem"); ImportCertFromFile(certs_dir, "salesforce_com_test.pem");
ASSERT_NE(static_cast<X509Certificate*>(NULL), server_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), server_cert.get());
scoped_refptr<X509Certificate> intermediate_cert1 = scoped_refptr<X509Certificate> intermediate_cert1 =
ImportCertFromFile(certs_dir, "verisign_intermediate_ca_2011.pem"); ImportCertFromFile(certs_dir, "verisign_intermediate_ca_2011.pem");
ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert1); ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert1.get());
scoped_refptr<X509Certificate> intermediate_cert2 = scoped_refptr<X509Certificate> intermediate_cert2 =
ImportCertFromFile(certs_dir, "verisign_intermediate_ca_2016.pem"); ImportCertFromFile(certs_dir, "verisign_intermediate_ca_2016.pem");
ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert2); ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert2.get());
X509Certificate::OSCertHandles intermediates; X509Certificate::OSCertHandles intermediates;
intermediates.push_back(intermediate_cert1->os_cert_handle()); intermediates.push_back(intermediate_cert1->os_cert_handle());
...@@ -456,7 +456,7 @@ TEST(X509CertificateTest, ParseSubjectAltNames) { ...@@ -456,7 +456,7 @@ TEST(X509CertificateTest, ParseSubjectAltNames) {
scoped_refptr<X509Certificate> san_cert = scoped_refptr<X509Certificate> san_cert =
ImportCertFromFile(certs_dir, "subjectAltName_sanity_check.pem"); ImportCertFromFile(certs_dir, "subjectAltName_sanity_check.pem");
ASSERT_NE(static_cast<X509Certificate*>(NULL), san_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), san_cert.get());
std::vector<std::string> dns_names; std::vector<std::string> dns_names;
std::vector<std::string> ip_addresses; std::vector<std::string> ip_addresses;
...@@ -493,7 +493,7 @@ TEST(X509CertificateTest, ExtractSPKIFromDERCert) { ...@@ -493,7 +493,7 @@ TEST(X509CertificateTest, ExtractSPKIFromDERCert) {
base::FilePath certs_dir = GetTestCertsDirectory(); base::FilePath certs_dir = GetTestCertsDirectory();
scoped_refptr<X509Certificate> cert = scoped_refptr<X509Certificate> cert =
ImportCertFromFile(certs_dir, "nist.der"); ImportCertFromFile(certs_dir, "nist.der");
ASSERT_NE(static_cast<X509Certificate*>(NULL), cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), cert.get());
std::string derBytes; std::string derBytes;
EXPECT_TRUE(X509Certificate::GetDEREncoded(cert->os_cert_handle(), EXPECT_TRUE(X509Certificate::GetDEREncoded(cert->os_cert_handle(),
...@@ -513,7 +513,7 @@ TEST(X509CertificateTest, ExtractCRLURLsFromDERCert) { ...@@ -513,7 +513,7 @@ TEST(X509CertificateTest, ExtractCRLURLsFromDERCert) {
base::FilePath certs_dir = GetTestCertsDirectory(); base::FilePath certs_dir = GetTestCertsDirectory();
scoped_refptr<X509Certificate> cert = scoped_refptr<X509Certificate> cert =
ImportCertFromFile(certs_dir, "nist.der"); ImportCertFromFile(certs_dir, "nist.der");
ASSERT_NE(static_cast<X509Certificate*>(NULL), cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), cert.get());
std::string derBytes; std::string derBytes;
EXPECT_TRUE(X509Certificate::GetDEREncoded(cert->os_cert_handle(), EXPECT_TRUE(X509Certificate::GetDEREncoded(cert->os_cert_handle(),
...@@ -603,7 +603,7 @@ TEST(X509CertificateTest, Pickle) { ...@@ -603,7 +603,7 @@ TEST(X509CertificateTest, Pickle) {
scoped_refptr<X509Certificate> cert_from_pickle = scoped_refptr<X509Certificate> cert_from_pickle =
X509Certificate::CreateFromPickle( X509Certificate::CreateFromPickle(
pickle, &iter, X509Certificate::PICKLETYPE_CERTIFICATE_CHAIN_V3); pickle, &iter, X509Certificate::PICKLETYPE_CERTIFICATE_CHAIN_V3);
ASSERT_NE(static_cast<X509Certificate*>(NULL), cert_from_pickle); ASSERT_NE(static_cast<X509Certificate*>(NULL), cert_from_pickle.get());
EXPECT_TRUE(X509Certificate::IsSameOSCert( EXPECT_TRUE(X509Certificate::IsSameOSCert(
cert->os_cert_handle(), cert_from_pickle->os_cert_handle())); cert->os_cert_handle(), cert_from_pickle->os_cert_handle()));
const X509Certificate::OSCertHandles& cert_intermediates = const X509Certificate::OSCertHandles& cert_intermediates =
...@@ -766,7 +766,7 @@ TEST(X509CertificateTest, IsIssuedByEncoded) { ...@@ -766,7 +766,7 @@ TEST(X509CertificateTest, IsIssuedByEncoded) {
// Test a client certificate from MIT. // Test a client certificate from MIT.
scoped_refptr<X509Certificate> mit_davidben_cert( scoped_refptr<X509Certificate> mit_davidben_cert(
ImportCertFromFile(certs_dir, "mit.davidben.der")); ImportCertFromFile(certs_dir, "mit.davidben.der"));
ASSERT_NE(static_cast<X509Certificate*>(NULL), mit_davidben_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), mit_davidben_cert.get());
std::string mit_issuer(reinterpret_cast<const char*>(MITDN), std::string mit_issuer(reinterpret_cast<const char*>(MITDN),
sizeof(MITDN)); sizeof(MITDN));
...@@ -774,7 +774,7 @@ TEST(X509CertificateTest, IsIssuedByEncoded) { ...@@ -774,7 +774,7 @@ TEST(X509CertificateTest, IsIssuedByEncoded) {
// Test a certificate from Google, issued by Thawte // Test a certificate from Google, issued by Thawte
scoped_refptr<X509Certificate> google_cert( scoped_refptr<X509Certificate> google_cert(
ImportCertFromFile(certs_dir, "google.single.der")); ImportCertFromFile(certs_dir, "google.single.der"));
ASSERT_NE(static_cast<X509Certificate*>(NULL), google_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), google_cert.get());
std::string thawte_issuer(reinterpret_cast<const char*>(ThawteDN), std::string thawte_issuer(reinterpret_cast<const char*>(ThawteDN),
sizeof(ThawteDN)); sizeof(ThawteDN));
...@@ -876,7 +876,7 @@ TEST(X509CertificateTest, GetDefaultNickname) { ...@@ -876,7 +876,7 @@ TEST(X509CertificateTest, GetDefaultNickname) {
scoped_refptr<X509Certificate> test_cert( scoped_refptr<X509Certificate> test_cert(
ImportCertFromFile(certs_dir, "no_subject_common_name_cert.pem")); ImportCertFromFile(certs_dir, "no_subject_common_name_cert.pem"));
ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert); ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
std::string nickname = test_cert->GetDefaultNickname(USER_CERT); std::string nickname = test_cert->GetDefaultNickname(USER_CERT);
EXPECT_EQ("wtc@google.com's COMODO Client Authentication and " EXPECT_EQ("wtc@google.com's COMODO Client Authentication and "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment