Security-58286.20.16.tar.gz

[apple/security.git] / OSX / libsecurity_codesigning / lib / cdbuilder.cpp

diff --git a/OSX/libsecurity_codesigning/lib/cdbuilder.cpp b/OSX/libsecurity_codesigning/lib/cdbuilder.cpp
index c4e75a2e1e0656b6ef86c6b60404f1545131affe..babfe29c1603f114eee3a3fa5765f36601a360ac 100644 (file)
--- a/OSX/libsecurity_codesigning/lib/cdbuilder.cpp
+++ b/OSX/libsecurity_codesigning/lib/cdbuilder.cpp
@@ -47,6 +47,9 @@ CodeDirectory::Builder::Builder(HashAlgorithm digestAlgorithm)
          mCodeSlots(0),
          mScatter(NULL),
          mScatterSize(0),
          mCodeSlots(0),
          mScatter(NULL),
          mScatterSize(0),

+         mExecSegOffset(0),
+         mExecSegLimit(0),
+         mExecSegFlags(0),

          mDir(NULL)
 {
        mDigestLength = (uint32_t)MakeHash<Builder>(this)->digestLength();
          mDir(NULL)
 {
        mDigestLength = (uint32_t)MakeHash<Builder>(this)->digestLength();


@@ -115,9 +118,11 @@ CodeDirectory::Scatter *CodeDirectory::Builder::scatter(unsigned count)
 // the version chosen. We dynamically picked the least-needed version
 // to provide stability of virtual signatures.
 //
 // the version chosen. We dynamically picked the least-needed version
 // to provide stability of virtual signatures.
 //

-const size_t CodeDirectory::Builder::fixedSize(const uint32_t version)
+size_t CodeDirectory::Builder::fixedSize(const uint32_t version)

 {
        size_t cdSize = sizeof(CodeDirectory);
 {
        size_t cdSize = sizeof(CodeDirectory);

+       if (version < supportsExecSegment)
+               cdSize -= sizeof(mDir->execSegBase) + sizeof(mDir->execSegLimit) + sizeof(mDir->execSegFlags);

        if (version < supportsCodeLimit64)
                cdSize -= sizeof(mDir->spare3) + sizeof(mDir->codeLimit64);
        if (version < supportsTeamID)
        if (version < supportsCodeLimit64)
                cdSize -= sizeof(mDir->spare3) + sizeof(mDir->codeLimit64);
        if (version < supportsTeamID)


@@ -182,8 +187,10 @@ CodeDirectory *CodeDirectory::Builder::build()
        size_t teamIDLength = mTeamID.size() + 1;
        
        // Determine the version
        size_t teamIDLength = mTeamID.size() + 1;
        
        // Determine the version

-       if (mExecLength > UINT32_MAX) {
+       if (mExecSegLimit > 0) {

                version = currentVersion;
                version = currentVersion;

+       } else if (mExecLength > UINT32_MAX) {
+               version = supportsCodeLimit64;

        } else if (mTeamID.size()) {
                version = supportsTeamID;
        } else {
        } else if (mTeamID.size()) {
                version = supportsTeamID;
        } else {


@@ -221,6 +228,10 @@ CodeDirectory *CodeDirectory::Builder::build()
        } else
                mDir->pageSize = 0;     // means infinite page size
 
        } else
                mDir->pageSize = 0;     // means infinite page size
 

+       mDir->execSegBase = mExecSegOffset;
+       mDir->execSegLimit = mExecSegLimit;
+       mDir->execSegFlags = mExecSegFlags;
+

        // locate and fill flex fields
        size_t offset = fixedSize(mDir->version);
        
        // locate and fill flex fields
        size_t offset = fixedSize(mDir->version);
        


@@ -244,6 +255,8 @@ CodeDirectory *CodeDirectory::Builder::build()
        mDir->hashOffset = (uint32_t)(offset + mSpecialSlots * mDigestLength);
        offset += (mSpecialSlots + mCodeSlots) * mDigestLength;
        assert(offset == total);        // matches allocated size
        mDir->hashOffset = (uint32_t)(offset + mSpecialSlots * mDigestLength);
        offset += (mSpecialSlots + mCodeSlots) * mDigestLength;
        assert(offset == total);        // matches allocated size

+
+       (void)offset;

        
        // fill special slots
        memset((*mDir)[(int)-mSpecialSlots], 0, mDigestLength * mSpecialSlots);
        
        // fill special slots
        memset((*mDir)[(int)-mSpecialSlots], 0, mDigestLength * mSpecialSlots);