Certificate Transparency: EV certificates whitelist support for ChromeOS

chrome/browser/net/packed_ct_ev_whitelist.cc

 // Copyright 2014 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 "chrome/browser/net/packed_ct_ev_whitelist.h"
 
 #include <string.h>
 
 #include <algorithm>
 
 #include "base/big_endian.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "chrome/browser/net/bit_stream_reader.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/ssl/ssl_config_service.h"
 
 namespace {
 const uint8_t kCertHashLengthBits = 64;  // 8 bytes
 const uint8_t kCertHashLength = kCertHashLengthBits / 8;
 const uint64_t kGolombMParameterBits = 47;  // 2^47
 
-void SetNewEVWhitelistInSSLConfigService(
+void SetEVWhitelistInSSLConfigService(
     const scoped_refptr<net::ct::EVCertsWhitelist>& new_whitelist) {
+  VLOG(1) << "Setting new EV Certs whitelist.";
   net::SSLConfigService::SetEVCertsWhitelist(new_whitelist);
 }
 
 int TruncatedHashesComparator(const void* v1, const void* v2) {
   const uint64_t& h1(*(static_cast<const uint64_t*>(v1)));
   const uint64_t& h2(*(static_cast<const uint64_t*>(v2)));
   if (h1 < h2)
     return -1;
   else if (h1 > h2)
     return 1;
   return 0;
 }
 }  // namespace
 
-void SetEVWhitelistFromFile(const base::FilePath& compressed_whitelist_file) {
-  VLOG(1) << "Setting EV whitelist from file: "
-          << compressed_whitelist_file.value();
-  std::string compressed_list;
-  if (!base::ReadFileToString(compressed_whitelist_file, &compressed_list)) {
-    VLOG(1) << "Failed reading from " << compressed_whitelist_file.value();
-    return;
-  }
-
-  scoped_refptr<net::ct::EVCertsWhitelist> new_whitelist(
-      new PackedEVCertsWhitelist(compressed_list));
+void SetEVCertsWhitelist(
+    scoped_refptr<net::ct::EVCertsWhitelist> new_whitelist) {
   if (!new_whitelist->IsValid()) {
-    VLOG(1) << "Failed uncompressing EV certs whitelist.";
+    VLOG(1) << "EV Certs whitelist is not valid, not setting.";
     return;
   }
 
   base::Closure assign_cb =
-      base::Bind(SetNewEVWhitelistInSSLConfigService, new_whitelist);
+      base::Bind(SetEVWhitelistInSSLConfigService, new_whitelist);
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE, assign_cb);
 }
 
 bool PackedEVCertsWhitelist::UncompressEVWhitelist(
     const std::string& compressed_whitelist,
     std::vector<uint64_t>* uncompressed_list) {
   internal::BitStreamReader reader(base::StringPiece(
       compressed_whitelist.data(), compressed_whitelist.size()));
   std::vector<uint64_t> result;
@@ skipping 61 matching lines @@
   return bsearch(&hash_to_lookup,
                  &whitelist_[0],
                  whitelist_.size(),
                  kCertHashLength,
                  TruncatedHashesComparator) != NULL;
 }
 
 bool PackedEVCertsWhitelist::IsValid() const {
   return is_whitelist_valid_;
 }