X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/2965425374ca4413339436c2f706f7b5508402e2..ce0ac947b4708d0bc1c7e6789b3e1f3bfc80d6e9:/cdsa/cdsa_utilities/acl_codesigning.cpp diff --git a/cdsa/cdsa_utilities/acl_codesigning.cpp b/cdsa/cdsa_utilities/acl_codesigning.cpp index 76f50038..44487772 100644 --- a/cdsa/cdsa_utilities/acl_codesigning.cpp +++ b/cdsa/cdsa_utilities/acl_codesigning.cpp @@ -25,6 +25,7 @@ #include #include +#include #include @@ -59,7 +60,8 @@ bool CodeSignatureAclSubject::validate(const AclValidationContext &context) cons { // a suitable environment is required for a match if (Environment *env = context.environment()) - return env->verifyCodeSignature(mSignature); + return env->verifyCodeSignature(mSignature, + mHaveComment ? &mComment.get() : NULL); else return false; } @@ -109,7 +111,7 @@ CodeSignatureAclSubject *CodeSignatureAclSubject::Maker::make(Version version, { assert(version == 0); CssmAllocator &alloc = CssmAllocator::standard(); - uint32 sigType; pub(sigType); + Endian sigType; pub(sigType); const void *data; uint32 length; pub.countedData(data, length); const void *commentData; uint32 commentLength; pub.countedData(commentData, commentLength); return new CodeSignatureAclSubject(alloc, @@ -123,14 +125,14 @@ CodeSignatureAclSubject *CodeSignatureAclSubject::Maker::make(Version version, // void CodeSignatureAclSubject::exportBlob(Writer::Counter &pub, Writer::Counter &priv) { - uint32 sigType = mSignature->type(); pub(sigType); + Endian sigType = mSignature->type(); pub(sigType); pub.countedData(*mSignature); pub.countedData(mComment); } void CodeSignatureAclSubject::exportBlob(Writer &pub, Writer &priv) { - uint32 sigType = mSignature->type(); pub(sigType); + Endian sigType = mSignature->type(); pub(sigType); pub.countedData(*mSignature); pub.countedData(mComment); }