Security-58286.260.20.tar.gz

[apple/security.git] / securityd / src / database.h

diff --git a/securityd/src/database.h b/securityd/src/database.h
index d065f41b7aaad7fe3e6e4b7a1ca35d9c8cafd2c9..7e077b4c7c8f2c71b01e86e2ede808bc368523a7 100644 (file)
--- a/securityd/src/database.h
+++ b/securityd/src/database.h
@@ -40,7 +40,6 @@
 #include <security_cdsa_utilities/u32handleobject.h>
 #include <security_cdsa_utilities/cssmdb.h>
 #include <security_utilities/machserver.h>
 #include <security_cdsa_utilities/u32handleobject.h>
 #include <security_cdsa_utilities/cssmdb.h>
 #include <security_utilities/machserver.h>

-#include <security_agent_client/agentclient.h>

 #include <security_utilities/timeflow.h>
 #include <string>
 #include <map>
 #include <security_utilities/timeflow.h>
 #include <string>
 #include <map>


@@ -71,6 +70,8 @@ public:
        
        virtual bool belongsToSystem() const; // belongs to system (root) security domain
 
        
        virtual bool belongsToSystem() const; // belongs to system (root) security domain
 

+    virtual uint32 dbVersion() = 0;     // For databases that have a concept of version, return the version
+

 protected:
        void notify(NotificationEvent event, const DLDbIdentifier &ident);
 };
 protected:
        void notify(NotificationEvent event, const DLDbIdentifier &ident);
 };


@@ -148,6 +149,9 @@ public:
                CssmData *param, uint32 usage, uint32 attrs, RefPointer<Key> &derivedKey) = 0;
 
        virtual void authenticate(CSSM_DB_ACCESS_TYPE mode, const AccessCredentials *cred);
                CssmData *param, uint32 usage, uint32 attrs, RefPointer<Key> &derivedKey) = 0;
 
        virtual void authenticate(CSSM_DB_ACCESS_TYPE mode, const AccessCredentials *cred);

+
+    // returns true if these credentials contain a valid password or master key for this database
+    virtual bool checkCredentials(const AccessCredentials *cred);

        virtual SecurityServerAcl &acl();
 
        virtual bool isLocked();
        virtual SecurityServerAcl &acl();
 
        virtual bool isLocked();


@@ -203,36 +207,15 @@ public:
        static const int maxUnlockTryCount = 3;
 
 public:
        static const int maxUnlockTryCount = 3;
 
 public:

+    bool hasCommon() const;

        DbCommon& common() const                        { return parent<DbCommon>(); }
        virtual const char *dbName() const = 0;
        virtual void dbName(const char *name);
        DbCommon& common() const                        { return parent<DbCommon>(); }
        virtual const char *dbName() const = 0;
        virtual void dbName(const char *name);

-};
-
-
-//
-// This class implements a "system keychain unlock record" store
-//
-class SystemKeychainKey {
-public:
-       SystemKeychainKey(const char *path);
-       ~SystemKeychainKey();
-       
-       bool matches(const DbBlob::Signature &signature);
-       CssmKey &key()          { return mKey; }

 
 

-private:
-       std::string mPath;                                      // path to file
-       CssmKey mKey;                                           // proper CssmKey with data in mBlob
+    virtual uint32 dbVersion() { return common().dbVersion(); }

 
 

-       bool mValid;                                            // mBlob was validly read from mPath
-       UnlockBlob mBlob;                                       // contents of mPath as last read
-       
-       Time::Absolute mCachedDate;                     // modify date of file when last read
-       Time::Absolute mUpdateThreshold;        // cutoff threshold for checking again
-       
-       static const int checkDelay = 1;        // seconds minimum delay between update checks
-       
-       bool update();
+    // Check if this database is in the middle of a recode/migration
+    virtual bool isRecoding() { return false; }

 };
 
 #endif //_H_DATABASE
 };
 
 #endif //_H_DATABASE