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

Side by Side Diff: webrtc/p2p/base/dtlstransportchannel.h

Issue 1337673002: Change WebRTC SslCipher to be exposed as number only. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « webrtc/base/sslstreamadapter_unittest.cc ('k') | webrtc/p2p/base/dtlstransportchannel.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2011 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 const std::string SessionId() const override { return channel_->SessionId(); } 128 const std::string SessionId() const override { return channel_->SessionId(); }
129 129
130 virtual bool SetSslMaxProtocolVersion(rtc::SSLProtocolVersion version); 130 virtual bool SetSslMaxProtocolVersion(rtc::SSLProtocolVersion version);
131 131
132 // Set up the ciphers to use for DTLS-SRTP. If this method is not called 132 // Set up the ciphers to use for DTLS-SRTP. If this method is not called
133 // before DTLS starts, or |ciphers| is empty, SRTP keys won't be negotiated. 133 // before DTLS starts, or |ciphers| is empty, SRTP keys won't be negotiated.
134 // This method should be called before SetupDtls. 134 // This method should be called before SetupDtls.
135 bool SetSrtpCiphers(const std::vector<std::string>& ciphers) override; 135 bool SetSrtpCiphers(const std::vector<std::string>& ciphers) override;
136 136
137 // Find out which DTLS-SRTP cipher was negotiated 137 // Find out which DTLS-SRTP cipher was negotiated
138 bool GetSrtpCipher(std::string* cipher) override; 138 bool GetSrtpCryptoSuite(std::string* cipher) override;
139 139
140 bool GetSslRole(rtc::SSLRole* role) const override; 140 bool GetSslRole(rtc::SSLRole* role) const override;
141 bool SetSslRole(rtc::SSLRole role) override; 141 bool SetSslRole(rtc::SSLRole role) override;
142 142
143 // Find out which DTLS cipher was negotiated 143 // Find out which DTLS cipher was negotiated
144 bool GetSslCipher(std::string* cipher) override; 144 bool GetSslCipherSuite(uint16_t* cipher) override;
145 145
146 // Once DTLS has been established, this method retrieves the certificate in 146 // Once DTLS has been established, this method retrieves the certificate in
147 // use by the remote peer, for use in external identity verification. 147 // use by the remote peer, for use in external identity verification.
148 bool GetRemoteSSLCertificate(rtc::SSLCertificate** cert) const override; 148 bool GetRemoteSSLCertificate(rtc::SSLCertificate** cert) const override;
149 149
150 // Once DTLS has established (i.e., this channel is writable), this method 150 // Once DTLS has established (i.e., this channel is writable), this method
151 // extracts the keys negotiated during the DTLS handshake, for use in external 151 // extracts the keys negotiated during the DTLS handshake, for use in external
152 // encryption. DTLS-SRTP uses this to extract the needed SRTP keys. 152 // encryption. DTLS-SRTP uses this to extract the needed SRTP keys.
153 // See the SSLStreamAdapter documentation for info on the specific parameters. 153 // See the SSLStreamAdapter documentation for info on the specific parameters.
154 bool ExportKeyingMaterial(const std::string& label, 154 bool ExportKeyingMaterial(const std::string& label,
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 rtc::SSLProtocolVersion ssl_max_version_; 233 rtc::SSLProtocolVersion ssl_max_version_;
234 rtc::Buffer remote_fingerprint_value_; 234 rtc::Buffer remote_fingerprint_value_;
235 std::string remote_fingerprint_algorithm_; 235 std::string remote_fingerprint_algorithm_;
236 236
237 RTC_DISALLOW_COPY_AND_ASSIGN(DtlsTransportChannelWrapper); 237 RTC_DISALLOW_COPY_AND_ASSIGN(DtlsTransportChannelWrapper);
238 }; 238 };
239 239
240 } // namespace cricket 240 } // namespace cricket
241 241
242 #endif // WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_ 242 #endif // WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/base/sslstreamadapter_unittest.cc ('k') | webrtc/p2p/base/dtlstransportchannel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698