Security-58286.260.20.tar.gz

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

diff --git a/OSX/libsecurity_keychain/lib/SecKeychainSearch.cpp b/OSX/libsecurity_keychain/lib/SecKeychainSearch.cpp
index 2ba38d91bdfe268ccb181521d280f4aa46b01790..5e94b58c025fe34c690845f3869e06ee382619e7 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecKeychainSearch.cpp
+++ b/OSX/libsecurity_keychain/lib/SecKeychainSearch.cpp
@@ -29,6 +29,7 @@
 #include <security_keychain/Item.h>
 #include <security_cdsa_utilities/Schema.h>
 #include <syslog.h>
 #include <security_keychain/Item.h>
 #include <security_cdsa_utilities/Schema.h>
 #include <syslog.h>

+#include <os/activity.h>

 
 #include "SecBridge.h"
 
 
 #include "SecBridge.h"
 


@@ -47,6 +48,9 @@ OSStatus
 SecKeychainSearchCreateFromAttributes(CFTypeRef keychainOrArray, SecItemClass itemClass, const SecKeychainAttributeList *attrList, SecKeychainSearchRef *searchRef)
 {
     BEGIN_SECAPI
 SecKeychainSearchCreateFromAttributes(CFTypeRef keychainOrArray, SecItemClass itemClass, const SecKeychainAttributeList *attrList, SecKeychainSearchRef *searchRef)
 {
     BEGIN_SECAPI

+    os_activity_t activity = os_activity_create("SecKeychainSearchCreateFromAttributes", OS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_IF_NONE_PRESENT);
+    os_activity_scope(activity);
+    os_release(activity);

 
        Required(searchRef);
 
 
        Required(searchRef);
 


@@ -63,6 +67,9 @@ OSStatus
 SecKeychainSearchCreateFromAttributesExtended(CFTypeRef keychainOrArray, SecItemClass itemClass, const SecKeychainAttributeList *attrList, CSSM_DB_CONJUNCTIVE dbConjunctive, CSSM_DB_OPERATOR dbOperator, SecKeychainSearchRef *searchRef)
 {
     BEGIN_SECAPI
 SecKeychainSearchCreateFromAttributesExtended(CFTypeRef keychainOrArray, SecItemClass itemClass, const SecKeychainAttributeList *attrList, CSSM_DB_CONJUNCTIVE dbConjunctive, CSSM_DB_OPERATOR dbOperator, SecKeychainSearchRef *searchRef)
 {
     BEGIN_SECAPI

+    os_activity_t activity = os_activity_create("SecKeychainSearchCreateFromAttributesExtended", OS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_IF_NONE_PRESENT);
+    os_activity_scope(activity);
+    os_release(activity);

 
        Required(searchRef); // Make sure that searchRef is an invalid SearchRef
 
 
        Required(searchRef); // Make sure that searchRef is an invalid SearchRef
 


@@ -81,6 +88,9 @@ OSStatus
 SecKeychainSearchCopyNext(SecKeychainSearchRef searchRef, SecKeychainItemRef *itemRef)
 {
        BEGIN_SECAPI
 SecKeychainSearchCopyNext(SecKeychainSearchRef searchRef, SecKeychainItemRef *itemRef)
 {
        BEGIN_SECAPI

+    os_activity_t activity = os_activity_create("SecKeychainSearchCopyNext", OS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_IF_NONE_PRESENT);
+    os_activity_scope(activity);
+    os_release(activity);

 
        RequiredParam(itemRef);
        Item item;
 
        RequiredParam(itemRef);
        Item item;


@@ -90,7 +100,6 @@ SecKeychainSearchCopyNext(SecKeychainSearchRef searchRef, SecKeychainItemRef *it
 
        *itemRef=item->handle();
 
 
        *itemRef=item->handle();
 

-#if SECTRUST_OSX

        bool itemChecked = false;
        do {
                /* see if we should convert outgoing item to a unified SecCertificateRef */
        bool itemChecked = false;
        do {
                /* see if we should convert outgoing item to a unified SecCertificateRef */


@@ -137,7 +146,6 @@ SecKeychainSearchCopyNext(SecKeychainSearchRef searchRef, SecKeychainItemRef *it
                /* never permit a NULL item reference to be returned without an error result */
                return errSecItemNotFound;
        }
                /* never permit a NULL item reference to be returned without an error result */
                return errSecItemNotFound;
        }

-#endif

 
        END_SECAPI
 }
 
        END_SECAPI
 }