Added DtlsCertificate, a ref counted object owning an SSLIdentity

webrtc/base/sslstreamadapter_unittest.cc

Index: webrtc/base/sslstreamadapter_unittest.cc
diff --git a/webrtc/base/sslstreamadapter_unittest.cc b/webrtc/base/sslstreamadapter_unittest.cc
index 6abaaa3bb9e678a0d14a796a72e313b0a60b5845..0129ba5d6cabfa64e8ccef167bb941ec994d68b0 100644
--- a/webrtc/base/sslstreamadapter_unittest.cc
+++ b/webrtc/base/sslstreamadapter_unittest.cc
@@ -166,7 +166,6 @@ class SSLStreamAdapterTestBase : public testing::Test,
           new SSLDummyStream(this, "s2c", &server_buffer_, &client_buffer_)),
       client_ssl_(rtc::SSLStreamAdapter::Create(client_stream_)),
       server_ssl_(rtc::SSLStreamAdapter::Create(server_stream_)),
-      client_identity_(NULL), server_identity_(NULL),
       delay_(0), mtu_(1460), loss_(0), lose_first_packet_(false),
       damage_(false), dtls_(dtls),
       handshake_wait_(5000), identities_set_(false) {
@@ -178,15 +177,21 @@ class SSLStreamAdapterTestBase : public testing::Test,
     server_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent);
 
     if (!client_cert_pem.empty() && !client_private_key_pem.empty()) {
-      client_identity_ = rtc::SSLIdentity::FromPEMStrings(
-          client_private_key_pem, client_cert_pem);
+      client_certificate_ = webrtc::DtlsCertificate::Create(
+          rtc::scoped_ptr<rtc::SSLIdentity>(
+              rtc::SSLIdentity::FromPEMStrings(client_private_key_pem,
+                                               client_cert_pem)).Pass());
     } else {
-      client_identity_ = rtc::SSLIdentity::Generate("client");
+      client_certificate_ = webrtc::DtlsCertificate::Create(
+          rtc::scoped_ptr<rtc::SSLIdentity>(
+              rtc::SSLIdentity::Generate("client")).Pass());
     }
-    server_identity_ = rtc::SSLIdentity::Generate("server");
+    server_certificate_ = webrtc::DtlsCertificate::Create(
+        rtc::scoped_ptr<rtc::SSLIdentity>(
+            rtc::SSLIdentity::Generate("server")).Pass());
 
-    client_ssl_->SetIdentity(client_identity_);
-    server_ssl_->SetIdentity(server_identity_);
+    client_ssl_->SetCertificate(client_certificate_);
+    server_ssl_->SetCertificate(server_certificate_);
   }
 
   ~SSLStreamAdapterTestBase() {
@@ -213,16 +218,20 @@ class SSLStreamAdapterTestBase : public testing::Test,
     client_params.common_name = "client";
     client_params.not_before = not_before;
     client_params.not_after = not_after;
-    client_identity_ = rtc::SSLIdentity::GenerateForTest(client_params);
+    client_certificate_ = webrtc::DtlsCertificate::Create(
+        rtc::scoped_ptr<rtc::SSLIdentity>(
+            rtc::SSLIdentity::GenerateForTest(client_params)).Pass());
 
     rtc::SSLIdentityParams server_params;
     server_params.common_name = "server";
     server_params.not_before = not_before;
     server_params.not_after = not_after;
-    server_identity_ = rtc::SSLIdentity::GenerateForTest(server_params);
+    server_certificate_ = webrtc::DtlsCertificate::Create(
+        rtc::scoped_ptr<rtc::SSLIdentity>(
+            rtc::SSLIdentity::GenerateForTest(server_params)).Pass());
 
-    client_ssl_->SetIdentity(client_identity_);
-    server_ssl_->SetIdentity(server_identity_);
+    client_ssl_->SetCertificate(client_certificate_);
+    server_ssl_->SetCertificate(server_certificate_);
   }
 
   virtual void OnEvent(rtc::StreamInterface *stream, int sig, int err) {
@@ -244,9 +253,8 @@ class SSLStreamAdapterTestBase : public testing::Test,
 
     LOG(LS_INFO) << "Setting peer identities by digest";
 
-    rv = server_identity_->certificate().ComputeDigest(rtc::DIGEST_SHA_1,
-                                                       digest, 20,
-                                                       &digest_len);
+    rv = server_certificate_->identity()->certificate().ComputeDigest(
+        rtc::DIGEST_SHA_1, digest, 20, &digest_len);
     ASSERT_TRUE(rv);
     if (!correct) {
       LOG(LS_INFO) << "Setting bogus digest for server cert";
@@ -257,8 +265,8 @@ class SSLStreamAdapterTestBase : public testing::Test,
     ASSERT_TRUE(rv);
 
 
-    rv = client_identity_->certificate().ComputeDigest(rtc::DIGEST_SHA_1,
-                                                       digest, 20, &digest_len);
+    rv = client_certificate_->identity()->certificate().ComputeDigest(
+        rtc::DIGEST_SHA_1, digest, 20, &digest_len);
     ASSERT_TRUE(rv);
     if (!correct) {
       LOG(LS_INFO) << "Setting bogus digest for client cert";
@@ -432,8 +440,8 @@ class SSLStreamAdapterTestBase : public testing::Test,
   SSLDummyStream *server_stream_;  // freed by server_ssl_ destructor
   rtc::scoped_ptr<rtc::SSLStreamAdapter> client_ssl_;
   rtc::scoped_ptr<rtc::SSLStreamAdapter> server_ssl_;
-  rtc::SSLIdentity *client_identity_;  // freed by client_ssl_ destructor
-  rtc::SSLIdentity *server_identity_;  // freed by server_ssl_ destructor
+  rtc::scoped_refptr<webrtc::DtlsCertificate> client_certificate_;
+  rtc::scoped_refptr<webrtc::DtlsCertificate> server_certificate_;
   int delay_;
   size_t mtu_;
   int loss_;