summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-13 18:34:53 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-13 18:34:53 +0000
commit3c241bc37eb8a0de66369ff121dead884bf5e54d (patch)
treef7bcf7c534490e27260351d59dd00aabc2af6184 /net
parent976e69f3624a3106811c20c496269e1af91ab4e4 (diff)
downloadchromium_src-3c241bc37eb8a0de66369ff121dead884bf5e54d.zip
chromium_src-3c241bc37eb8a0de66369ff121dead884bf5e54d.tar.gz
chromium_src-3c241bc37eb8a0de66369ff121dead884bf5e54d.tar.bz2
Fix check for whether we need to consider client auth as part
of SSLClientSocket construction. Before we checked for if there was a client_cert present, but we really should check the boolean for SSLConfig.send_client_cert. BUG=none TEST=none Review URL: http://codereview.chromium.org/3155016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56056 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/socket/client_socket_factory.cc2
-rw-r--r--net/socket/ssl_client_socket_nss_factory.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc
index fbccfcb..5fb9970 100644
--- a/net/socket/client_socket_factory.cc
+++ b/net/socket/client_socket_factory.cc
@@ -33,7 +33,7 @@ SSLClientSocket* DefaultSSLClientSocketFactory(
// TODO(wtc): SSLClientSocketNSS can't do SSL client authentication using
// Mac OS X CDSA/CSSM yet (http://crbug.com/45369), so fall back on
// SSLClientSocketMac.
- if (ssl_config.client_cert)
+ if (ssl_config.send_client_cert)
return new SSLClientSocketMac(transport_socket, hostname, ssl_config);
return new SSLClientSocketNSS(transport_socket, hostname, ssl_config);
diff --git a/net/socket/ssl_client_socket_nss_factory.cc b/net/socket/ssl_client_socket_nss_factory.cc
index 99fb632..30de930 100644
--- a/net/socket/ssl_client_socket_nss_factory.cc
+++ b/net/socket/ssl_client_socket_nss_factory.cc
@@ -25,7 +25,7 @@ SSLClientSocket* SSLClientSocketNSSFactory(
// CryptoAPI yet (http://crbug.com/37560), so we fall back on
// SSLClientSocketWin.
#if defined(OS_WIN)
- if (ssl_config.client_cert)
+ if (ssl_config.send_client_cert)
return new SSLClientSocketWin(transport_socket, hostname, ssl_config);
#endif