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

Unified Diff: webrtc/base/ssladapter_unittest.cc

Issue 1269843005: Added DtlsCertificate, a ref counted object owning an SSLIdentity (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Trying to get iOS to compile 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/ssladapter_unittest.cc
diff --git a/webrtc/base/ssladapter_unittest.cc b/webrtc/base/ssladapter_unittest.cc
index 9a0548602e20eae23eb1550eaaf0c7b967052298..ce9c62a3cc2054a7a6fe81f71462128c6974603a 100644
--- a/webrtc/base/ssladapter_unittest.cc
+++ b/webrtc/base/ssladapter_unittest.cc
@@ -132,7 +132,9 @@ class SSLAdapterTestDummyServer : public sigslot::has_slots<> {
explicit SSLAdapterTestDummyServer(const rtc::SSLMode& ssl_mode)
: ssl_mode_(ssl_mode) {
// Generate a key pair and a certificate for this host.
- ssl_identity_.reset(rtc::SSLIdentity::Generate(GetHostname()));
+ ssl_certificate_ = webrtc::DtlsCertificate::Create(
+ rtc::scoped_ptr<rtc::SSLIdentity>(
+ rtc::SSLIdentity::Generate(GetHostname())).Pass());
server_socket_.reset(CreateSocket(ssl_mode_));
@@ -241,7 +243,7 @@ class SSLAdapterTestDummyServer : public sigslot::has_slots<> {
// Accordingly, we must disable client authentication here.
ssl_stream_adapter_->set_client_auth_enabled(false);
- ssl_stream_adapter_->SetIdentity(ssl_identity_->GetReference());
+ ssl_stream_adapter_->SetCertificate(ssl_certificate_);
// Set a bogus peer certificate digest.
unsigned char digest[20];
@@ -260,7 +262,7 @@ class SSLAdapterTestDummyServer : public sigslot::has_slots<> {
rtc::scoped_ptr<rtc::AsyncSocket> server_socket_;
rtc::scoped_ptr<rtc::SSLStreamAdapter> ssl_stream_adapter_;
- rtc::scoped_ptr<rtc::SSLIdentity> ssl_identity_;
+ rtc::scoped_refptr<webrtc::DtlsCertificate> ssl_certificate_;
std::string data_;
};

Powered by Google App Engine
This is Rietveld 408576698