Replaces SSLIdentity* with scoped_refptr<RTCCertificate> in cricket::Transport layer.

webrtc/p2p/base/dtlstransport.h

 /*
  *  Copyright 2012 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.
  */
 
 #ifndef WEBRTC_P2P_BASE_DTLSTRANSPORT_H_
 #define WEBRTC_P2P_BASE_DTLSTRANSPORT_H_
 
+#include "webrtc/base/checks.h"
 #include "webrtc/p2p/base/dtlstransportchannel.h"
 #include "webrtc/p2p/base/transport.h"
 
 namespace rtc {
 class SSLIdentity;
 }
 
 namespace cricket {
 
 class PortAllocator;
 
 // Base should be a descendant of cricket::Transport
+// TODO(hbos): Add appropriate DCHECK thread checks to all methods.
 template<class Base>
 class DtlsTransport : public Base {
  public:
   DtlsTransport(rtc::Thread* signaling_thread,
                 rtc::Thread* worker_thread,
                 const std::string& content_name,
                 PortAllocator* allocator,
-                rtc::SSLIdentity* identity)
+                const rtc::scoped_refptr<rtc::RTCCertificate>& certificate)
       : Base(signaling_thread, worker_thread, content_name, allocator),
-        identity_(identity),
+        certificate_(certificate),
         secure_role_(rtc::SSL_CLIENT),
         ssl_max_version_(rtc::SSL_PROTOCOL_DTLS_10) {
   }
 
   ~DtlsTransport() {
     Base::DestroyAllChannels();
   }
-  virtual void SetIdentity_w(rtc::SSLIdentity* identity) {
-    identity_ = identity;
+  void SetCertificate_w(
+      const rtc::scoped_refptr<rtc::RTCCertificate>& certificate) override {
+    DCHECK(Base::worker_thread()->IsCurrent());
+    certificate_ = certificate;
   }
-  virtual bool GetIdentity_w(rtc::SSLIdentity** identity) {
-    if (!identity_)
+  bool GetCertificate_w(
+      rtc::scoped_refptr<rtc::RTCCertificate>* certificate) override {
+    DCHECK(Base::worker_thread()->IsCurrent());
+    if (!certificate_)
       return false;
 
-    *identity = identity_->GetReference();
+    *certificate = certificate_;
     return true;
   }
 
   virtual bool SetSslMaxProtocolVersion_w(rtc::SSLProtocolVersion version) {
+    DCHECK(Base::worker_thread()->IsCurrent());
     ssl_max_version_ = version;
     return true;
   }
 
   virtual bool ApplyLocalTransportDescription_w(TransportChannelImpl* channel,
                                                 std::string* error_desc) {
+    DCHECK(Base::worker_thread()->IsCurrent());
     rtc::SSLFingerprint* local_fp =
         Base::local_description()->identity_fingerprint.get();
 
     if (local_fp) {
       // Sanity check local fingerprint.
-      if (identity_) {
+      if (certificate_) {
         rtc::scoped_ptr<rtc::SSLFingerprint> local_fp_tmp(
             rtc::SSLFingerprint::Create(local_fp->algorithm,
-                                              identity_));
+                                        certificate_->identity()));
         ASSERT(local_fp_tmp.get() != NULL);
         if (!(*local_fp_tmp == *local_fp)) {
           std::ostringstream desc;
           desc << "Local fingerprint does not match identity. Expected: ";
           desc << local_fp_tmp->ToString();
           desc << " Got: " << local_fp->ToString();
           return BadTransportDescription(desc.str(), error_desc);
         }
       } else {
         return BadTransportDescription(
             "Local fingerprint provided but no identity available.",
             error_desc);
       }
     } else {
-      identity_ = NULL;
+      certificate_ = nullptr;
     }
 
-    if (!channel->SetLocalIdentity(identity_)) {
+    // TODO(hbos): SetLocalCertificate
+    if (!channel->SetLocalIdentity(
+        certificate_ ? certificate_->identity() : nullptr)) {
       return BadTransportDescription("Failed to set local identity.",
                                      error_desc);
     }
 
     // Apply the description in the base class.
     return Base::ApplyLocalTransportDescription_w(channel, error_desc);
   }
 
   virtual bool NegotiateTransportDescription_w(ContentAction local_role,
                                                std::string* error_desc) {
+    DCHECK(Base::worker_thread()->IsCurrent());
     if (!Base::local_description() || !Base::remote_description()) {
       const std::string msg = "Local and Remote description must be set before "
                               "transport descriptions are negotiated";
       return BadTransportDescription(msg, error_desc);
     }
 
     rtc::SSLFingerprint* local_fp =
         Base::local_description()->identity_fingerprint.get();
     rtc::SSLFingerprint* remote_fp =
         Base::remote_description()->identity_fingerprint.get();
@@ skipping 96 matching lines @@
   virtual void DestroyTransportChannel(TransportChannelImpl* channel) {
     // Kind of ugly, but this lets us do the exact inverse of the create.
     DtlsTransportChannelWrapper* dtls_channel =
         static_cast<DtlsTransportChannelWrapper*>(channel);
     TransportChannelImpl* base_channel = dtls_channel->channel();
     delete dtls_channel;
     Base::DestroyTransportChannel(base_channel);
   }
 
   virtual bool GetSslRole_w(rtc::SSLRole* ssl_role) const {
+    DCHECK(Base::worker_thread()->IsCurrent());
     ASSERT(ssl_role != NULL);
     *ssl_role = secure_role_;
     return true;
   }
 
  private:
   virtual bool ApplyNegotiatedTransportDescription_w(
       TransportChannelImpl* channel,
       std::string* error_desc) {
+    DCHECK(Base::worker_thread()->IsCurrent());
     // Set ssl role. Role must be set before fingerprint is applied, which
     // initiates DTLS setup.
     if (!channel->SetSslRole(secure_role_)) {
       return BadTransportDescription("Failed to set ssl role for the channel.",
                                      error_desc);
     }
     // Apply remote fingerprint.
     if (!channel->SetRemoteFingerprint(
             remote_fingerprint_->algorithm,
             reinterpret_cast<const uint8*>(remote_fingerprint_->digest.data()),
             remote_fingerprint_->digest.size())) {
       return BadTransportDescription("Failed to apply remote fingerprint.",
                                      error_desc);
     }
     return Base::ApplyNegotiatedTransportDescription_w(channel, error_desc);
   }
 
-  rtc::SSLIdentity* identity_;
+  rtc::scoped_refptr<rtc::RTCCertificate> certificate_;
   rtc::SSLRole secure_role_;
   rtc::SSLProtocolVersion ssl_max_version_;
   rtc::scoped_ptr<rtc::SSLFingerprint> remote_fingerprint_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_DTLSTRANSPORT_H_