Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 bool SSLStreamAdapter::GetDtlsSrtpCipher(std::string* cipher) { | 60 bool SSLStreamAdapter::GetDtlsSrtpCipher(std::string* cipher) { |
| 61 return false; | 61 return false; |
| 62 } | 62 } |
| 63 | 63 |
| 64 // Note: this matches the logic above with SCHANNEL dominating | 64 // Note: this matches the logic above with SCHANNEL dominating |
| 65 #if SSL_USE_SCHANNEL | 65 #if SSL_USE_SCHANNEL |
| 66 bool SSLStreamAdapter::HaveDtls() { return false; } | 66 bool SSLStreamAdapter::HaveDtls() { return false; } |
| 67 bool SSLStreamAdapter::HaveDtlsSrtp() { return false; } | 67 bool SSLStreamAdapter::HaveDtlsSrtp() { return false; } |
| 68 bool SSLStreamAdapter::HaveExporter() { return false; } | 68 bool SSLStreamAdapter::HaveExporter() { return false; } |
| 69 std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version, | 69 std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version, |
| 70 KeyType key_type) { | 70 KeyTypeFull key_type) { |
| 71 return std::string(); | 71 return std::string(); |
| 72 } | 72 } |
| 73 #elif SSL_USE_OPENSSL | 73 #elif SSL_USE_OPENSSL |
| 74 bool SSLStreamAdapter::HaveDtls() { | 74 bool SSLStreamAdapter::HaveDtls() { |
| 75 return OpenSSLStreamAdapter::HaveDtls(); | 75 return OpenSSLStreamAdapter::HaveDtls(); |
| 76 } | 76 } |
| 77 bool SSLStreamAdapter::HaveDtlsSrtp() { | 77 bool SSLStreamAdapter::HaveDtlsSrtp() { |
| 78 return OpenSSLStreamAdapter::HaveDtlsSrtp(); | 78 return OpenSSLStreamAdapter::HaveDtlsSrtp(); |
| 79 } | 79 } |
| 80 bool SSLStreamAdapter::HaveExporter() { | 80 bool SSLStreamAdapter::HaveExporter() { |
| 81 return OpenSSLStreamAdapter::HaveExporter(); | 81 return OpenSSLStreamAdapter::HaveExporter(); |
| 82 } | 82 } |
| 83 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
| |
| 84 return OpenSSLStreamAdapter::GetDefaultSslCipher(version, KeyTypeFull()); | |
| 85 } | |
| 83 std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version, | 86 std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version, |
| 84 KeyType key_type) { | 87 KeyTypeFull key_type) { |
| 85 return OpenSSLStreamAdapter::GetDefaultSslCipher(version, key_type); | 88 return OpenSSLStreamAdapter::GetDefaultSslCipher(version, key_type); |
| 86 } | 89 } |
| 87 #endif // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL | 90 #endif // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL |
| 88 | 91 |
| 89 /////////////////////////////////////////////////////////////////////////////// | 92 /////////////////////////////////////////////////////////////////////////////// |
| 90 | 93 |
| 91 } // namespace rtc | 94 } // namespace rtc |
| OLD | NEW |