Support SHA-256 in public key pins for HTTPS.

chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Index: chrome/browser/ui/webui/net_internals/net_internals_ui.cc
===================================================================
--- chrome/browser/ui/webui/net_internals/net_internals_ui.cc	(revision 141792)
+++ chrome/browser/ui/webui/net_internals/net_internals_ui.cc	(working copy)
@@ -1073,14 +1073,28 @@
                         std::string* string) {
   for (net::FingerprintVector::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::FINGERPRINT_SHA1:
+        label = "sha1/";
+        break;
+      case net::FINGERPRINT_SHA256:
+        label = "sha256/";
+        break;
+      default:
+        LOG(WARNING) << "Skipping invalid fingerprint of unknown type "
+                     << i->tag;
+        continue;

[mmenke, 2012/06/14 15:47:29]

I'd suggest a NOTREACHED() and outputting a label of "???/" or similar in this
case, so it's more likely this will be noticed when/if new fingerprint types are
added..

[palmer, 2012/06/14 18:56:43]

Done.

+    }
+
+    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;
   }
 }
 
@@ -1156,7 +1170,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::Fingerprint hash;
       if (!net::TransportSecurityState::ParsePin(type_and_b64, &hash))
         continue;