Security-59754.80.3.tar.gz

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

diff --git a/OSX/libsecurity_codesigning/lib/SecStaticCode.cpp b/OSX/libsecurity_codesigning/lib/SecStaticCode.cpp
index 5ee92582fc5e115e7451b53f9cb8d0377155279e..13d7b0f7c7f3d4b7d62a13c5cd5b956e2cffefa6 100644 (file)
--- a/OSX/libsecurity_codesigning/lib/SecStaticCode.cpp
+++ b/OSX/libsecurity_codesigning/lib/SecStaticCode.cpp
@@ -117,25 +117,32 @@ OSStatus SecStaticCodeCheckValidityWithErrors(SecStaticCodeRef staticCodeRef, Se
                | kSecCSNoNetworkAccess
                | kSecCSCheckNestedCode
                | kSecCSStrictValidate
                | kSecCSNoNetworkAccess
                | kSecCSCheckNestedCode
                | kSecCSStrictValidate

+               | kSecCSStrictValidateStructure

                | kSecCSRestrictSidebandData
                | kSecCSCheckGatekeeperArchitectures
                | kSecCSRestrictSymlinks
                | kSecCSRestrictToAppLike
                | kSecCSRestrictSidebandData
                | kSecCSCheckGatekeeperArchitectures
                | kSecCSRestrictSymlinks
                | kSecCSRestrictToAppLike

-        | kSecCSUseSoftwareSigningCert
-           | kSecCSValidatePEH
+               | kSecCSUseSoftwareSigningCert
+               | kSecCSValidatePEH

                | kSecCSSingleThreaded
                | kSecCSSingleThreaded

+               | kSecCSApplyEmbeddedPolicy
+               | kSecCSSkipRootVolumeExceptions
+               | kSecCSSkipXattrFiles

        );
 
        if (errors)
                flags |= kSecCSFullReport;      // internal-use flag
 
        );
 
        if (errors)
                flags |= kSecCSFullReport;      // internal-use flag
 

+#if !TARGET_OS_OSX
+       flags |= kSecCSApplyEmbeddedPolicy;
+#endif
+

        SecPointer<SecStaticCode> code = SecStaticCode::requiredStatic(staticCodeRef);
        code->setValidationFlags(flags);
        const SecRequirement *req = SecRequirement::optional(requirementRef);
        DTRACK(CODESIGN_EVAL_STATIC, code, (char*)code->mainExecutablePath().c_str());
        code->staticValidate(flags, req);
 
        SecPointer<SecStaticCode> code = SecStaticCode::requiredStatic(staticCodeRef);
        code->setValidationFlags(flags);
        const SecRequirement *req = SecRequirement::optional(requirementRef);
        DTRACK(CODESIGN_EVAL_STATIC, code, (char*)code->mainExecutablePath().c_str());
        code->staticValidate(flags, req);
 

-#if TARGET_OS_IPHONE

     // Everything checked out correctly but we need to make sure that when
     // we validated the code directory, we trusted the signer.  We defer this
     // until now because the caller may still trust the signer via a
     // Everything checked out correctly but we need to make sure that when
     // we validated the code directory, we trusted the signer.  We defer this
     // until now because the caller may still trust the signer via a


@@ -143,10 +150,9 @@ OSStatus SecStaticCodeCheckValidityWithErrors(SecStaticCodeRef staticCodeRef, Se
     // the directory, we potentially skip resource validation even though the
     // caller will go on to trust the signature
     // <rdar://problem/6075501> Applications that are validated against a provisioning profile do not have their resources checked
     // the directory, we potentially skip resource validation even though the
     // caller will go on to trust the signature
     // <rdar://problem/6075501> Applications that are validated against a provisioning profile do not have their resources checked

-    if (code->trustedSigningCertChain() == false) {
+    if ((flags & kSecCSApplyEmbeddedPolicy) && code->trustedSigningCertChain() == false) {

         return CSError::cfError(errors, errSecCSSignatureUntrusted);
     }
         return CSError::cfError(errors, errSecCSSignatureUntrusted);
     }

-#endif

 
 
        END_CSAPI_ERRORS
 
 
        END_CSAPI_ERRORS


@@ -250,7 +256,7 @@ OSStatus SecCodeMapMemory(SecStaticCodeRef codeRef, SecCSFlags flags)
                                MacOSError::throwMe(errSecCSNoMainExecutable);
                        }
 
                                MacOSError::throwMe(errSecCSNoMainExecutable);
                        }
 

-                       auto_ptr<MachO> arch(execImage->architecture());
+                       unique_ptr<MachO> arch(execImage->architecture());

                        if (arch.get() == NULL) {
                                MacOSError::throwMe(errSecCSNoMainExecutable);
                        }
                        if (arch.get() == NULL) {
                                MacOSError::throwMe(errSecCSNoMainExecutable);
                        }