Index: chrome/browser/ui/webui/net_internals/net_internals_ui.cc |
=================================================================== |
--- chrome/browser/ui/webui/net_internals/net_internals_ui.cc (revision 150170) |
+++ chrome/browser/ui/webui/net_internals/net_internals_ui.cc (working copy) |
@@ -1084,18 +1084,32 @@ |
connection_tester_->RunAllTests(url); |
} |
-void SPKIHashesToString(const net::FingerprintVector& hashes, |
+void SPKIHashesToString(const net::HashValueVector& hashes, |
std::string* string) { |
- for (net::FingerprintVector::const_iterator |
+ for (net::HashValueVector::const_iterator |
i = hashes.begin(); i != hashes.end(); ++i) { |
- base::StringPiece hash_str(reinterpret_cast<const char*>(i->data), |
- arraysize(i->data)); |
+ std::string label; |
+ switch (i->tag) { |
+ case net::HASH_VALUE_SHA1: |
+ label = "sha1/"; |
+ break; |
+ case net::HASH_VALUE_SHA256: |
+ label = "sha256/"; |
+ break; |
+ default: |
+ NOTREACHED(); |
+ LOG(WARNING) << "Invalid fingerprint of unknown type " << i->tag; |
+ label = "unknown/"; |
+ } |
+ |
+ base::StringPiece hash_str(reinterpret_cast<const char*>(i->data()), |
+ i->size()); |
std::string encoded; |
base::Base64Encode(hash_str, &encoded); |
if (i != hashes.begin()) |
*string += ","; |
- *string += "sha1/" + encoded; |
+ *string += label + encoded; |
} |
} |
@@ -1171,7 +1185,7 @@ |
i = type_and_b64s.begin(); i != type_and_b64s.end(); ++i) { |
std::string type_and_b64; |
RemoveChars(*i, " \t\r\n", &type_and_b64); |
- net::SHA1Fingerprint hash; |
+ net::HashValue hash; |
if (!net::TransportSecurityState::ParsePin(type_and_b64, &hash)) |
continue; |