Added DtlsCertificate, a ref counted object owning an SSLIdentity

webrtc/base/nssstreamadapter.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 472 matching lines @@
     rv = SSL_GetClientAuthDataHook(ssl_fd_, GetClientAuthDataHook,
                                    this);
     if (rv != SECSuccess) {
       Error("BeginSSL", -1, false);
       return -1;
     }
   } else {
     LOG(LS_INFO) << "BeginSSL: as server";
     NSSIdentity *identity;
 
-    if (identity_.get()) {
-      identity = static_cast<NSSIdentity *>(identity_.get());
+    if (dtlscertificate_.get()) {
+      identity = static_cast<NSSIdentity *>(dtlscertificate_->identity());
     } else {
       LOG(LS_ERROR) << "Can't be an SSL server without an identity";
       Error("BeginSSL", -1, false);
       return -1;
     }
     rv = SSL_ConfigSecureServer(ssl_fd_, identity->certificate().certificate(),
                                 identity->keypair()->privkey(),
                                 identity->keypair()->ssl_kea_type());
     if (rv != SECSuccess) {
       Error("BeginSSL", -1, false);
@@ skipping 150 matching lines @@
 void NSSStreamAdapter::Cleanup() {
   if (state_ != SSL_ERROR) {
     state_ = SSL_CLOSED;
   }
 
   if (ssl_fd_) {
     PR_Close(ssl_fd_);
     ssl_fd_ = NULL;
   }
 
-  identity_.reset();
+  dtlscertificate_ = nullptr;
   peer_certificate_.reset();
 
   Thread::Current()->Clear(this, MSG_DTLS_TIMEOUT);
 }
 
 bool NSSStreamAdapter::GetDigestLength(const std::string& algorithm,
                                        size_t* length) {
   return NSSCertificate::GetDigestLength(algorithm, length);
 }
 
@@ skipping 233 matching lines @@
 }
 
 
 SECStatus NSSStreamAdapter::GetClientAuthDataHook(void *arg, PRFileDesc *fd,
                                                   CERTDistNames *caNames,
                                                   CERTCertificate **pRetCert,
                                                   SECKEYPrivateKey **pRetKey) {
   LOG(LS_INFO) << "Client cert requested";
   NSSStreamAdapter *stream = reinterpret_cast<NSSStreamAdapter *>(arg);
 
-  if (!stream->identity_.get()) {
+  if (!stream->dtlscertificate_.get()) {
     LOG(LS_ERROR) << "No identity available";
     return SECFailure;
   }
 
-  NSSIdentity *identity = static_cast<NSSIdentity *>(stream->identity_.get());
+  NSSIdentity *identity = static_cast<NSSIdentity *>(
+      stream->dtlscertificate_->identity());
   // Destroyed internally by NSS
   *pRetCert = CERT_DupCertificate(identity->certificate().certificate());
   *pRetKey = SECKEY_CopyPrivateKey(identity->keypair()->privkey());
 
   return SECSuccess;
 }
 
 bool NSSStreamAdapter::GetSslCipher(std::string* cipher) {
   ASSERT(state_ == SSL_CONNECTED);
   if (state_ != SSL_CONNECTED)
@@ skipping 183 matching lines @@
         return kDefaultSslEcCipher12;
     }
   } else {
     return std::string();
   }
 }
 
 }  // namespace rtc
 
 #endif  // HAVE_NSS_SSL_H