Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_sd_cspdl / lib / SDCSPSession.cpp

diff --git a/OSX/libsecurity_sd_cspdl/lib/SDCSPSession.cpp b/OSX/libsecurity_sd_cspdl/lib/SDCSPSession.cpp
index 8a29dba73231208d3b81ec728017e385115d88df..802f98e6a320743f431a46bc37f6b46b091b2dc9 100644 (file)
--- a/OSX/libsecurity_sd_cspdl/lib/SDCSPSession.cpp
+++ b/OSX/libsecurity_sd_cspdl/lib/SDCSPSession.cpp
@@ -337,8 +337,8 @@ SDCSPSession::ObtainPrivateKeyFromPublicKey(const CssmKey &PublicKey,
 
 void
 SDCSPSession::QueryKeySizeInBits(CSSM_CC_HANDLE CCHandle,
 
 void
 SDCSPSession::QueryKeySizeInBits(CSSM_CC_HANDLE CCHandle,

-                                                                const Context &Context,
-                                                                const CssmKey &Key,
+                                                                const Context *Context,
+                                                                const CssmKey *Key,

                                                                 CSSM_KEY_SIZE &KeySize)
 {
        unimplemented();
                                                                 CSSM_KEY_SIZE &KeySize)
 {
        unimplemented();


@@ -360,9 +360,9 @@ SDCSPSession::FreeKey(const AccessCredentials *accessCred,
                // that!
 
                // Find the key in the map.  Tell tell the key to free itself
                // that!
 
                // Find the key in the map.  Tell tell the key to free itself

-               // (when the auto_ptr deletes the key it removes itself from the map). 
-           secdebug("freeKey", "CSPDL FreeKey");
-               auto_ptr<SDKey> ssKey(&mSDCSPDLSession.find<SDKey>(ioKey));
+               // (when the unique_ptr deletes the key it removes itself from the map). 
+           secinfo("freeKey", "CSPDL FreeKey");
+               unique_ptr<SDKey> ssKey(&mSDCSPDLSession.find<SDKey>(ioKey));

                ssKey->free(accessCred, ioKey, deleteKey);
        }
        else
                ssKey->free(accessCred, ioKey, deleteKey);
        }
        else