Chromium Code Reviews| Index: net/socket/ssl_client_socket_win.cc |
| =================================================================== |
| --- net/socket/ssl_client_socket_win.cc (revision 67360) |
| +++ net/socket/ssl_client_socket_win.cc (working copy) |
| @@ -110,12 +110,11 @@ |
| //----------------------------------------------------------------------------- |
| // A bitmask consisting of these bit flags encodes which versions of the SSL |
| -// protocol (SSL 2.0, SSL 3.0, and TLS 1.0) are enabled. |
| +// protocol (SSL 3.0 and TLS 1.0) are enabled. |
| enum { |
| - SSL2 = 1 << 0, |
| - SSL3 = 1 << 1, |
| - TLS1 = 1 << 2, |
| - SSL_VERSION_MASKS = 1 << 3 // The number of SSL version bitmasks. |
| + SSL3 = 1 << 0, |
|
agl
2010/11/30 01:07:27
If you're feeling in a maintenance mood, then I th
wtc
2010/11/30 02:14:30
I will leave the code as is, because when we add T
|
| + TLS1 = 1 << 1, |
| + SSL_VERSION_MASKS = 1 << 2 // The number of SSL version bitmasks. |
| }; |
| // CredHandleClass simply gives a default constructor and a destructor to |
| @@ -210,8 +209,6 @@ |
| // The global system registry settings take precedence over the value of |
| // schannel_cred.grbitEnabledProtocols. |
| schannel_cred.grbitEnabledProtocols = 0; |
| - if (ssl_version_mask & SSL2) |
| - schannel_cred.grbitEnabledProtocols |= SP_PROT_SSL2; |
| if (ssl_version_mask & SSL3) |
| schannel_cred.grbitEnabledProtocols |= SP_PROT_SSL3; |
| if (ssl_version_mask & TLS1) |
| @@ -560,8 +557,6 @@ |
| int SSLClientSocketWin::InitializeSSLContext() { |
| int ssl_version_mask = 0; |
| - if (ssl_config_.ssl2_enabled) |
| - ssl_version_mask |= SSL2; |
| if (ssl_config_.ssl3_enabled) |
|
agl
2010/11/30 01:07:27
this section could turn into
if (!ssl_config_.ssl
|
| ssl_version_mask |= SSL3; |
| if (ssl_config_.tls1_enabled) |