Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

Side by Side Diff: webrtc/base/sslstreamadapter.cc

Issue 1774583002: Add IsAcceptableCipher, use instead of GetDefaultCipher. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Format Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 #if SSL_USE_OPENSSL 79 #if SSL_USE_OPENSSL
80 bool SSLStreamAdapter::HaveDtls() { 80 bool SSLStreamAdapter::HaveDtls() {
81 return OpenSSLStreamAdapter::HaveDtls(); 81 return OpenSSLStreamAdapter::HaveDtls();
82 } 82 }
83 bool SSLStreamAdapter::HaveDtlsSrtp() { 83 bool SSLStreamAdapter::HaveDtlsSrtp() {
84 return OpenSSLStreamAdapter::HaveDtlsSrtp(); 84 return OpenSSLStreamAdapter::HaveDtlsSrtp();
85 } 85 }
86 bool SSLStreamAdapter::HaveExporter() { 86 bool SSLStreamAdapter::HaveExporter() {
87 return OpenSSLStreamAdapter::HaveExporter(); 87 return OpenSSLStreamAdapter::HaveExporter();
88 } 88 }
89 int SSLStreamAdapter::GetDefaultSslCipherForTest(SSLProtocolVersion version, 89 bool SSLStreamAdapter::IsAcceptableCipher(int cipher, KeyType key_type) {
90 KeyType key_type) { 90 return OpenSSLStreamAdapter::IsAcceptableCipher(cipher, key_type);
91 return OpenSSLStreamAdapter::GetDefaultSslCipherForTest(version, key_type);
92 } 91 }
93 92 bool SSLStreamAdapter::IsAcceptableCipher(std::string cipher,
93 KeyType key_type) {
94 return OpenSSLStreamAdapter::IsAcceptableCipher(cipher, key_type);
95 }
94 std::string SSLStreamAdapter::SslCipherSuiteToName(int cipher_suite) { 96 std::string SSLStreamAdapter::SslCipherSuiteToName(int cipher_suite) {
95 return OpenSSLStreamAdapter::SslCipherSuiteToName(cipher_suite); 97 return OpenSSLStreamAdapter::SslCipherSuiteToName(cipher_suite);
96 } 98 }
97 #endif // SSL_USE_OPENSSL 99 #endif // SSL_USE_OPENSSL
98 100
99 /////////////////////////////////////////////////////////////////////////////// 101 ///////////////////////////////////////////////////////////////////////////////
100 102
101 } // namespace rtc 103 } // namespace rtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698