Added DtlsCertificate, a ref counted object owning an SSLIdentity

webrtc/base/opensslstreamadapter.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 280 matching lines @@
       ssl_(NULL), ssl_ctx_(NULL),
       custom_verification_succeeded_(false),
       ssl_mode_(SSL_MODE_TLS),
       ssl_max_version_(SSL_PROTOCOL_TLS_11) {
 }
 
 OpenSSLStreamAdapter::~OpenSSLStreamAdapter() {
   Cleanup();
 }
 
-void OpenSSLStreamAdapter::SetIdentity(SSLIdentity* identity) {
-  ASSERT(!identity_);
-  identity_.reset(static_cast<OpenSSLIdentity*>(identity));
+void OpenSSLStreamAdapter::SetCertificate(
+    const scoped_refptr<webrtc::DtlsCertificate>& certificate) {
+  ASSERT(!certificate_.get());
+  certificate_ = certificate;
 }
 
 void OpenSSLStreamAdapter::SetServerRole(SSLRole role) {
   role_ = role;
 }
 
 bool OpenSSLStreamAdapter::GetPeerCertificate(SSLCertificate** cert) const {
   if (!peer_certificate_)
     return false;
 
@@ skipping 556 matching lines @@
                       << SSL_get_error(ssl_, ret);
     }
 
     SSL_free(ssl_);
     ssl_ = NULL;
   }
   if (ssl_ctx_) {
     SSL_CTX_free(ssl_ctx_);
     ssl_ctx_ = NULL;
   }
-  identity_.reset();
+  certificate_ = nullptr;
   peer_certificate_.reset();
 
   // Clear the DTLS timer
   Thread::Current()->Clear(this, MSG_TIMEOUT);
 }
 
 
 void OpenSSLStreamAdapter::OnMessage(Message* msg) {
   // Process our own messages and then pass others to the superclass
   if (MSG_TIMEOUT == msg->message_id) {
@@ skipping 87 matching lines @@
           DTLS1_VERSION : TLS1_1_VERSION);
       break;
     case SSL_PROTOCOL_TLS_12:
     default:
       SSL_CTX_set_max_version(ctx, ssl_mode_ == SSL_MODE_DTLS ?
           DTLS1_2_VERSION : TLS1_2_VERSION);
       break;
   }
 #endif
 
-  if (identity_ && !identity_->ConfigureIdentity(ctx)) {
+  if (certificate_.get() &&
+      !static_cast<OpenSSLIdentity*>(certificate_->identity())
+          ->ConfigureIdentity(ctx)) {
     SSL_CTX_free(ctx);
     return NULL;
   }
 
 #ifdef _DEBUG
   SSL_CTX_set_info_callback(ctx, OpenSSLAdapter::SSLInfoCallback);
 #endif
 
   int mode = SSL_VERIFY_PEER;
   if (client_auth_enabled()) {
@@ skipping 164 matching lines @@
 #endif
     }
   } else {
     return std::string();
   }
 }
 
 }  // namespace rtc
 
 #endif  // HAVE_OPENSSL_SSL_H