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 5e5dbb7b3a5701b5ef2e05de304b73884930c10b..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 "SecBridge.h"
 

+#include "LegacyAPICounts.h"
+

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


@@ -89,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;


@@ -156,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;


@@ -208,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;


@@ -248,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)
        {


@@ -310,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;