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

Unified Diff: net/base/cert_verify_proc_nss.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: net/base/cert_verify_proc_nss.cc
===================================================================
--- net/base/cert_verify_proc_nss.cc (revision 141792)
+++ net/base/cert_verify_proc_nss.cc (working copy)
@@ -4,6 +4,9 @@
#include "net/base/cert_verify_proc_nss.h"
+#include <string>
+#include <vector>
+
#include <cert.h>
#include <nss.h>
#include <prerror.h>
@@ -597,9 +600,10 @@
return false;
}
-SHA1Fingerprint CertPublicKeyHash(CERTCertificate* cert) {
- SHA1Fingerprint hash;
- SECStatus rv = HASH_HashBuf(HASH_AlgSHA1, hash.data,
+Fingerprint CertPublicKeyHash(CERTCertificate* cert) {
+ Fingerprint hash;
+ hash.tag = FINGERPRINT_SHA1;
+ SECStatus rv = HASH_HashBuf(HASH_AlgSHA1, hash.data(),
cert->derPublicKey.data, cert->derPublicKey.len);
DCHECK_EQ(rv, SECSuccess);
return hash;
@@ -607,7 +611,7 @@
void AppendPublicKeyHashes(CERTCertList* cert_list,
CERTCertificate* root_cert,
- std::vector<SHA1Fingerprint>* hashes) {
+ std::vector<Fingerprint>* hashes) {
for (CERTCertListNode* node = CERT_LIST_HEAD(cert_list);
!CERT_LIST_END(node, cert_list);
node = CERT_LIST_NEXT(node)) {

Powered by Google App Engine
This is Rietveld 408576698