Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2896)

Unified Diff: chrome/browser/net/transport_security_persister.cc

Issue 10545166: Support SHA-256 in public key pins for HTTPS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/net/transport_security_persister.cc
===================================================================
--- chrome/browser/net/transport_security_persister.cc (revision 141792)
+++ chrome/browser/net/transport_security_persister.cc (working copy)
@@ -21,6 +21,7 @@
using content::BrowserThread;
using net::Fingerprint;
+using net::FingerprintTag;
using net::FingerprintVector;
using net::TransportSecurityState;
@@ -31,11 +32,24 @@
for (FingerprintVector::const_iterator i = hashes.begin();
i != hashes.end(); ++i) {
- std::string hash_str(reinterpret_cast<const char*>(i->data),
- sizeof(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 with unknown type "
+ << i->tag;
+ continue;
+ }
+
+ std::string hash_str(reinterpret_cast<const char*>(i->data()), i->size());
std::string b64;
base::Base64Encode(hash_str, &b64);
- pins->Append(new StringValue("sha1/" + b64));
+ pins->Append(new StringValue(label + b64));
}
return pins;

Powered by Google App Engine
This is Rietveld 408576698