Index: webrtc/base/sslstreamadapter_unittest.cc |
diff --git a/webrtc/base/sslstreamadapter_unittest.cc b/webrtc/base/sslstreamadapter_unittest.cc |
index 68e1b64dbe91a38aac7d5ff076d045be0d1e3074..78f1d3db9d3341d27559d97ed2c8c8c2607935d7 100644 |
--- a/webrtc/base/sslstreamadapter_unittest.cc |
+++ b/webrtc/base/sslstreamadapter_unittest.cc |
@@ -411,10 +411,16 @@ class SSLStreamAdapterTestBase : public testing::Test, |
} |
bool GetSslCipher(bool client, std::string *retval) { |
+ rtc::SslCipher cipher; |
+ bool ret; |
if (client) |
- return client_ssl_->GetSslCipher(retval); |
+ ret = client_ssl_->GetSslCipher(&cipher); |
else |
- return server_ssl_->GetSslCipher(retval); |
+ ret = server_ssl_->GetSslCipher(&cipher); |
+ |
+ if (ret) |
+ *retval = cipher.name; |
+ return ret; |
} |
bool ExportKeyingMaterial(const char *label, |
@@ -978,8 +984,8 @@ TEST_P(SSLStreamAdapterTestDTLS, TestGetSslCipher) { |
ASSERT_TRUE(GetSslCipher(false, &server_cipher)); |
ASSERT_EQ(client_cipher, server_cipher); |
- ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipher( |
- rtc::SSL_PROTOCOL_DTLS_10, ::testing::get<1>(GetParam())), |
+ ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipherForTest( |
+ rtc::SSL_PROTOCOL_DTLS_10, ::testing::get<1>(GetParam())).name, |
server_cipher); |
} |
@@ -996,8 +1002,8 @@ TEST_P(SSLStreamAdapterTestDTLS, TestGetSslCipherDtls12Both) { |
ASSERT_TRUE(GetSslCipher(false, &server_cipher)); |
ASSERT_EQ(client_cipher, server_cipher); |
- ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipher( |
- rtc::SSL_PROTOCOL_DTLS_12, ::testing::get<1>(GetParam())), |
+ ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipherForTest( |
+ rtc::SSL_PROTOCOL_DTLS_12, ::testing::get<1>(GetParam())).name, |
server_cipher); |
} |
@@ -1013,8 +1019,8 @@ TEST_P(SSLStreamAdapterTestDTLS, TestGetSslCipherDtls12Client) { |
ASSERT_TRUE(GetSslCipher(false, &server_cipher)); |
ASSERT_EQ(client_cipher, server_cipher); |
- ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipher( |
- rtc::SSL_PROTOCOL_DTLS_10, ::testing::get<1>(GetParam())), |
+ ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipherForTest( |
+ rtc::SSL_PROTOCOL_DTLS_10, ::testing::get<1>(GetParam())).name, |
server_cipher); |
} |
@@ -1030,8 +1036,8 @@ TEST_P(SSLStreamAdapterTestDTLS, TestGetSslCipherDtls12Server) { |
ASSERT_TRUE(GetSslCipher(false, &server_cipher)); |
ASSERT_EQ(client_cipher, server_cipher); |
- ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipher( |
- rtc::SSL_PROTOCOL_DTLS_10, ::testing::get<1>(GetParam())), |
+ ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipherForTest( |
+ rtc::SSL_PROTOCOL_DTLS_10, ::testing::get<1>(GetParam())).name, |
server_cipher); |
} |