Security-58286.31.2.tar.gz

[apple/security.git] / OSX / libsecurity_codesigning / lib / CodeSigner.h

diff --git a/OSX/libsecurity_codesigning/lib/CodeSigner.h b/OSX/libsecurity_codesigning/lib/CodeSigner.h
index c17c5801c4e9c3461faeb2665cfff856b370ffab..e9e41d288ca3acfd31e20902553d19f700122438 100644 (file)
--- a/OSX/libsecurity_codesigning/lib/CodeSigner.h
+++ b/OSX/libsecurity_codesigning/lib/CodeSigner.h
@@ -41,7 +41,7 @@ namespace CodeSigning {
 // A SecCode object represents running code in the system. It must be subclassed
 // to implement a particular notion of code.
 //
 // A SecCode object represents running code in the system. It must be subclassed
 // to implement a particular notion of code.
 //

-class SecCodeSigner : public SecCFObject, public DiskRep::SigningContext {
+class SecCodeSigner : public SecCFObject {

        NOCOPY(SecCodeSigner)
 public:
        class Parser;
        NOCOPY(SecCodeSigner)
 public:
        class Parser;


@@ -62,13 +62,10 @@ public:
        void remove(SecStaticCode *code, SecCSFlags flags);
        
        void returnDetachedSignature(BlobCore *blob, Signer &signer);
        void remove(SecStaticCode *code, SecCSFlags flags);
        
        void returnDetachedSignature(BlobCore *blob, Signer &signer);

-
-protected:
-       std::string sdkPath(const std::string &path) const;
-       bool isAdhoc() const;
-       SecCSFlags signingFlags() const;

        
        

-private:
+       const CodeDirectory::HashAlgorithms &digestAlgorithms() const { return mDigestAlgorithms; }
+       
+public:

        // parsed parameter set
        SecCSFlags mOpFlags;                    // operation flags
        CFRef<SecIdentityRef> mSigner;  // signing identity
        // parsed parameter set
        SecCSFlags mOpFlags;                    // operation flags
        CFRef<SecIdentityRef> mSigner;  // signing identity


@@ -83,7 +80,7 @@ private:
        uint32_t mCdFlags;                              // CodeDirectory flags
        uint32_t mPreserveMetadata;             // metadata preservation options
        bool mCdFlagsGiven;                             // CodeDirectory flags were specified
        uint32_t mCdFlags;                              // CodeDirectory flags
        uint32_t mPreserveMetadata;             // metadata preservation options
        bool mCdFlagsGiven;                             // CodeDirectory flags were specified

-       CodeDirectory::HashAlgorithm mDigestAlgorithm; // interior digest (hash) algorithm
+       CodeDirectory::HashAlgorithms mDigestAlgorithms; // interior digest (hash) algorithm

        std::string mIdentifier;                // unique identifier override
        std::string mIdentifierPrefix;  // prefix for un-dotted default identifiers
        std::string mTeamID;            // teamID
        std::string mIdentifier;                // unique identifier override
        std::string mIdentifierPrefix;  // prefix for un-dotted default identifiers
        std::string mTeamID;            // teamID