diff options
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_unittest.cc | 2 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_win.cc | 6 |
2 files changed, 6 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) diff --git a/net/socket/ssl_client_socket_win.cc b/net/socket/ssl_client_socket_win.cc index 1d014ab..7fd1f7c 100644 --- a/net/socket/ssl_client_socket_win.cc +++ b/net/socket/ssl_client_socket_win.cc @@ -825,6 +825,12 @@ int SSLClientSocketWin::DoHandshakeReadComplete(int result) { &out_flags, &expiry); + if (isc_status_ == SEC_E_INVALID_TOKEN) { + // Peer sent us an SSL record type that's invalid during SSL handshake. + // TODO(wtc): move this to MapSecurityError after sufficient testing. + return ERR_SSL_PROTOCOL_ERROR; + } + if (send_buffer_.cbBuffer != 0 && (isc_status_ == SEC_E_OK || isc_status_ == SEC_I_CONTINUE_NEEDED || |