Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_keychain / lib / KeyItem.cpp

diff --git a/OSX/libsecurity_keychain/lib/KeyItem.cpp b/OSX/libsecurity_keychain/lib/KeyItem.cpp
index 6bec5672a6a0ef6bed4b9e19a4b54966630bb02b..1f079ff570819d6736db162f9b2bf50bb1a9c519 100644 (file)
--- a/OSX/libsecurity_keychain/lib/KeyItem.cpp
+++ b/OSX/libsecurity_keychain/lib/KeyItem.cpp
@@ -75,7 +75,7 @@ KeyItem *KeyItem::optional(SecKeyRef ptr)
     }
 }
 
     }
 }
 

-KeyItem::operator CFTypeRef() const throw()
+KeyItem::operator CFTypeRef() const _NOEXCEPT

 {
     StMaybeLock<Mutex> _(this->getMutexForObject());
 
 {
     StMaybeLock<Mutex> _(this->getMutexForObject());
 


@@ -758,8 +758,8 @@ KeyItem::createPair(
             pubKeyHash.set(*pubKeyHashData);
             passThrough.allocator().free(pubKeyHashData);
 
             pubKeyHash.set(*pubKeyHashData);
             passThrough.allocator().free(pubKeyHashData);
 

-            auto_ptr<string> privDescription;
-            auto_ptr<string> pubDescription;
+            unique_ptr<string> privDescription;
+            unique_ptr<string> pubDescription;

             try {
                 privDescription.reset(new string(initialAccess->promptDescription()));
                 pubDescription.reset(new string(initialAccess->promptDescription()));
             try {
                 privDescription.reset(new string(initialAccess->promptDescription()));
                 pubDescription.reset(new string(initialAccess->promptDescription()));


@@ -997,8 +997,8 @@ KeyItem::importPair(
                csp.allocator().free(cssmData->Data);
                csp.allocator().free(cssmData);
 
                csp.allocator().free(cssmData->Data);
                csp.allocator().free(cssmData);
 

-               auto_ptr<string>privDescription;
-               auto_ptr<string>pubDescription;
+               unique_ptr<string>privDescription;
+               unique_ptr<string>pubDescription;

                try {
                        privDescription.reset(new string(initialAccess->promptDescription()));
                        pubDescription.reset(new string(initialAccess->promptDescription()));
                try {
                        privDescription.reset(new string(initialAccess->promptDescription()));
                        pubDescription.reset(new string(initialAccess->promptDescription()));