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

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

Issue 1377733004: Convert uint16_t to int for WebRTC cipher/crypto suite (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/p2p/base/transport.h ('k') | no next file » | 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 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 virtual bool IsDtlsActive() const = 0; 100 virtual bool IsDtlsActive() const = 0;
101 101
102 // Default implementation. 102 // Default implementation.
103 virtual bool GetSslRole(rtc::SSLRole* role) const = 0; 103 virtual bool GetSslRole(rtc::SSLRole* role) const = 0;
104 104
105 // Sets up the ciphers to use for DTLS-SRTP. 105 // Sets up the ciphers to use for DTLS-SRTP.
106 virtual bool SetSrtpCiphers(const std::vector<std::string>& ciphers) = 0; 106 virtual bool SetSrtpCiphers(const std::vector<std::string>& ciphers) = 0;
107 107
108 // Finds out which DTLS-SRTP cipher was negotiated. 108 // Finds out which DTLS-SRTP cipher was negotiated.
109 // TODO(guoweis): Remove this once all dependencies implement this. 109 // TODO(guoweis): Remove this once all dependencies implement this.
110 virtual bool GetSrtpCryptoSuite(std::string* cipher) { 110 virtual bool GetSrtpCryptoSuite(std::string* cipher) {
juberti 2015/10/06 05:52:39 Please fix this naming as well - suggest putting i
111 return false; 111 return false;
112 } 112 }
113 113
114 // Finds out which DTLS cipher was negotiated. 114 // Finds out which DTLS cipher was negotiated.
115 // TODO(guoweis): Remove this once all dependencies implement this. 115 // TODO(guoweis): Remove this once all dependencies implement this.
116 virtual bool GetSslCipherSuite(uint16_t* cipher) { 116 virtual bool GetSslCipherSuite(int* cipher) { return false; }
117 return false;
118 }
119 117
120 // Gets the local RTCCertificate used for DTLS. 118 // Gets the local RTCCertificate used for DTLS.
121 virtual rtc::scoped_refptr<rtc::RTCCertificate> 119 virtual rtc::scoped_refptr<rtc::RTCCertificate>
122 GetLocalCertificate() const = 0; 120 GetLocalCertificate() const = 0;
123 121
124 // Gets a copy of the remote side's SSL certificate, owned by the caller. 122 // Gets a copy of the remote side's SSL certificate, owned by the caller.
125 virtual bool GetRemoteSSLCertificate(rtc::SSLCertificate** cert) const = 0; 123 virtual bool GetRemoteSSLCertificate(rtc::SSLCertificate** cert) const = 0;
126 124
127 // Allows key material to be extracted for external encryption. 125 // Allows key material to be extracted for external encryption.
128 virtual bool ExportKeyingMaterial(const std::string& label, 126 virtual bool ExportKeyingMaterial(const std::string& label,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 int component_; 161 int component_;
164 bool writable_; 162 bool writable_;
165 bool receiving_; 163 bool receiving_;
166 164
167 RTC_DISALLOW_COPY_AND_ASSIGN(TransportChannel); 165 RTC_DISALLOW_COPY_AND_ASSIGN(TransportChannel);
168 }; 166 };
169 167
170 } // namespace cricket 168 } // namespace cricket
171 169
172 #endif // WEBRTC_P2P_BASE_TRANSPORTCHANNEL_H_ 170 #endif // WEBRTC_P2P_BASE_TRANSPORTCHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/transport.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698