| Index: webrtc/base/sslstreamadapter.cc
|
| diff --git a/webrtc/base/sslstreamadapter.cc b/webrtc/base/sslstreamadapter.cc
|
| index 3c27b1020b21f08b83289609a055fc8be59159c6..39426cdb74e49c1d67645a262ce6b2b304345a3a 100644
|
| --- a/webrtc/base/sslstreamadapter.cc
|
| +++ b/webrtc/base/sslstreamadapter.cc
|
| @@ -72,7 +72,8 @@ 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) {
|
| +std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version,
|
| + KeyType key_type) {
|
| return std::string();
|
| }
|
| #elif SSL_USE_OPENSSL
|
| @@ -85,8 +86,9 @@ bool SSLStreamAdapter::HaveDtlsSrtp() {
|
| bool SSLStreamAdapter::HaveExporter() {
|
| return OpenSSLStreamAdapter::HaveExporter();
|
| }
|
| -std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version) {
|
| - return OpenSSLStreamAdapter::GetDefaultSslCipher(version);
|
| +std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version,
|
| + KeyType key_type) {
|
| + return OpenSSLStreamAdapter::GetDefaultSslCipher(version, key_type);
|
| }
|
| #elif SSL_USE_NSS
|
| bool SSLStreamAdapter::HaveDtls() {
|
| @@ -98,8 +100,9 @@ bool SSLStreamAdapter::HaveDtlsSrtp() {
|
| bool SSLStreamAdapter::HaveExporter() {
|
| return NSSStreamAdapter::HaveExporter();
|
| }
|
| -std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version) {
|
| - return NSSStreamAdapter::GetDefaultSslCipher(version);
|
| +std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version,
|
| + KeyType key_type) {
|
| + return NSSStreamAdapter::GetDefaultSslCipher(version, key_type);
|
| }
|
| #endif // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL && !SSL_USE_NSS
|
|
|
|
|