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

Unified Diff: webrtc/p2p/base/transport.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/transport.h
diff --git a/webrtc/p2p/base/transport.h b/webrtc/p2p/base/transport.h
index 6064bdb54db257c978b6edeaa1f4613b9cd9641f..b78fba6a76820d1288c5305e083dc47cc8fd0339 100644
--- a/webrtc/p2p/base/transport.h
+++ b/webrtc/p2p/base/transport.h
@@ -32,6 +32,8 @@
#include <map>
#include <string>
#include <vector>
+
+#include "talk/app/webrtc/dtlscertificate.h"
#include "webrtc/p2p/base/candidate.h"
#include "webrtc/p2p/base/constants.h"
#include "webrtc/p2p/base/sessiondescription.h"
@@ -203,10 +205,11 @@ class Transport : public rtc::MessageHandler,
void SetChannelReceivingTimeout(int timeout_ms);
// Must be called before applying local session description.
- void SetIdentity(rtc::SSLIdentity* identity);
+ void SetCertificate(
+ const rtc::scoped_refptr<webrtc::DtlsCertificate>& certificate);
- // Get a copy of the local identity provided by SetIdentity.
- bool GetIdentity(rtc::SSLIdentity** identity);
+ // Get a reference to the local certificate provided by SetCertificate.
+ bool GetCertificate(rtc::scoped_refptr<webrtc::DtlsCertificate>* certificate);
// Get a copy of the remote certificate in use by the specified channel.
bool GetRemoteCertificate(rtc::SSLCertificate** cert);
@@ -304,9 +307,11 @@ class Transport : public rtc::MessageHandler,
return remote_description_.get();
}
- virtual void SetIdentity_w(rtc::SSLIdentity* identity) {}
+ virtual void SetCertificate_w(
+ const rtc::scoped_refptr<webrtc::DtlsCertificate>& certificate) {}
- virtual bool GetIdentity_w(rtc::SSLIdentity** identity) {
+ virtual bool GetCertificate_w(
+ rtc::scoped_refptr<webrtc::DtlsCertificate>* certificate) {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698