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

Unified Diff: net/base/x509_certificate.cc

Issue 174102: Enable SSLClientSocketTest unit tests on Mac OS X by implementing our own cer... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 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/x509_certificate.cc
===================================================================
--- net/base/x509_certificate.cc (revision 24466)
+++ net/base/x509_certificate.cc (working copy)
@@ -169,7 +169,11 @@
}
X509Certificate::X509Certificate(OSCertHandle cert_handle, Source source)
- : cert_handle_(cert_handle), source_(source) {
+ : cert_handle_(cert_handle),
+#if defined(OS_MACOSX)
+ intermediate_ca_certs_(NULL),
+#endif
+ source_(source) {
Initialize();
}
@@ -182,6 +186,9 @@
valid_start_(start_date),
valid_expiry_(expiration_date),
cert_handle_(NULL),
+#if defined(OS_MACOSX)
+ intermediate_ca_certs_(NULL),
+#endif
source_(SOURCE_UNUSED) {
memset(fingerprint_.data, 0, sizeof(fingerprint_.data));
}
@@ -191,6 +198,10 @@
X509Certificate::Cache::GetInstance()->Remove(this);
if (cert_handle_)
FreeOSCertHandle(cert_handle_);
+#if defined(OS_MACOSX)
+ if (intermediate_ca_certs_)
+ CFRelease(intermediate_ca_certs_);
+#endif
}
bool X509Certificate::HasExpired() const {

Powered by Google App Engine
This is Rietveld 408576698