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

Unified Diff: webrtc/base/opensslstreamadapter.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/opensslstreamadapter.h
diff --git a/webrtc/base/opensslstreamadapter.h b/webrtc/base/opensslstreamadapter.h
index cf332b155df11e84b69d563430523de0d82d6d2f..907bf5a7b01b7c4aed9c9a1f872e5d19d7c88023 100644
--- a/webrtc/base/opensslstreamadapter.h
+++ b/webrtc/base/opensslstreamadapter.h
@@ -61,7 +61,8 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter {
explicit OpenSSLStreamAdapter(StreamInterface* stream);
~OpenSSLStreamAdapter() override;
- void SetIdentity(SSLIdentity* identity) override;
+ void SetCertificate(
+ const scoped_refptr<webrtc::DtlsCertificate>& certificate) override;
// Default argument is for compatibility
void SetServerRole(SSLRole role = SSL_SERVER) override;
@@ -182,8 +183,8 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter {
SSL* ssl_;
SSL_CTX* ssl_ctx_;
- // Our key and certificate, mostly useful in peer-to-peer mode.
- scoped_ptr<OpenSSLIdentity> identity_;
+ // Contains our key and certificate, mostly useful in peer-to-peer mode.
+ scoped_refptr<webrtc::DtlsCertificate> certificate_;
// 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