diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-17 00:48:48 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-17 00:48:48 +0000 |
| commit | 9ec84b6f69e5e3933fc4bb3e75ecf2771500a361 (patch) | |
| tree | 465ac8593ac5698de6f2c11c1f2835657ea73639 /net/base/x509_certificate_mac.cc | |
| parent | ed7ccca742cd4b87f8aac33f35d6a309e6de7111 (diff) | |
| download | chromium_src-9ec84b6f69e5e3933fc4bb3e75ecf2771500a361.zip chromium_src-9ec84b6f69e5e3933fc4bb3e75ecf2771500a361.tar.gz chromium_src-9ec84b6f69e5e3933fc4bb3e75ecf2771500a361.tar.bz2 | |
Minor clean-up tasks that were TODO(snej)
Rename Principal->CertPrincipal, Policy->CertPolicy, both of which are merely syntatic fluff.
Rename Fingerprint->SHA1Fingerprint, which is more important since those using the fingerprint, such as the unit tests, were truly hardcoded against SHA-1 fingerprints, and if the fingerprint ever changed, wouldn't cause errors until run time.
R=wtc
BUG=None
TEST=Compilers stay green
Review URL: http://codereview.chromium.org/2815048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/x509_certificate_mac.cc')
| -rw-r--r-- | net/base/x509_certificate_mac.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/base/x509_certificate_mac.cc b/net/base/x509_certificate_mac.cc index 08da804..ed46adc 100644 --- a/net/base/x509_certificate_mac.cc +++ b/net/base/x509_certificate_mac.cc @@ -691,9 +691,9 @@ void X509Certificate::FreeOSCertHandle(OSCertHandle cert_handle) { } // static -X509Certificate::Fingerprint X509Certificate::CalculateFingerprint( +SHA1Fingerprint X509Certificate::CalculateFingerprint( OSCertHandle cert) { - Fingerprint sha1; + SHA1Fingerprint sha1; memset(sha1.data, 0, sizeof(sha1.data)); CSSM_DATA cert_data; @@ -791,7 +791,7 @@ OSStatus X509Certificate::CreateSSLClientPolicy(SecPolicyRef* out_policy) { // static bool X509Certificate::GetSSLClientCertificates ( const std::string& server_domain, - const std::vector<Principal>& valid_issuers, + const std::vector<CertPrincipal>& valid_issuers, std::vector<scoped_refptr<X509Certificate> >* certs) { scoped_cftyperef<SecIdentityRef> preferred_identity; if (!server_domain.empty()) { @@ -826,12 +826,11 @@ bool X509Certificate::GetSSLClientCertificates ( scoped_refptr<X509Certificate> cert( CreateFromHandle(cert_handle, SOURCE_LONE_CERT_IMPORT, OSCertHandles())); - // cert_handle is adoped by cert, so I don't need to release it myself. if (cert->HasExpired() || !cert->SupportsSSLClientAuth()) continue; // Skip duplicates (a cert may be in multiple keychains). - X509Certificate::Fingerprint fingerprint = cert->fingerprint(); + const SHA1Fingerprint& fingerprint = cert->fingerprint(); unsigned i; for (i = 0; i < certs->size(); ++i) { if ((*certs)[i]->fingerprint().Equals(fingerprint)) |