Convert crypto to std::unique_ptr

crypto/ec_private_key_nss.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "crypto/ec_private_key.h"
 
 extern "C" {
 // Work around NSS missing SEC_BEGIN_PROTOS in secmodt.h.  This must come before
 // other NSS headers.
 #include <secmodt.h>
 }
 
 #include <cryptohi.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 #include <secmod.h>
 #include <stddef.h>
 #include <stdint.h>
 
+#include <memory>
+
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "crypto/nss_util.h"
 #include "crypto/nss_util_internal.h"
 #include "crypto/scoped_nss_types.h"
 #include "crypto/third_party/nss/chromium-nss.h"
 
 namespace {
 
 static bool AppendAttribute(SECKEYPrivateKey* key,
                             CK_ATTRIBUTE_TYPE type,
                             std::vector<uint8_t>* output) {
@@ skipping 22 matching lines @@
 }
 
 // static
 ECPrivateKey* ECPrivateKey::Create() {
   EnsureNSSInit();
 
   ScopedPK11Slot slot(PK11_GetInternalSlot());
   if (!slot)
     return nullptr;
 
-  scoped_ptr<ECPrivateKey> result(new ECPrivateKey);
+  std::unique_ptr<ECPrivateKey> result(new ECPrivateKey);
 
   SECOidData* oid_data = SECOID_FindOIDByTag(SEC_OID_SECG_EC_SECP256R1);
   if (!oid_data) {
     DLOG(ERROR) << "SECOID_FindOIDByTag: " << PORT_GetError();
     return nullptr;
   }
 
   // SECKEYECParams is a SECItem containing the DER encoded ASN.1 ECParameters
   // value.  For a named curve, that is just the OBJECT IDENTIFIER of the curve.
   // In addition to the oid data, the encoding requires one byte for the ASN.1
@@ skipping 29 matching lines @@
 ECPrivateKey* ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(
     const std::string& password,
     const std::vector<uint8_t>& encrypted_private_key_info,
     const std::vector<uint8_t>& subject_public_key_info) {
   EnsureNSSInit();
 
   ScopedPK11Slot slot(PK11_GetInternalSlot());
   if (!slot)
     return nullptr;
 
-  scoped_ptr<ECPrivateKey> result(new ECPrivateKey);
+  std::unique_ptr<ECPrivateKey> result(new ECPrivateKey);
 
   SECItem encoded_spki = {
     siBuffer,
     const_cast<unsigned char*>(&subject_public_key_info[0]),
     static_cast<unsigned>(subject_public_key_info.size())
   };
   CERTSubjectPublicKeyInfo* decoded_spki = SECKEY_DecodeDERSubjectPublicKeyInfo(
       &encoded_spki);
   if (!decoded_spki) {
     DLOG(ERROR) << "SECKEY_DecodeDERSubjectPublicKeyInfo: " << PORT_GetError();
@@ skipping 92 matching lines @@
                 << PORT_GetError();
     SECKEY_DestroyPublicKey(*public_key);
     *public_key = NULL;
     return false;
   }
 
   return true;
 }
 
 ECPrivateKey* ECPrivateKey::Copy() const {
-  scoped_ptr<ECPrivateKey> copy(new ECPrivateKey);
+  std::unique_ptr<ECPrivateKey> copy(new ECPrivateKey);
   if (key_) {
     copy->key_ = SECKEY_CopyPrivateKey(key_);
     if (!copy->key_)
       return NULL;
   }
   if (public_key_) {
     copy->public_key_ = SECKEY_CopyPublicKey(public_key_);
     if (!copy->public_key_)
       return NULL;
   }
@@ skipping 78 matching lines @@
   // parameters.
   output->clear();
   return AppendAttribute(key_, CKA_VALUE, output) &&
          output->size() == 32 &&
          AppendAttribute(key_, CKA_EC_PARAMS, output);
 }
 
 ECPrivateKey::ECPrivateKey() : key_(NULL), public_key_(NULL) {}
 
 }  // namespace crypto