From 37e1846d732815dfaa1ef1e5f84e4bcc52eb66e4 Mon Sep 17 00:00:00 2001 From: "andresp@webrtc.org" Date: Thu, 25 Sep 2014 07:30:14 +0000 Subject: [PATCH] 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@7294 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/base/opensslstreamadapter.cc | 6 ------ webrtc/base/sslstreamadapter_unittest.cc | 7 ------- 2 files changed, 13 deletions(-) diff --git a/webrtc/base/opensslstreamadapter.cc b/webrtc/base/opensslstreamadapter.cc index 133eb72b4c..070a948b14 100644 --- a/webrtc/base/opensslstreamadapter.cc +++ b/webrtc/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/webrtc/base/sslstreamadapter_unittest.cc b/webrtc/base/sslstreamadapter_unittest.cc index 053831437f..f7dcb71e48 100644 --- a/webrtc/base/sslstreamadapter_unittest.cc +++ b/webrtc/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();