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

Side by Side Diff: net/cert/x509_certificate.cc

Issue 627573002: Enable passing cast channel certificate authority keys. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code review changes. Created 6 years, 2 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 unified diff | Download patch
« net/cert/x509_certificate.h ('K') | « net/cert/x509_certificate.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/cert/x509_certificate.h" 5 #include "net/cert/x509_certificate.h"
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <map> 10 #include <map>
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 encoded_chain.push_back(pem_data); 702 encoded_chain.push_back(pem_data);
703 for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i) { 703 for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i) {
704 if (!GetPEMEncoded(intermediate_ca_certs_[i], &pem_data)) 704 if (!GetPEMEncoded(intermediate_ca_certs_[i], &pem_data))
705 return false; 705 return false;
706 encoded_chain.push_back(pem_data); 706 encoded_chain.push_back(pem_data);
707 } 707 }
708 pem_encoded->swap(encoded_chain); 708 pem_encoded->swap(encoded_chain);
709 return true; 709 return true;
710 } 710 }
711 711
712 const SHA256HashValue X509Certificate::fingerprint256() const {
713 net::X509Certificate::OSCertHandles intermediate;
714 return CalculateChainFingerprint256(os_cert_handle(), intermediate);
715 }
716
712 // static 717 // static
713 SHA256HashValue X509Certificate::CalculateCAFingerprint256( 718 SHA256HashValue X509Certificate::CalculateCAFingerprint256(
714 const OSCertHandles& intermediates) { 719 const OSCertHandles& intermediates) {
715 SHA256HashValue sha256; 720 SHA256HashValue sha256;
716 memset(sha256.data, 0, sizeof(sha256.data)); 721 memset(sha256.data, 0, sizeof(sha256.data));
717 722
718 scoped_ptr<crypto::SecureHash> hash( 723 scoped_ptr<crypto::SecureHash> hash(
719 crypto::SecureHash::Create(crypto::SecureHash::SHA256)); 724 crypto::SecureHash::Create(crypto::SecureHash::SHA256));
720 725
721 for (size_t i = 0; i < intermediates.size(); ++i) { 726 for (size_t i = 0; i < intermediates.size(); ++i) {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 RemoveFromCache(cert_handle_); 767 RemoveFromCache(cert_handle_);
763 FreeOSCertHandle(cert_handle_); 768 FreeOSCertHandle(cert_handle_);
764 } 769 }
765 for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i) { 770 for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i) {
766 RemoveFromCache(intermediate_ca_certs_[i]); 771 RemoveFromCache(intermediate_ca_certs_[i]);
767 FreeOSCertHandle(intermediate_ca_certs_[i]); 772 FreeOSCertHandle(intermediate_ca_certs_[i]);
768 } 773 }
769 } 774 }
770 775
771 } // namespace net 776 } // namespace net
OLDNEW
« net/cert/x509_certificate.h ('K') | « net/cert/x509_certificate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698