diff options
| author | wtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 17:28:23 +0000 |
|---|---|---|
| committer | wtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 17:28:23 +0000 |
| commit | c5949a3000ca3d6a7bd3a400ebd89206835a740a (patch) | |
| tree | 19e5d48d1eab7fdeff3a9f443eead80bd17edb00 /net/base/ssl_client_socket_unittest.cc | |
| parent | db8d02d65496004718bcd0416fcb35326eb08cd5 (diff) | |
| download | chromium_src-c5949a3000ca3d6a7bd3a400ebd89206835a740a.zip chromium_src-c5949a3000ca3d6a7bd3a400ebd89206835a740a.tar.gz chromium_src-c5949a3000ca3d6a7bd3a400ebd89206835a740a.tar.bz2 | |
Handle TLS-intolerant servers by retrying with TLS 1.0
turned off.
R=darin
BUG=3001
Review URL: http://codereview.chromium.org/5617
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/ssl_client_socket_unittest.cc')
| -rw-r--r-- | net/base/ssl_client_socket_unittest.cc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/net/base/ssl_client_socket_unittest.cc b/net/base/ssl_client_socket_unittest.cc index b29a762..2aba7ab 100644 --- a/net/base/ssl_client_socket_unittest.cc +++ b/net/base/ssl_client_socket_unittest.cc @@ -14,6 +14,9 @@ namespace { +const unsigned int kDefaultSSLVersionMask = net::SSLClientSocket::SSL3 | + net::SSLClientSocket::TLS1; + class SSLClientSocketTest : public testing::Test { }; @@ -31,7 +34,8 @@ TEST_F(SSLClientSocketTest, DISABLED_Connect) { int rv = resolver.Resolve(hostname, 443, &addr, NULL); EXPECT_EQ(net::OK, rv); - net::SSLClientSocket sock(new net::TCPClientSocket(addr), hostname); + net::SSLClientSocket sock(new net::TCPClientSocket(addr), hostname, + kDefaultSSLVersionMask); EXPECT_FALSE(sock.IsConnected()); @@ -62,7 +66,8 @@ TEST_F(SSLClientSocketTest, DISABLED_Read) { rv = callback.WaitForResult(); EXPECT_EQ(rv, net::OK); - net::SSLClientSocket sock(new net::TCPClientSocket(addr), hostname); + net::SSLClientSocket sock(new net::TCPClientSocket(addr), hostname, + kDefaultSSLVersionMask); rv = sock.Connect(&callback); if (rv != net::OK) { @@ -105,7 +110,8 @@ TEST_F(SSLClientSocketTest, DISABLED_Read_SmallChunks) { int rv = resolver.Resolve(hostname, 443, &addr, NULL); EXPECT_EQ(rv, net::OK); - net::SSLClientSocket sock(new net::TCPClientSocket(addr), hostname); + net::SSLClientSocket sock(new net::TCPClientSocket(addr), hostname, + kDefaultSSLVersionMask); rv = sock.Connect(&callback); if (rv != net::OK) { @@ -148,7 +154,8 @@ TEST_F(SSLClientSocketTest, DISABLED_Read_Interrupted) { int rv = resolver.Resolve(hostname, 443, &addr, NULL); EXPECT_EQ(rv, net::OK); - net::SSLClientSocket sock(new net::TCPClientSocket(addr), hostname); + net::SSLClientSocket sock(new net::TCPClientSocket(addr), hostname, + kDefaultSSLVersionMask); rv = sock.Connect(&callback); if (rv != net::OK) { |