diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 22:47:11 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 22:47:11 +0000 |
commit | d100e44f64d4abb2cc244cb61bb736c602146767 (patch) | |
tree | bfdd81d5424b2335e8543044dd726b0d30666663 /net/base/x509_certificate.cc | |
parent | 5d8054efc1e1f26ea806e46869df5e0a84e41a4c (diff) | |
download | chromium_src-d100e44f64d4abb2cc244cb61bb736c602146767.zip chromium_src-d100e44f64d4abb2cc244cb61bb736c602146767.tar.gz chromium_src-d100e44f64d4abb2cc244cb61bb736c602146767.tar.bz2 |
More net/ method ordering.
BUG=68682
TEST=compiles
Review URL: http://codereview.chromium.org/6339012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72710 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/x509_certificate.cc')
-rw-r--r-- | net/base/x509_certificate.cc | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/net/base/x509_certificate.cc b/net/base/x509_certificate.cc index b705790..6469537 100644 --- a/net/base/x509_certificate.cc +++ b/net/base/x509_certificate.cc @@ -121,6 +121,19 @@ bool X509Certificate::LessThan::operator()(X509Certificate* lhs, return fingerprint_functor(lhs->fingerprint_, rhs->fingerprint_); } +X509Certificate::X509Certificate(const std::string& subject, + const std::string& issuer, + base::Time start_date, + base::Time expiration_date) + : subject_(subject), + issuer_(issuer), + valid_start_(start_date), + valid_expiry_(expiration_date), + cert_handle_(NULL), + source_(SOURCE_UNUSED) { + memset(fingerprint_.data, 0, sizeof(fingerprint_.data)); +} + // static X509Certificate* X509Certificate::CreateFromHandle( OSCertHandle cert_handle, @@ -283,40 +296,6 @@ CertificateList X509Certificate::CreateCertificateListFromBytes( return results; } -X509Certificate::X509Certificate(OSCertHandle cert_handle, - Source source, - const OSCertHandles& intermediates) - : cert_handle_(DupOSCertHandle(cert_handle)), - source_(source) { - // Copy/retain the intermediate cert handles. - for (size_t i = 0; i < intermediates.size(); ++i) - intermediate_ca_certs_.push_back(DupOSCertHandle(intermediates[i])); - // Platform-specific initialization. - Initialize(); -} - -X509Certificate::X509Certificate(const std::string& subject, - const std::string& issuer, - base::Time start_date, - base::Time expiration_date) - : subject_(subject), - issuer_(issuer), - valid_start_(start_date), - valid_expiry_(expiration_date), - cert_handle_(NULL), - source_(SOURCE_UNUSED) { - memset(fingerprint_.data, 0, sizeof(fingerprint_.data)); -} - -X509Certificate::~X509Certificate() { - // We might not be in the cache, but it is safe to remove ourselves anyway. - g_x509_certificate_cache.Get().Remove(this); - if (cert_handle_) - FreeOSCertHandle(cert_handle_); - for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i) - FreeOSCertHandle(intermediate_ca_certs_[i]); -} - bool X509Certificate::HasExpired() const { return base::Time::Now() > valid_expiry(); } @@ -345,4 +324,25 @@ bool X509Certificate::HasIntermediateCertificates(const OSCertHandles& certs) { return true; } +X509Certificate::X509Certificate(OSCertHandle cert_handle, + Source source, + const OSCertHandles& intermediates) + : cert_handle_(DupOSCertHandle(cert_handle)), + source_(source) { + // Copy/retain the intermediate cert handles. + for (size_t i = 0; i < intermediates.size(); ++i) + intermediate_ca_certs_.push_back(DupOSCertHandle(intermediates[i])); + // Platform-specific initialization. + Initialize(); +} + +X509Certificate::~X509Certificate() { + // We might not be in the cache, but it is safe to remove ourselves anyway. + g_x509_certificate_cache.Get().Remove(this); + if (cert_handle_) + FreeOSCertHandle(cert_handle_); + for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i) + FreeOSCertHandle(intermediate_ca_certs_[i]); +} + } // namespace net |