Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_cdsa_client / lib / cssmclient.cpp

diff --git a/OSX/libsecurity_cdsa_client/lib/cssmclient.cpp b/OSX/libsecurity_cdsa_client/lib/cssmclient.cpp
index 05a59c49bb5a4196b98f6e553cf16bd2ca8a0e73..bf2fccfa8bf6035472b522616cd83ae2178c2f88 100644 (file)
--- a/OSX/libsecurity_cdsa_client/lib/cssmclient.cpp
+++ b/OSX/libsecurity_cdsa_client/lib/cssmclient.cpp
@@ -30,7 +30,7 @@
 // and thus don't need to be interlocked explicitly.
 //
 #include <security_cdsa_client/cssmclient.h>
 // and thus don't need to be interlocked explicitly.
 //
 #include <security_cdsa_client/cssmclient.h>

-#include <syslog.h>
+#include <utilities/debugging.h>

 
 using namespace CssmClient;
 
 
 using namespace CssmClient;
 


@@ -38,7 +38,7 @@ using namespace CssmClient;
 // Exception model
 //
 const char *
 // Exception model
 //
 const char *

-Error::what () const throw()
+Error::what () const _NOEXCEPT

 {
        return "CSSM client library error";
 }
 {
        return "CSSM client library error";
 }


@@ -80,7 +80,7 @@ try
     if (!isIdle())
     {
         int i = mChildCount;
     if (!isIdle())
     {
         int i = mChildCount;

-        syslog(LOG_ALERT, "Object %p still has %d children at delete.\n", this, i);
+        secerror("Object %p still has %d children at delete.\n", this, i);

     }
                
        // release parent from her obligations (if we still have one)
     }
                
        // release parent from her obligations (if we still have one)


@@ -89,7 +89,7 @@ try
 }
 catch(...)
 {
 }
 catch(...)
 {

-       return;
+    return;    // Prevent re-throw of exception [function-try-block]

 }
 
 void
 }
 
 void


@@ -111,6 +111,7 @@ ObjectImpl::removeChild()
 Allocator &
 ObjectImpl::allocator() const
 {
 Allocator &
 ObjectImpl::allocator() const
 {

+    StLock<Mutex> _(mAllocatorMutex);

        if (mAllocator == NULL)
        {
                // fix allocator now
        if (mAllocator == NULL)
        {
                // fix allocator now


@@ -126,6 +127,7 @@ ObjectImpl::allocator() const
 void
 ObjectImpl::allocator(Allocator &alloc)
 {
 void
 ObjectImpl::allocator(Allocator &alloc)
 {

+    StLock<Mutex> _(mAllocatorMutex);

        assert(mAllocator == NULL);     // cannot redefine allocator once set
        mAllocator = &alloc;
 }
        assert(mAllocator == NULL);     // cannot redefine allocator once set
        mAllocator = &alloc;
 }


@@ -269,13 +271,13 @@ void CssmImpl::StandardCssm::unsetCssm(CssmImpl *cssm)
         mCssm = NULL;
 }
 
         mCssm = NULL;
 }
 

-CssmImpl *CssmImpl::StandardCssm::get()
+Cssm CssmImpl::StandardCssm::get()

 {
     StLock<Mutex> _(*this);
     if (mCssm == NULL) {       // make the default instance
         mCssm = new CssmImpl(true);
     }
 {
     StLock<Mutex> _(*this);
     if (mCssm == NULL) {       // make the default instance
         mCssm = new CssmImpl(true);
     }

-    return mCssm;
+    return Cssm(mCssm);

 }
 
 CssmImpl::StandardCssm::~StandardCssm()
 }
 
 CssmImpl::StandardCssm::~StandardCssm()


@@ -383,7 +385,7 @@ void ModuleEvents::fault(uint32 subService, CSSM_SERVICE_TYPE type) { }
 void
 ModuleImpl::appNotifyCallback(CSSM_API_ModuleEventHandler appNotifyCallback, void *appNotifyCallbackCtx)
 {
 void
 ModuleImpl::appNotifyCallback(CSSM_API_ModuleEventHandler appNotifyCallback, void *appNotifyCallbackCtx)
 {

-       secdebug("callback","In ModuleImpl::appNotifyCallback, appNotifyCallback=%p, appNotifyCallbackCtx=%p",
+       secinfo("callback","In ModuleImpl::appNotifyCallback, appNotifyCallback=%p, appNotifyCallbackCtx=%p",

                appNotifyCallback, appNotifyCallbackCtx);
        if (mActive)
                Error::throwMe(Error::objectBusy);
                appNotifyCallback, appNotifyCallbackCtx);
        if (mActive)
                Error::throwMe(Error::objectBusy);


@@ -407,7 +409,7 @@ ModuleImpl::activate()
         {
             session()->init();
             // @@@ install handler here (use central dispatch with override)
         {
             session()->init();
             // @@@ install handler here (use central dispatch with override)

-            secdebug("callback","In ModuleImpl::activate, mAppNotifyCallback=%p, mAppNotifyCallbackCtx=%p",
+            secinfo("callback","In ModuleImpl::activate, mAppNotifyCallback=%p, mAppNotifyCallbackCtx=%p",

                 mAppNotifyCallback, mAppNotifyCallbackCtx);
             check(CSSM_ModuleLoad(&guid(), CSSM_KEY_HIERARCHY_NONE, mAppNotifyCallback, mAppNotifyCallbackCtx));
             mActive = true;
                 mAppNotifyCallback, mAppNotifyCallbackCtx);
             check(CSSM_ModuleLoad(&guid(), CSSM_KEY_HIERARCHY_NONE, mAppNotifyCallback, mAppNotifyCallbackCtx));
             mActive = true;


@@ -456,9 +458,13 @@ AttachmentImpl::AttachmentImpl(const Module &module, CSSM_SERVICE_TYPE subservic
 }
 
 AttachmentImpl::~AttachmentImpl()
 }
 
 AttachmentImpl::~AttachmentImpl()

+try

 {
        detach();
 }
 {
        detach();
 }

+catch (...) {
+    return;
+}

 
 void
 AttachmentImpl::make(CSSM_SERVICE_TYPE subserviceType)
 
 void
 AttachmentImpl::make(CSSM_SERVICE_TYPE subserviceType)