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

Unified Diff: webrtc/base/sslstreamadapterhelper.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/base/sslstreamadapterhelper.h
diff --git a/webrtc/base/sslstreamadapterhelper.h b/webrtc/base/sslstreamadapterhelper.h
index a28dba4deaeb72508a5f2abb6b7ad01a2845c65d..05f70fb7d9c96216b3c54fcaa4bbcb8bf0eb2f36 100644
--- a/webrtc/base/sslstreamadapterhelper.h
+++ b/webrtc/base/sslstreamadapterhelper.h
@@ -30,7 +30,8 @@ class SSLStreamAdapterHelper : public SSLStreamAdapter {
~SSLStreamAdapterHelper() override;
// Overrides of SSLStreamAdapter
- void SetIdentity(SSLIdentity* identity) override;
+ void SetCertificate(
+ const rtc::scoped_refptr<webrtc::DtlsCertificate>& dtlscert) override;
void SetServerRole(SSLRole role = SSL_SERVER) override;
void SetMode(SSLMode mode) override;
void SetMaxProtocolVersion(SSLProtocolVersion version) override;
@@ -87,8 +88,8 @@ class SSLStreamAdapterHelper : public SSLStreamAdapter {
SSLRole role_;
int ssl_error_code_; // valid when state_ == SSL_ERROR
- // Our key and certificate, mostly useful in peer-to-peer mode.
- scoped_ptr<SSLIdentity> identity_;
+ // Contains our key and certificate, mostly useful in peer-to-peer mode.
+ scoped_refptr<webrtc::DtlsCertificate> dtlscertificate_;
// in traditional mode, the server name that the server's certificate
// must specify. Empty in peer-to-peer mode.
std::string ssl_server_name_;

Powered by Google App Engine
This is Rietveld 408576698