diff options
| author | andresp@webrtc.org <andresp@webrtc.org> | 2014-09-25 07:30:14 +0000 |
|---|---|---|
| committer | andresp@webrtc.org <andresp@webrtc.org> | 2014-09-25 07:30:14 +0000 |
| commit | 67b75a09c81f3340460eaab90cb67170626cb6d4 (patch) | |
| tree | 11aff0140c1640a0f59d8c37cd03b000c6c15f3b | |
| parent | ff353df2f1dea1340d1d0b8819273d95a50186e1 (diff) | |
| download | webrtc-67b75a09c81f3340460eaab90cb67170626cb6d4.tar.gz | |
Revert "Call SSL_shutdown in OpenSSLStreamAdapter::Cleanup." (rev 7293).
Breaks windows bot as it was already showing on the try jobs on the
BUG=crbug/414211
R=jiayl@webrtc.org,juberti@webrtc.org
TBR=jiayl@webrtc.org,juberti@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/26599004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7294 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | base/opensslstreamadapter.cc | 6 | ||||
| -rw-r--r-- | base/sslstreamadapter_unittest.cc | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/base/opensslstreamadapter.cc b/base/opensslstreamadapter.cc index 133eb72b..070a948b 100644 --- a/base/opensslstreamadapter.cc +++ b/base/opensslstreamadapter.cc @@ -695,12 +695,6 @@ void OpenSSLStreamAdapter::Cleanup() { } if (ssl_) { - int ret = SSL_shutdown(ssl_); - if (ret < 0) { - LOG(LS_WARNING) << "SSL_shutdown failed, error = " - << SSL_get_error(ssl_, ret); - } - SSL_free(ssl_); ssl_ = NULL; } diff --git a/base/sslstreamadapter_unittest.cc b/base/sslstreamadapter_unittest.cc index 05383143..f7dcb71e 100644 --- a/base/sslstreamadapter_unittest.cc +++ b/base/sslstreamadapter_unittest.cc @@ -691,13 +691,6 @@ TEST_F(SSLStreamAdapterTestTLS, TestTLSConnect) { TestHandshake(); }; -// Test that closing the connection on one side updates the other side. -TEST_F(SSLStreamAdapterTestTLS, TestTLSClose) { - TestHandshake(); - client_ssl_->Close(); - EXPECT_EQ_WAIT(rtc::SS_CLOSED, server_ssl_->GetState(), handshake_wait_); -}; - // Test transfer -- trivial TEST_F(SSLStreamAdapterTestTLS, TestTLSTransfer) { TestHandshake(); |