Security-59306.120.7.tar.gz

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

diff --git a/OSX/libsecurity_codesigning/lib/Code.cpp b/OSX/libsecurity_codesigning/lib/Code.cpp
index 919ff0bce28db5d4804e3776e6ce82fc98fc8ab0..712b2ff4cf0f4bfa67f56ac2c826376ce5ec3968 100644 (file)
--- a/OSX/libsecurity_codesigning/lib/Code.cpp
+++ b/OSX/libsecurity_codesigning/lib/Code.cpp
@@ -26,7 +26,6 @@
 //
 #include "Code.h"
 #include "StaticCode.h"
 //
 #include "Code.h"
 #include "StaticCode.h"

-#include <Security/SecCodeHost.h>

 #include "cskernel.h"
 #include <security_utilities/cfmunge.h>
 #include <security_utilities/debugging.h>
 #include "cskernel.h"
 #include <security_utilities/cfmunge.h>
 #include <security_utilities/debugging.h>


@@ -207,8 +206,11 @@ void SecCode::checkValidity(SecCSFlags flags)
 
        // check my static state
        myDisk->validateNonResourceComponents();        // also validates the CodeDirectory
 
        // check my static state
        myDisk->validateNonResourceComponents();        // also validates the CodeDirectory

-       if (flags & kSecCSStrictValidate)
+       if (flags & kSecCSStrictValidate) {

                myDisk->diskRep()->strictValidate(myDisk->codeDirectory(), DiskRep::ToleratedErrors(), flags);
                myDisk->diskRep()->strictValidate(myDisk->codeDirectory(), DiskRep::ToleratedErrors(), flags);

+       } else if (flags & kSecCSStrictValidateStructure) {
+               myDisk->diskRep()->strictValidateStructure(myDisk->codeDirectory(), DiskRep::ToleratedErrors(), flags);
+       }

 
        // check my own dynamic state
        SecCodeStatus dynamic_status = this->host()->getGuestStatus(this);
 
        // check my own dynamic state
        SecCodeStatus dynamic_status = this->host()->getGuestStatus(this);