Index: webrtc/base/sslstreamadapter.cc |
diff --git a/webrtc/base/sslstreamadapter.cc b/webrtc/base/sslstreamadapter.cc |
index 42dea9c0362f6910f550a36830e4dade3cecc5f1..2a05657e0607c8b217ffe7889b75d726e6176d46 100644 |
--- a/webrtc/base/sslstreamadapter.cc |
+++ b/webrtc/base/sslstreamadapter.cc |
@@ -39,7 +39,7 @@ SSLStreamAdapter* SSLStreamAdapter::Create(StreamInterface* stream) { |
#endif |
} |
-bool SSLStreamAdapter::GetSslCipher(std::string* cipher) { |
+bool SSLStreamAdapter::GetSslCipher(SslCipher* cipher) { |
return false; |
} |
@@ -66,9 +66,10 @@ bool SSLStreamAdapter::GetDtlsSrtpCipher(std::string* cipher) { |
bool SSLStreamAdapter::HaveDtls() { return false; } |
bool SSLStreamAdapter::HaveDtlsSrtp() { return false; } |
bool SSLStreamAdapter::HaveExporter() { return false; } |
-std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version, |
- KeyType key_type) { |
- return std::string(); |
+const SslCipher& SSLStreamAdapter::GetDefaultSslCipherForTest( |
+ SSLProtocolVersion version, |
+ KeyType key_type) { |
+ return kNullSslCipher; |
} |
#elif SSL_USE_OPENSSL |
bool SSLStreamAdapter::HaveDtls() { |
@@ -80,9 +81,10 @@ bool SSLStreamAdapter::HaveDtlsSrtp() { |
bool SSLStreamAdapter::HaveExporter() { |
return OpenSSLStreamAdapter::HaveExporter(); |
} |
-std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version, |
- KeyType key_type) { |
- return OpenSSLStreamAdapter::GetDefaultSslCipher(version, key_type); |
+const SslCipher& SSLStreamAdapter::GetDefaultSslCipherForTest( |
+ SSLProtocolVersion version, |
+ KeyType key_type) { |
+ return OpenSSLStreamAdapter::GetDefaultSslCipherForTest(version, key_type); |
} |
#endif // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL |