Chromium Code Reviews| Index: webrtc/base/sslstreamadapter.cc |
| diff --git a/webrtc/base/sslstreamadapter.cc b/webrtc/base/sslstreamadapter.cc |
| index 42dea9c0362f6910f550a36830e4dade3cecc5f1..fafedce1c418f3583749145ae0b2dc5739155e53 100644 |
| --- a/webrtc/base/sslstreamadapter.cc |
| +++ b/webrtc/base/sslstreamadapter.cc |
| @@ -67,7 +67,7 @@ bool SSLStreamAdapter::HaveDtls() { return false; } |
| bool SSLStreamAdapter::HaveDtlsSrtp() { return false; } |
| bool SSLStreamAdapter::HaveExporter() { return false; } |
| std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version, |
| - KeyType key_type) { |
| + KeyTypeFull key_type) { |
| return std::string(); |
| } |
| #elif SSL_USE_OPENSSL |
| @@ -80,8 +80,11 @@ bool SSLStreamAdapter::HaveDtlsSrtp() { |
| bool SSLStreamAdapter::HaveExporter() { |
| return OpenSSLStreamAdapter::HaveExporter(); |
| } |
| +std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version) { |
|
juberti
2015/09/29 16:44:05
Why do we need to add this?
torbjorng (webrtc)
2015/10/01 11:43:19
Convenience (I've now instead adapted callers (in
|
| + return OpenSSLStreamAdapter::GetDefaultSslCipher(version, KeyTypeFull()); |
| +} |
| std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version, |
| - KeyType key_type) { |
| + KeyTypeFull key_type) { |
| return OpenSSLStreamAdapter::GetDefaultSslCipher(version, key_type); |
| } |
| #endif // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL |