summaryrefslogtreecommitdiffstats
path: root/net/socket/ssl_client_socket_unittest.cc
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-03 19:04:22 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-03 19:04:22 +0000
commitdaec85b78d9354c6f24186e367e5b34219f50cc4 (patch)
tree1f4871b8ecb07fb3426268c7bdadfdb0d74aeabf /net/socket/ssl_client_socket_unittest.cc
parent26b57dab5a70e40471876913604f570e96acd1a6 (diff)
downloadchromium_src-daec85b78d9354c6f24186e367e5b34219f50cc4.zip
chromium_src-daec85b78d9354c6f24186e367e5b34219f50cc4.tar.gz
chromium_src-daec85b78d9354c6f24186e367e5b34219f50cc4.tar.bz2
Enable the regression test for issue 42538 for Windows.
This requires mapping SEC_E_INVALID_TOKEN to ERR_SSL_PROTOCOL_ERROR. We were mapping SEC_E_INVALID_TOKEN to ERR_UNEXPECTED because previously I got SEC_E_INVALID_TOKEN when I called InitializeSecurityContext at the wrong time. If we call InitializeSecurityContext correctly, SEC_E_INVALID_TOKEN indicates an invalid SSL record. R=agl BUG=42538 TEST=the unit test SSLClientSocketTest.PrematureApplicationData should pass on Windows. Review URL: http://codereview.chromium.org/1718022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_unittest.cc')
-rw-r--r--net/socket/ssl_client_socket_unittest.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 7b297f8..5c036b3 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -426,7 +426,6 @@ TEST_F(SSLClientSocketTest, Read_Interrupted) {
EXPECT_GT(rv, 0);
}
-#if !defined(OS_WIN)
// Regression test for http://crbug.com/42538
TEST_F(SSLClientSocketTest, PrematureApplicationData) {
net::AddressList addr;
@@ -469,4 +468,3 @@ TEST_F(SSLClientSocketTest, PrematureApplicationData) {
rv = sock->Connect(&callback);
EXPECT_EQ(net::ERR_SSL_PROTOCOL_ERROR, rv);
}
-#endif // !defined(OS_WIN)