Security-163.tar.gz

[apple/security.git] / Keychain / Access.h

diff --git a/Keychain/Access.h b/Keychain/Access.h
index 59f90802aa69a610a06c5b22a2b980c6c91116d3..ca2acd7b64532b57e913a874562da4a7f523fb1c 100644 (file)
--- a/Keychain/Access.h
+++ b/Keychain/Access.h
@@ -39,6 +39,8 @@ using CssmClient::AclBearer;
 class Access : public SecCFObject {
        NOCOPY(Access)
 public:
 class Access : public SecCFObject {
        NOCOPY(Access)
 public:

+       SECCFFUNCTIONS(Access, SecAccessRef, errSecInvalidItemRef)
+

        class Maker {
                NOCOPY(Maker)
                static const size_t keySize = 16;       // number of (random) bytes
        class Maker {
                NOCOPY(Maker)
                static const size_t keySize = 16;       // number of (random) bytes


@@ -75,8 +77,7 @@ public:
        // make from CSSM layer information (presumably retrieved by caller)
        Access(const CSSM_ACL_OWNER_PROTOTYPE &owner,
                uint32 aclCount, const CSSM_ACL_ENTRY_INFO *acls);
        // make from CSSM layer information (presumably retrieved by caller)
        Access(const CSSM_ACL_OWNER_PROTOTYPE &owner,
                uint32 aclCount, const CSSM_ACL_ENTRY_INFO *acls);

-
-    virtual ~Access();
+    virtual ~Access() throw();

 
 public:
        CFArrayRef copySecACLs() const;
 
 public:
        CFArrayRef copySecACLs() const;


@@ -101,6 +102,9 @@ public:
        
        void addApplicationToRight(AclAuthorization right, TrustedApplication *app);
        
        
        void addApplicationToRight(AclAuthorization right, TrustedApplication *app);
        

+       void copyOwnerAndAcl(CSSM_ACL_OWNER_PROTOTYPE * &owner,
+               uint32 &aclCount, CSSM_ACL_ENTRY_INFO * &acls);
+       

 protected:
     void makeStandard(const string &description, const ACL::ApplicationList &trusted,
                const AclAuthorizationSet &limitedRights = AclAuthorizationSet(),
 protected:
     void makeStandard(const string &description, const ACL::ApplicationList &trusted,
                const AclAuthorizationSet &limitedRights = AclAuthorizationSet(),


@@ -112,7 +116,7 @@ protected:
 
 private:
        static const CSSM_ACL_HANDLE ownerHandle = ACL::ownerHandle;
 
 private:
        static const CSSM_ACL_HANDLE ownerHandle = ACL::ownerHandle;

-       typedef map<CSSM_ACL_HANDLE, RefPointer<ACL> > Map;
+       typedef map<CSSM_ACL_HANDLE, SecPointer<ACL> > Map;

 
        Map mAcls;                      // set of ACL entries
 };
 
        Map mAcls;                      // set of ACL entries
 };