Security-59754.80.3.tar.gz

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

diff --git a/OSX/libsecurity_keychain/lib/SecACL.cpp b/OSX/libsecurity_keychain/lib/SecACL.cpp
index d91458b3c4d022c34b6b9b2b1986e357f038c0f9..23cb241351302292056a7bfd142d395e5532ce49 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecACL.cpp
+++ b/OSX/libsecurity_keychain/lib/SecACL.cpp
@@ -30,6 +30,8 @@
 
 #include "SecBridge.h"
 
+#include "LegacyAPICounts.h"
+
 // Forward reference
 /*!
        @function GetACLAuthorizationTagFromString
@@ -50,9 +52,6 @@ CFTypeID
 SecACLGetTypeID(void)
 {
        BEGIN_SECAPI
-    os_activity_t activity = os_activity_create("SecACLGetTypeID", OS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_IF_NONE_PRESENT);
-    os_activity_scope(activity);
-    os_release(activity);
 
        return gTypes().ACL.typeID;
 
@@ -92,6 +91,7 @@ OSStatus SecACLCreateWithSimpleContents(SecAccessRef access,
                                                                                SecKeychainPromptSelector promptSelector,
                                                                                SecACLRef *newAcl)
 {
+       COUNTLEGACYAPI
        CSSM_ACL_KEYCHAIN_PROMPT_SELECTOR cdsaPromptSelector;
        cdsaPromptSelector.version = CSSM_ACL_KEYCHAIN_PROMPT_CURRENT_VERSION;
        cdsaPromptSelector.flags = promptSelector;
@@ -159,6 +159,7 @@ OSStatus SecACLCopyContents(SecACLRef acl,
                                                        CFStringRef *description, 
                                                        SecKeychainPromptSelector *promptSelector)
 {
+       COUNTLEGACYAPI
        CSSM_ACL_KEYCHAIN_PROMPT_SELECTOR cdsaPromptSelector;
        memset(&cdsaPromptSelector, 0, sizeof(cdsaPromptSelector));
        OSStatus err = errSecSuccess;
@@ -211,6 +212,7 @@ OSStatus SecACLSetContents(SecACLRef acl,
                                                   CFStringRef description, 
                                                   SecKeychainPromptSelector promptSelector)
 {
+       COUNTLEGACYAPI
        CSSM_ACL_KEYCHAIN_PROMPT_SELECTOR cdsaPromptSelector;
        cdsaPromptSelector.version = CSSM_ACL_PROCESS_SELECTOR_CURRENT_VERSION;
        cdsaPromptSelector.flags = promptSelector;
@@ -251,6 +253,7 @@ OSStatus SecACLGetAuthorizations(SecACLRef acl,
 
 CFArrayRef SecACLCopyAuthorizations(SecACLRef acl)
 {
+       COUNTLEGACYAPI
        CFArrayRef result = NULL;
        if (NULL == acl)
        {
@@ -313,6 +316,7 @@ OSStatus SecACLSetAuthorizations(SecACLRef aclRef,
 
 OSStatus SecACLUpdateAuthorizations(SecACLRef acl, CFArrayRef authorizations)
 {
+       COUNTLEGACYAPI
        if (NULL == acl || NULL == authorizations)
        {
                return errSecParam;