Security-58286.70.7.tar.gz

[apple/security.git] / OSX / libsecurity_apple_csp / lib / AppleCSP.cpp

diff --git a/OSX/libsecurity_apple_csp/lib/AppleCSP.cpp b/OSX/libsecurity_apple_csp/lib/AppleCSP.cpp
index ec9e78ca3dcaca1ae0a6d497680a10cb4ed27631..db9a4bee56ba44290227cb7646c8ab096129331b 100644 (file)
--- a/OSX/libsecurity_apple_csp/lib/AppleCSP.cpp
+++ b/OSX/libsecurity_apple_csp/lib/AppleCSP.cpp
@@ -106,7 +106,6 @@ PluginSession *AppleCSPPlugin::makeSession(
                                upcalls);
         default:
             CssmError::throwMe(CSSMERR_CSSM_INVALID_SERVICE_MASK);
                                upcalls);
         default:
             CssmError::throwMe(CSSMERR_CSSM_INVALID_SERVICE_MASK);

-            return 0;  // placebo

     }
 }
 
     }
 }
 


@@ -244,9 +243,6 @@ bool AppleCSPSession::setup(
                default:
                        return false;
        }
                default:
                        return false;
        }

-       /* NOT REACHED */
-       return false;
-

 }
 
 //
 }
 
 //


@@ -378,7 +374,7 @@ void AppleCSPSession::addRefKey(
        cssmKey.KeyHeader.BlobType = CSSM_KEYBLOB_REFERENCE;
        cssmKey.KeyHeader.Format = CSSM_KEYBLOB_REF_FORMAT_INTEGER;
        keyRefToCssmData(keyRef, cssmKey.KeyData, normAllocator);
        cssmKey.KeyHeader.BlobType = CSSM_KEYBLOB_REFERENCE;
        cssmKey.KeyHeader.Format = CSSM_KEYBLOB_REF_FORMAT_INTEGER;
        keyRefToCssmData(keyRef, cssmKey.KeyData, normAllocator);

-       secdebug("freeKey", "CSP addRefKey key %p keyData %p keyRef %p", 
+       secinfo("freeKey", "CSP addRefKey key %p keyData %p keyRef %p", 

                &cssmKey, cssmKey.KeyData.Data, &binKey);
 }
        
                &cssmKey, cssmKey.KeyData.Data, &binKey);
 }
        


@@ -432,7 +428,7 @@ void AppleCSPSession::FreeKey(
                        StLock<Mutex> _(refKeyMapLock);
                        BinaryKey *binKey = lookupKeyRef(keyRef);
                        if(binKey != NULL) {
                        StLock<Mutex> _(refKeyMapLock);
                        BinaryKey *binKey = lookupKeyRef(keyRef);
                        if(binKey != NULL) {

-                               secdebug("freeKey", "CSP FreeKey key %p keyData %p binKey %p", 
+                               secinfo("freeKey", "CSP FreeKey key %p keyData %p binKey %p", 

                                        &KeyPtr, KeyPtr.KeyData.Data, binKey);
                                try {
                                        refKeyMap.erase(keyRef);
                                        &KeyPtr, KeyPtr.KeyData.Data, binKey);
                                try {
                                        refKeyMap.erase(keyRef);


@@ -444,7 +440,7 @@ void AppleCSPSession::FreeKey(
                                }
                        }
                        else {
                                }
                        }
                        else {

-                               secdebug("freeKey", "CSP freeKey unknown key");
+                               secinfo("freeKey", "CSP freeKey unknown key");

                        }
                }
        }
                        }
                }
        }