Security-163.tar.gz

[apple/security.git] / cdsa / cdsa_client / aclclient.h

diff --git a/cdsa/cdsa_client/aclclient.h b/cdsa/cdsa_client/aclclient.h
index 8124bfbeb014cc6b67e68f582007fc99f6ff9c1f..81f56efaa275da14200d0f1d7340132d5c552111 100644 (file)
--- a/cdsa/cdsa_client/aclclient.h
+++ b/cdsa/cdsa_client/aclclient.h
@@ -23,6 +23,7 @@
 #define _H_CDSA_CLIENT_ACLCLIENT  1
 
 #include <Security/cssmaclpod.h>
+#include <Security/cssmacl.h>
 #include <Security/cssmcred.h>
 #include <Security/refcount.h>
 #include <Security/globalizer.h>
@@ -78,21 +79,43 @@ public:
        const AccessCredentials *promptCred() const;
        const AccessCredentials *unlockCred() const;
 
-public:
-    // HHS password change credentials are used, amazingly enough, to change passwords...
-    class PasswordChangeCredentials
-    {
+protected:
+       class KeychainCredentials {
+       public:
+               KeychainCredentials(CssmAllocator &alloc)
+                       : allocator(alloc), mCredentials(new AutoCredentials(alloc)) { }
+               virtual ~KeychainCredentials();
+
+               CssmAllocator &allocator;
+
+        operator const AccessCredentials* () { return mCredentials; }
+       
     protected:
-        AutoCredentials* mCredentials;
-        CssmAllocator& mAllocator;
+               AutoCredentials *mCredentials;
+       };
     
+public:
+    // create a self-managed AccessCredentials to explicitly provide a keychain passphrase
+    class PassphraseUnlockCredentials : public KeychainCredentials {
     public:
-        PasswordChangeCredentials (const CssmData& password,
-                                   CssmAllocator& allocator);
-        ~PasswordChangeCredentials ();
+        PassphraseUnlockCredentials (const CssmData& password, CssmAllocator& allocator);
+    };
         
-        operator const AccessCredentials* () {return mCredentials;}
+       // create a self-managed AccessCredentials to change a keychain passphrase
+    class PasswordChangeCredentials : public KeychainCredentials {
+    public:
+        PasswordChangeCredentials (const CssmData& password, CssmAllocator& allocator);
     };
+       
+public:
+       class AnyResourceContext : public ResourceControlContext {
+       public:
+               AnyResourceContext(const CSSM_ACCESS_CREDENTIALS *cred = NULL);
+               
+       private:
+               ListElement mAny;
+               CSSM_ACL_AUTHORIZATION_TAG mTag;
+       };
 };