Remove the fingerprint and ca_fingerprint from X509Certificate

chrome/browser/safe_browsing/download_protection_service.cc

 // Copyright (c) 2012 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/safe_browsing/download_protection_service.h"
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/rand_util.h"
 #include "base/sequenced_task_runner_helpers.h"
+#include "base/sha1.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 1630 matching lines @@
     for (size_t j = 0; j < ou_tokens.size(); ++j) {
       paths_to_check.insert(cn_token + o_tokens[i] + ou_tokens[j]);
       paths_to_check.insert(o_tokens[i] + ou_tokens[j]);
     }
   }
   for (size_t i = 0; i < ou_tokens.size(); ++i) {
     paths_to_check.insert(cn_token + ou_tokens[i]);
     paths_to_check.insert(ou_tokens[i]);
   }
 
-  std::string issuer_fp = base::HexEncode(issuer.fingerprint().data,
-                                          sizeof(issuer.fingerprint().data));
+  std::string issuer_der;
+  net::X509Certificate::GetDEREncoded(issuer.os_cert_handle(), &issuer_der);

[Nathan Parker, 2016/06/16 18:32:23]

Can you verify this produces the same string as before, with the test cert?

[Ryan Sleevi, 2016/06/16 21:16:45]

Confirmed.

+  std::string hashed = base::SHA1HashString(issuer_der);
+  std::string issuer_fp = base::HexEncode(hashed.data(), hashed.size());
   for (std::set<std::string>::iterator it = paths_to_check.begin();
        it != paths_to_check.end(); ++it) {
     whitelist_strings->push_back("cert/" + issuer_fp + *it);
   }
 }
 
 // static
 GURL DownloadProtectionService::GetDownloadRequestUrl() {
   GURL url(kDownloadRequestUrl);
   std::string api_key = google_apis::GetAPIKey();
   if (!api_key.empty())
     url = url.Resolve("?key=" + net::EscapeQueryParamValue(api_key, true));
 
   return url;
 }
 
 }  // namespace safe_browsing