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

Call SSL_shutdown in OpenSSLStreamAdapter::Cleanup.

Browse Source 
BUG=crbug/414211
R=juberti@webrtc.org

Committed: https://code.google.com/p/webrtc/source/detail?r=7293

Review URL: https://webrtc-codereview.appspot.com/22739004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7301 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
jiayl@webrtc.org
2014-09-25 16:38:46 +00:00
parent 05305116d6
commit f1d751c7de
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/base/opensslstreamadapter.cc
View File

@@ -695,6 +695,12 @@ 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,6 +691,13 @@ 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();