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

Unified Diff: webrtc/p2p/base/dtlstransportchannel.h

Issue 1269843005: Added DtlsCertificate, a ref counted object owning an SSLIdentity (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Merge with master Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/p2p/base/dtlstransportchannel.h
diff --git a/webrtc/p2p/base/dtlstransportchannel.h b/webrtc/p2p/base/dtlstransportchannel.h
index 1bf77b6566a44cf958aa38e9535a1fd098f4cd43..e8683dc7a9236931516e401c3d0593351645ceef 100644
--- a/webrtc/p2p/base/dtlstransportchannel.h
+++ b/webrtc/p2p/base/dtlstransportchannel.h
@@ -99,8 +99,10 @@ class DtlsTransportChannelWrapper : public TransportChannelImpl {
virtual IceRole GetIceRole() const {
return channel_->GetIceRole();
}
- virtual bool SetLocalIdentity(rtc::SSLIdentity *identity);
- virtual bool GetLocalIdentity(rtc::SSLIdentity** identity) const;
+ bool SetLocalCertificate(
+ const rtc::scoped_refptr<webrtc::DtlsCertificate>& certificate) override;
+ bool GetLocalCertificate(
+ rtc::scoped_refptr<webrtc::DtlsCertificate>* certificate) const override;
virtual bool SetRemoteFingerprint(const std::string& digest_alg,
const uint8* digest,
@@ -236,7 +238,7 @@ class DtlsTransportChannelWrapper : public TransportChannelImpl {
StreamInterfaceChannel* downward_; // Wrapper for channel_, owned by dtls_.
std::vector<std::string> srtp_ciphers_; // SRTP ciphers to use with DTLS.
State dtls_state_;
- rtc::SSLIdentity* local_identity_;
+ rtc::scoped_refptr<webrtc::DtlsCertificate> local_certificate_;
rtc::SSLRole ssl_role_;
rtc::SSLProtocolVersion ssl_max_version_;
rtc::Buffer remote_fingerprint_value_;

Powered by Google App Engine
This is Rietveld 408576698