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 fabae2419c8e9a9570ea7bf12840662edfa0a53e..23cb241351302292056a7bfd142d395e5532ce49 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecACL.cpp
+++ b/OSX/libsecurity_keychain/lib/SecACL.cpp
@@ -26,8 +26,12 @@
 #include <security_keychain/Access.h>
 #include <security_keychain/SecAccessPriv.h>
 
 #include <security_keychain/Access.h>
 #include <security_keychain/SecAccessPriv.h>
 

+#include <os/activity.h>
+

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

+#include "LegacyAPICounts.h"
+

 // Forward reference
 /*!
        @function GetACLAuthorizationTagFromString
 // Forward reference
 /*!
        @function GetACLAuthorizationTagFromString


@@ -63,6 +67,9 @@ OSStatus SecACLCreateFromSimpleContents(SecAccessRef accessRef,
        SecACLRef *newAcl)
 {
        BEGIN_SECAPI
        SecACLRef *newAcl)
 {
        BEGIN_SECAPI

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

        SecPointer<Access> access = Access::required(accessRef);
        SecPointer<ACL> acl = new ACL(cfString(description), *promptSelector);
        if (applicationList) {
        SecPointer<Access> access = Access::required(accessRef);
        SecPointer<ACL> acl = new ACL(cfString(description), *promptSelector);
        if (applicationList) {


@@ -84,6 +91,7 @@ OSStatus SecACLCreateWithSimpleContents(SecAccessRef access,
                                                                                SecKeychainPromptSelector promptSelector,
                                                                                SecACLRef *newAcl)
 {
                                                                                SecKeychainPromptSelector promptSelector,
                                                                                SecACLRef *newAcl)
 {

+       COUNTLEGACYAPI

        CSSM_ACL_KEYCHAIN_PROMPT_SELECTOR cdsaPromptSelector;
        cdsaPromptSelector.version = CSSM_ACL_KEYCHAIN_PROMPT_CURRENT_VERSION;
        cdsaPromptSelector.flags = promptSelector;
        CSSM_ACL_KEYCHAIN_PROMPT_SELECTOR cdsaPromptSelector;
        cdsaPromptSelector.version = CSSM_ACL_KEYCHAIN_PROMPT_CURRENT_VERSION;
        cdsaPromptSelector.flags = promptSelector;


@@ -96,6 +104,9 @@ OSStatus SecACLCreateWithSimpleContents(SecAccessRef access,
 OSStatus SecACLRemove(SecACLRef aclRef)
 {
        BEGIN_SECAPI
 OSStatus SecACLRemove(SecACLRef aclRef)
 {
        BEGIN_SECAPI

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

        ACL::required(aclRef)->remove();
        END_SECAPI
 }
        ACL::required(aclRef)->remove();
        END_SECAPI
 }


@@ -148,6 +159,7 @@ OSStatus SecACLCopyContents(SecACLRef acl,
                                                        CFStringRef *description, 
                                                        SecKeychainPromptSelector *promptSelector)
 {
                                                        CFStringRef *description, 
                                                        SecKeychainPromptSelector *promptSelector)
 {

+       COUNTLEGACYAPI

        CSSM_ACL_KEYCHAIN_PROMPT_SELECTOR cdsaPromptSelector;
        memset(&cdsaPromptSelector, 0, sizeof(cdsaPromptSelector));
        OSStatus err = errSecSuccess;
        CSSM_ACL_KEYCHAIN_PROMPT_SELECTOR cdsaPromptSelector;
        memset(&cdsaPromptSelector, 0, sizeof(cdsaPromptSelector));
        OSStatus err = errSecSuccess;


@@ -162,6 +174,9 @@ OSStatus SecACLSetSimpleContents(SecACLRef aclRef,
        CFStringRef description, const CSSM_ACL_KEYCHAIN_PROMPT_SELECTOR *promptSelector)
 {
        BEGIN_SECAPI
        CFStringRef description, const CSSM_ACL_KEYCHAIN_PROMPT_SELECTOR *promptSelector)
 {
        BEGIN_SECAPI

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

        SecPointer<ACL> acl = ACL::required(aclRef);
     if(acl->form() == ACL::integrityForm) {
         // If this is an integrity ACL, route the (unhexified) promptDescription into the right place
        SecPointer<ACL> acl = ACL::required(aclRef);
     if(acl->form() == ACL::integrityForm) {
         // If this is an integrity ACL, route the (unhexified) promptDescription into the right place


@@ -197,6 +212,7 @@ OSStatus SecACLSetContents(SecACLRef acl,
                                                   CFStringRef description, 
                                                   SecKeychainPromptSelector promptSelector)
 {
                                                   CFStringRef description, 
                                                   SecKeychainPromptSelector promptSelector)
 {

+       COUNTLEGACYAPI

        CSSM_ACL_KEYCHAIN_PROMPT_SELECTOR cdsaPromptSelector;
        cdsaPromptSelector.version = CSSM_ACL_PROCESS_SELECTOR_CURRENT_VERSION;
        cdsaPromptSelector.flags = promptSelector;
        CSSM_ACL_KEYCHAIN_PROMPT_SELECTOR cdsaPromptSelector;
        cdsaPromptSelector.version = CSSM_ACL_PROCESS_SELECTOR_CURRENT_VERSION;
        cdsaPromptSelector.flags = promptSelector;


@@ -237,6 +253,7 @@ OSStatus SecACLGetAuthorizations(SecACLRef acl,
 
 CFArrayRef SecACLCopyAuthorizations(SecACLRef acl)
 {
 
 CFArrayRef SecACLCopyAuthorizations(SecACLRef acl)
 {

+       COUNTLEGACYAPI

        CFArrayRef result = NULL;
        if (NULL == acl)
        {
        CFArrayRef result = NULL;
        if (NULL == acl)
        {


@@ -284,6 +301,9 @@ OSStatus SecACLSetAuthorizations(SecACLRef aclRef,
        CSSM_ACL_AUTHORIZATION_TAG *tags, uint32 tagCount)
 {
        BEGIN_SECAPI
        CSSM_ACL_AUTHORIZATION_TAG *tags, uint32 tagCount)
 {
        BEGIN_SECAPI

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

        SecPointer<ACL> acl = ACL::required(aclRef);
        if (acl->isOwner())             // can't change rights of the owner ACL
                MacOSError::throwMe(errSecInvalidOwnerEdit);
        SecPointer<ACL> acl = ACL::required(aclRef);
        if (acl->isOwner())             // can't change rights of the owner ACL
                MacOSError::throwMe(errSecInvalidOwnerEdit);


@@ -296,6 +316,7 @@ OSStatus SecACLSetAuthorizations(SecACLRef aclRef,
 
 OSStatus SecACLUpdateAuthorizations(SecACLRef acl, CFArrayRef authorizations)
 {
 
 OSStatus SecACLUpdateAuthorizations(SecACLRef acl, CFArrayRef authorizations)
 {

+       COUNTLEGACYAPI

        if (NULL == acl || NULL == authorizations)
        {
                return errSecParam;
        if (NULL == acl || NULL == authorizations)
        {
                return errSecParam;