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

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 7401003: Don't use X509Certificate in SSLConfig. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged Created 9 years, 5 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/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 895266891977b8481f3c0bf0d55bea2426defc39..b040359dfa90f54a233504a937d0be14d92f5ed2 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -1013,7 +1013,9 @@ int HttpStreamFactoryImpl::Job::HandleCertificateError(int error) {
// RestartIgnoringLastError(). And the user will be asked interactively
// before RestartIgnoringLastError() is ever called.
SSLConfig::CertAndStatus bad_cert;
- bad_cert.cert = ssl_info_.cert;
+ if (ssl_info_.cert == NULL ||
+ !ssl_info_.cert->GetDEREncoded(&bad_cert.cert_der))
+ return error;
wtc 2011/07/19 21:57:01 Are you sure ssl_info_.cert may be NULL here? I d
Sergey Ulanov 2011/07/19 23:50:21 Normally ssl_info.cert should not be set to NULL,
bad_cert.cert_status = ssl_info_.cert_status;
ssl_config_.allowed_bad_certs.push_back(bad_cert);

Powered by Google App Engine
This is Rietveld 408576698