Certificate Transparency: Switch to using a generated CT log list

net/cert/multi_log_ct_verifier.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/cert/multi_log_ct_verifier.h"
 
+#include <vector>

[Ryan Sleevi, 2014/06/19 00:34:08]

Do you actually still need vector? Seems like no.

[Eran Messeri, 2014/06/19 08:28:37]

std::vector is actually used in a different method, I did not include it
properly beforehand.

+
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/metrics/histogram.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/cert/ct_log_verifier.h"
 #include "net/cert/ct_objects_extractor.h"
 #include "net/cert/ct_serialization.h"
 #include "net/cert/ct_signed_certificate_timestamp_log_param.h"
 #include "net/cert/ct_verify_result.h"
@@ skipping 42 matching lines @@
 
 void MultiLogCTVerifier::AddLog(scoped_ptr<CTLogVerifier> log_verifier) {
   DCHECK(log_verifier);
   if (!log_verifier)
     return;
 
   linked_ptr<CTLogVerifier> log(log_verifier.release());
   logs_[log->key_id()] = log;
 }
 
+void MultiLogCTVerifier::AddLogs(
+    ScopedVector<CTLogVerifier> log_verifiers) {
+  for (ScopedVector<CTLogVerifier>::iterator it =
+       log_verifiers.begin(); it != log_verifiers.end(); ++it) {
+    linked_ptr<CTLogVerifier> log(*it);
+    VLOG(1) << "Adding CT log: " << log->description();
+    logs_[log->key_id()] = log;
+  }
+
+  log_verifiers.weak_clear();

[Ryan Sleevi, 2014/06/19 00:34:08]

nit: add comment
// Ownership of the pointers in |log_verifiers| is transferred to |logs_|

[Eran Messeri, 2014/06/19 08:28:37]

Done.

+}
+
 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);
 
   result->verified_scts.clear();
@@ skipping 133 matching lines @@
     LogSCTStatusToUMA(ct::SCT_STATUS_INVALID);
     return false;
   }
 
   LogSCTStatusToUMA(ct::SCT_STATUS_OK);
   result->verified_scts.push_back(sct);
   return true;
 }
 
 } // namespace net