generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Call SSL_shutdown in OpenSSLStreamAdapter::Cleanup." (rev 7293).

Browse Source 
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
This commit is contained in:
andresp@webrtc.org 2014-09-25 07:30:14 +00:00
parent fe1eafb71a
commit 37e1846d73
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/base/opensslstreamadapter.cc
View File

@ -695,12 +695,6 @@ void OpenSSLStreamAdapter::Cleanup() {
} }
if (ssl_) { 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_free(ssl_);
ssl_ = NULL; ssl_ = NULL;
} }

7
webrtc/base/sslstreamadapter_unittest.cc
View File

@ -691,13 +691,6 @@ TEST_F(SSLStreamAdapterTestTLS, TestTLSConnect) {
TestHandshake(); 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 transfer -- trivial
TEST_F(SSLStreamAdapterTestTLS, TestTLSTransfer) { TEST_F(SSLStreamAdapterTestTLS, TestTLSTransfer) {
TestHandshake(); TestHandshake();