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

Unified Diff: net/socket/ssl_client_socket_nss.cc

Issue 7741007: Always enable the STATE_LOAD_SSL_HOST_INFO state to verify the crash fix (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_nss.cc
===================================================================
--- net/socket/ssl_client_socket_nss.cc (revision 98154)
+++ net/socket/ssl_client_socket_nss.cc (working copy)
@@ -611,7 +611,7 @@
return rv;
}
- if (ssl_config_.cached_info_enabled && ssl_host_info_.get()) {
+ if (ssl_host_info_.get()) {
GotoState(STATE_LOAD_SSL_HOST_INFO);
} else {
GotoState(STATE_HANDSHAKE);
@@ -1362,7 +1362,7 @@
const SSLHostInfo::State& state(ssl_host_info_->state());
if (state.certs.empty())
- return false;
+ return true;
SECStatus rv;
const std::vector<std::string>& certs_in = state.certs;
@@ -1391,14 +1391,12 @@
}
int SSLClientSocketNSS::DoLoadSSLHostInfo() {
- int rv;
-
EnterFunction("");
- rv = ssl_host_info_->WaitForDataReady(&handshake_io_callback_);
+ int rv = ssl_host_info_->WaitForDataReady(&handshake_io_callback_);
GotoState(STATE_HANDSHAKE);
if (rv == OK) {
- if (!LoadSSLHostInfo())
+ if (ssl_config_.cached_info_enabled && !LoadSSLHostInfo())
LOG(WARNING) << "LoadSSLHostInfo failed: " << host_and_port_.ToString();
} else {
DCHECK_EQ(ERR_IO_PENDING, rv);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698