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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 160 virtual bool SetDtlsSrtpCiphers(const std::vector<std::string>& ciphers); | 160 virtual bool SetDtlsSrtpCiphers(const std::vector<std::string>& ciphers); |
| 161 virtual bool GetDtlsSrtpCipher(std::string* cipher); | 161 virtual bool GetDtlsSrtpCipher(std::string* cipher); |
| 162 | 162 |
| 163 // Capabilities testing | 163 // Capabilities testing |
| 164 static bool HaveDtls(); | 164 static bool HaveDtls(); |
| 165 static bool HaveDtlsSrtp(); | 165 static bool HaveDtlsSrtp(); |
| 166 static bool HaveExporter(); | 166 static bool HaveExporter(); |
| 167 | 167 |
| 168 // Returns the default Ssl cipher used between streams of this class | 168 // Returns the default Ssl cipher used between streams of this class |
| 169 // for the given protocol version. This is used by the unit tests. | 169 // for the given protocol version. This is used by the unit tests. |
| 170 // TODO(torbjorng@webrtc.org): Fix callers to avoid default parameter. | 170 static std::string GetDefaultSslCipher(SSLProtocolVersion version); |
|
juberti
2015/09/29 16:44:05
Why do we need to pass KeyTypeFull here? This func
torbjorng (webrtc)
2015/10/01 11:43:19
It was convenient, but I now instead changed calle
| |
| 171 static std::string GetDefaultSslCipher(SSLProtocolVersion version, | 171 static std::string GetDefaultSslCipher(SSLProtocolVersion version, |
| 172 KeyType key_type = KT_DEFAULT); | 172 KeyTypeFull key_type); |
|
hbos
2015/09/29 13:53:18
Can we do default param key_type = KeyTypeFull::De
torbjorng (webrtc)
2015/10/01 11:43:19
Default arguments are frowned upon:
https://google
hbos
2015/10/01 14:42:43
Acknowledged.
| |
| 173 | 173 |
| 174 private: | 174 private: |
| 175 // If true, the server certificate need not match the configured | 175 // If true, the server certificate need not match the configured |
| 176 // server_name, and in fact missing certificate authority and other | 176 // server_name, and in fact missing certificate authority and other |
| 177 // verification errors are ignored. | 177 // verification errors are ignored. |
| 178 bool ignore_bad_cert_; | 178 bool ignore_bad_cert_; |
| 179 | 179 |
| 180 // If true (default), the client is required to provide a certificate during | 180 // If true (default), the client is required to provide a certificate during |
| 181 // handshake. If no certificate is given, handshake fails. This applies to | 181 // handshake. If no certificate is given, handshake fails. This applies to |
| 182 // server mode only. | 182 // server mode only. |
| 183 bool client_auth_enabled_; | 183 bool client_auth_enabled_; |
| 184 }; | 184 }; |
| 185 | 185 |
| 186 } // namespace rtc | 186 } // namespace rtc |
| 187 | 187 |
| 188 #endif // WEBRTC_BASE_SSLSTREAMADAPTER_H_ | 188 #endif // WEBRTC_BASE_SSLSTREAMADAPTER_H_ |
| OLD | NEW |