| Index: webrtc/p2p/base/dtlstransportchannel.h
|
| diff --git a/webrtc/p2p/base/dtlstransportchannel.h b/webrtc/p2p/base/dtlstransportchannel.h
|
| index 71f68877d43ef6af2ddfe9179d274c824a07a92c..41e081b7fea360b38a9a689ab15a626d544b8b22 100644
|
| --- a/webrtc/p2p/base/dtlstransportchannel.h
|
| +++ b/webrtc/p2p/base/dtlstransportchannel.h
|
| @@ -126,10 +126,10 @@
|
| // Set up the ciphers to use for DTLS-SRTP. If this method is not called
|
| // before DTLS starts, or |ciphers| is empty, SRTP keys won't be negotiated.
|
| // This method should be called before SetupDtls.
|
| - bool SetSrtpCryptoSuites(const std::vector<int>& ciphers) override;
|
| + bool SetSrtpCiphers(const std::vector<std::string>& ciphers) override;
|
|
|
| // Find out which DTLS-SRTP cipher was negotiated
|
| - bool GetSrtpCryptoSuite(int* cipher) override;
|
| + bool GetSrtpCryptoSuite(std::string* cipher) override;
|
|
|
| bool GetSslRole(rtc::SSLRole* role) const override;
|
| bool SetSslRole(rtc::SSLRole role) override;
|
| @@ -223,7 +223,7 @@
|
| TransportChannelImpl* const channel_;
|
| rtc::scoped_ptr<rtc::SSLStreamAdapter> dtls_; // The DTLS stream
|
| StreamInterfaceChannel* downward_; // Wrapper for channel_, owned by dtls_.
|
| - std::vector<int> srtp_ciphers_; // SRTP ciphers to use with DTLS.
|
| + std::vector<std::string> srtp_ciphers_; // SRTP ciphers to use with DTLS.
|
| bool dtls_active_ = false;
|
| rtc::scoped_refptr<rtc::RTCCertificate> local_certificate_;
|
| rtc::SSLRole ssl_role_;
|
|
|