Security-177.tar.gz

[apple/security.git] / cdsa / cdsa_utilities / acl_codesigning.cpp

diff --git a/cdsa/cdsa_utilities/acl_codesigning.cpp b/cdsa/cdsa_utilities/acl_codesigning.cpp
index 45678e5db4677d29da37c16531465b434bb61f57..4448777212f6d0c4dc5e47e06799c714275cecf3 100644 (file)
--- a/cdsa/cdsa_utilities/acl_codesigning.cpp
+++ b/cdsa/cdsa_utilities/acl_codesigning.cpp
@@ -25,6 +25,7 @@
 
 #include <Security/acl_codesigning.h>
 #include <Security/cssmdata.h>
+#include <Security/endian.h>
 #include <algorithm>
 
 
@@ -59,7 +60,8 @@ bool CodeSignatureAclSubject::validate(const AclValidationContext &context) cons
 {
        // a suitable environment is required for a match
     if (Environment *env = context.environment<Environment>())
-               return env->verifyCodeSignature(mSignature);
+                       return env->verifyCodeSignature(mSignature,
+                               mHaveComment ? &mComment.get() : NULL);
        else
                return false;
 }
@@ -104,10 +106,12 @@ CodeSignatureAclSubject *CodeSignatureAclSubject::Maker::make(const TypedList &l
        }
 }
 
-CodeSignatureAclSubject *CodeSignatureAclSubject::Maker::make(Reader &pub, Reader &priv) const
+CodeSignatureAclSubject *CodeSignatureAclSubject::Maker::make(Version version,
+       Reader &pub, Reader &priv) const
 {
+       assert(version == 0);
     CssmAllocator &alloc = CssmAllocator::standard();
-       uint32 sigType; pub(sigType);
+       Endian<uint32> 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, 
@@ -121,14 +125,14 @@ CodeSignatureAclSubject *CodeSignatureAclSubject::Maker::make(Reader &pub, Reade
 //
 void CodeSignatureAclSubject::exportBlob(Writer::Counter &pub, Writer::Counter &priv)
 {
-       uint32 sigType = mSignature->type(); pub(sigType);
+       Endian<uint32> 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<uint32> sigType = mSignature->type(); pub(sigType);
        pub.countedData(*mSignature);
        pub.countedData(mComment);
 }