diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 17:48:54 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 17:48:54 +0000 |
| commit | cc50fdf70bc11e259c319d06086111d2177047be (patch) | |
| tree | ae9e85b77d0c635ca4eedf43b3690826138c3823 /net/socket/ssl_client_socket_nss.cc | |
| parent | 258ed9ed8f5c6de199d935647e9c0ffc7790797c (diff) | |
| download | chromium_src-cc50fdf70bc11e259c319d06086111d2177047be.zip chromium_src-cc50fdf70bc11e259c319d06086111d2177047be.tar.gz chromium_src-cc50fdf70bc11e259c319d06086111d2177047be.tar.bz2 | |
Remove SSL 2.0 support.
R=agl
BUG=53659
TEST=none
Review URL: http://codereview.chromium.org/4091005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_nss.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index b9c6dff..fff4352 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -685,19 +685,14 @@ int SSLClientSocketNSS::InitializeSSLOptions() { return ERR_UNEXPECTED; } - rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_SSL2, ssl_config_.ssl2_enabled); + rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_SSL2, PR_FALSE); if (rv != SECSuccess) { LogFailedNSSFunction(net_log_, "SSL_OptionSet", "SSL_ENABLE_SSL2"); return ERR_UNEXPECTED; } - // SNI is enabled automatically if TLS is enabled -- as long as - // SSL_V2_COMPATIBLE_HELLO isn't. - // So don't do V2 compatible hellos unless we're really using SSL2, - // to avoid errors like - // "common name `mail.google.com' != requested host name `gmail.com'" - rv = SSL_OptionSet(nss_fd_, SSL_V2_COMPATIBLE_HELLO, - ssl_config_.ssl2_enabled); + // Don't do V2 compatible hellos because they don't support TLS extensions. + rv = SSL_OptionSet(nss_fd_, SSL_V2_COMPATIBLE_HELLO, PR_FALSE); if (rv != SECSuccess) { LogFailedNSSFunction(net_log_, "SSL_OptionSet", "SSL_V2_COMPATIBLE_HELLO"); return ERR_UNEXPECTED; |