Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(197)

Unified Diff: net/cert/multi_log_ct_verifier.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/cert/multi_log_ct_verifier.cc
diff --git a/net/cert/multi_log_ct_verifier.cc b/net/cert/multi_log_ct_verifier.cc
index 5094da026d03f38bf8cee4c54c7cea5ce2f32580..8763782b3f6c190ed129f9646b1c27f15734cedc 100644
--- a/net/cert/multi_log_ct_verifier.cc
+++ b/net/cert/multi_log_ct_verifier.cc
@@ -53,9 +53,11 @@ void LogNumSCTsToUMA(const ct::CTVerifyResult& result) {
} // namespace
-MultiLogCTVerifier::MultiLogCTVerifier() { }
+MultiLogCTVerifier::MultiLogCTVerifier() {
+}
-MultiLogCTVerifier::~MultiLogCTVerifier() { }
+MultiLogCTVerifier::~MultiLogCTVerifier() {
+}
void MultiLogCTVerifier::AddLog(scoped_ptr<CTLogVerifier> log_verifier) {
DCHECK(log_verifier);
@@ -66,12 +68,11 @@ void MultiLogCTVerifier::AddLog(scoped_ptr<CTLogVerifier> log_verifier) {
logs_[log->key_id()] = log;
}
-int MultiLogCTVerifier::Verify(
- X509Certificate* cert,
- const std::string& stapled_ocsp_response,
- const std::string& sct_list_from_tls_extension,
- ct::CTVerifyResult* result,
- const BoundNetLog& net_log) {
+int MultiLogCTVerifier::Verify(X509Certificate* cert,
+ const std::string& stapled_ocsp_response,
+ const std::string& sct_list_from_tls_extension,
+ ct::CTVerifyResult* result,
+ const BoundNetLog& net_log) {
DCHECK(cert);
DCHECK(result);
@@ -83,62 +84,60 @@ int MultiLogCTVerifier::Verify(
std::string embedded_scts;
if (!cert->GetIntermediateCertificates().empty() &&
- ct::ExtractEmbeddedSCTList(
- cert->os_cert_handle(),
- &embedded_scts)) {
+ ct::ExtractEmbeddedSCTList(cert->os_cert_handle(), &embedded_scts)) {
ct::LogEntry precert_entry;
has_verified_scts =
- ct::GetPrecertLogEntry(
- cert->os_cert_handle(),
- cert->GetIntermediateCertificates().front(),
- &precert_entry) &&
- VerifySCTs(
- embedded_scts,
- precert_entry,
- ct::SignedCertificateTimestamp::SCT_EMBEDDED,
- result);
+ ct::GetPrecertLogEntry(cert->os_cert_handle(),
+ cert->GetIntermediateCertificates().front(),
+ &precert_entry) &&
+ VerifySCTs(embedded_scts,
+ precert_entry,
+ ct::SignedCertificateTimestamp::SCT_EMBEDDED,
+ result);
}
std::string sct_list_from_ocsp;
if (!stapled_ocsp_response.empty() &&
!cert->GetIntermediateCertificates().empty()) {
ct::ExtractSCTListFromOCSPResponse(
- cert->GetIntermediateCertificates().front(), cert->serial_number(),
- stapled_ocsp_response, &sct_list_from_ocsp);
+ cert->GetIntermediateCertificates().front(),
+ cert->serial_number(),
+ stapled_ocsp_response,
+ &sct_list_from_ocsp);
}
// Log to Net Log, after extracting SCTs but before possibly failing on
// X.509 entry creation.
NetLog::ParametersCallback net_log_callback =
base::Bind(&NetLogRawSignedCertificateTimestampCallback,
- &embedded_scts, &sct_list_from_ocsp, &sct_list_from_tls_extension);
+ &embedded_scts,
+ &sct_list_from_ocsp,
+ &sct_list_from_tls_extension);
- net_log.AddEvent(
- NetLog::TYPE_SIGNED_CERTIFICATE_TIMESTAMPS_RECEIVED,
- net_log_callback);
+ net_log.AddEvent(NetLog::TYPE_SIGNED_CERTIFICATE_TIMESTAMPS_RECEIVED,
+ net_log_callback);
ct::LogEntry x509_entry;
if (ct::GetX509LogEntry(cert->os_cert_handle(), &x509_entry)) {
- has_verified_scts |= VerifySCTs(
- sct_list_from_ocsp,
- x509_entry,
- ct::SignedCertificateTimestamp::SCT_FROM_OCSP_RESPONSE,
- result);
-
- has_verified_scts |= VerifySCTs(
- sct_list_from_tls_extension,
- x509_entry,
- ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION,
- result);
+ has_verified_scts |=
+ VerifySCTs(sct_list_from_ocsp,
+ x509_entry,
+ ct::SignedCertificateTimestamp::SCT_FROM_OCSP_RESPONSE,
+ result);
+
+ has_verified_scts |=
+ VerifySCTs(sct_list_from_tls_extension,
+ x509_entry,
+ ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION,
+ result);
}
NetLog::ParametersCallback net_log_checked_callback =
base::Bind(&NetLogSignedCertificateTimestampCallback, result);
- net_log.AddEvent(
- NetLog::TYPE_SIGNED_CERTIFICATE_TIMESTAMPS_CHECKED,
- net_log_checked_callback);
+ net_log.AddEvent(NetLog::TYPE_SIGNED_CERTIFICATE_TIMESTAMPS_CHECKED,
+ net_log_checked_callback);
LogNumSCTsToUMA(*result);
@@ -164,7 +163,8 @@ bool MultiLogCTVerifier::VerifySCTs(
bool verified = false;
for (std::vector<base::StringPiece>::const_iterator it = sct_list.begin();
- it != sct_list.end(); ++it) {
+ it != sct_list.end();
+ ++it) {
base::StringPiece encoded_sct(*it);
LogSCTOriginToUMA(origin);
@@ -186,7 +186,6 @@ bool MultiLogCTVerifier::VerifySingleSCT(
scoped_refptr<ct::SignedCertificateTimestamp> sct,
const ct::LogEntry& expected_entry,
ct::CTVerifyResult* result) {
-
// Assume this SCT is untrusted until proven otherwise.
IDToLogMap::iterator it = logs_.find(sct->log_id);
if (it == logs_.end()) {
@@ -218,4 +217,4 @@ bool MultiLogCTVerifier::VerifySingleSCT(
return true;
}
-} // namespace net
+} // namespace net

Powered by Google App Engine
This is Rietveld 408576698