libsecurity_codesigning-55037.15.tar.gz

[apple/libsecurity_codesigning.git] / lib / reqinterp.h

diff --git a/lib/reqinterp.h b/lib/reqinterp.h
index ebeed8dcd985158d0ed0bb7ccd8e02e63cb76f32..ad1ddb8495e2b5ded914110d3856c64491eb6225 100644 (file)
--- a/lib/reqinterp.h
+++ b/lib/reqinterp.h
@@ -29,6 +29,7 @@
 
 #include <security_codesigning/reqreader.h>
 #include <Security/SecTrustSettings.h>
 
 #include <security_codesigning/reqreader.h>
 #include <Security/SecTrustSettings.h>

+#include <security_cdsa_utilities/cssmdata.h>  // CssmOid

 
 namespace Security {
 namespace CodeSigning {
 
 namespace Security {
 namespace CodeSigning {


@@ -40,7 +41,7 @@ namespace CodeSigning {
 //     
 class Requirement::Interpreter : public Requirement::Reader {  
 public:
 //     
 class Requirement::Interpreter : public Requirement::Reader {  
 public:

-       Interpreter(const Requirement *req, const Context *ctx);
+       Interpreter(const Requirement *req, const Context *ctx) : Reader(req), mContext(ctx) { }

        
        bool evaluate();
        
        
        bool evaluate();
        


@@ -49,7 +50,11 @@ protected:
        public:
                Match(Interpreter &interp);             // reads match postfix from interp
                Match(CFStringRef value, MatchOperation op) : mValue(value), mOp(op) { } // explicit
        public:
                Match(Interpreter &interp);             // reads match postfix from interp
                Match(CFStringRef value, MatchOperation op) : mValue(value), mOp(op) { } // explicit

+               Match() : mValue(NULL), mOp(matchExists) { } // explict test for presence

                bool operator () (CFTypeRef candidate) const; // match to candidate
                bool operator () (CFTypeRef candidate) const; // match to candidate

+
+       protected:
+               bool inequality(CFTypeRef candidate, CFStringCompareFlags flags, CFComparisonResult outcome, bool negate) const;

                
        private:
                CFCopyRef<CFStringRef> mValue;  // match value
                
        private:
                CFCopyRef<CFStringRef> mValue;  // match value


@@ -58,13 +63,19 @@ protected:
        
 protected:
        bool infoKeyValue(const std::string &key, const Match &match);
        
 protected:
        bool infoKeyValue(const std::string &key, const Match &match);

+       bool entitlementValue(const std::string &key, const Match &match);

        bool certFieldValue(const string &key, const Match &match, SecCertificateRef cert);
        bool certFieldValue(const string &key, const Match &match, SecCertificateRef cert);

+       bool certFieldGeneric(const string &key, const Match &match, SecCertificateRef cert);
+       bool certFieldGeneric(const CssmOid &oid, const Match &match, SecCertificateRef cert);
+       bool certFieldPolicy(const string &key, const Match &match, SecCertificateRef cert);
+       bool certFieldPolicy(const CssmOid &oid, const Match &match, SecCertificateRef cert);

        bool verifyAnchor(SecCertificateRef cert, const unsigned char *digest);
        bool appleSigned();
        bool verifyAnchor(SecCertificateRef cert, const unsigned char *digest);
        bool appleSigned();

+       bool appleAnchored();

        bool trustedCerts();
        bool trustedCert(int slot);
        
        bool trustedCerts();
        bool trustedCert(int slot);
        

-       SecTrustSettingsResult trustSetting(SecCertificateRef cert, bool isAnchor);
+       static SecTrustSettingsResult trustSetting(SecCertificateRef cert, bool isAnchor);

        
 private:
        const Context * const mContext;
        
 private:
        const Context * const mContext;