Security-58286.20.16.tar.gz

[apple/security.git] / OSX / libsecurity_cdsa_utilities / lib / acl_codesigning.cpp

diff --git a/OSX/libsecurity_cdsa_utilities/lib/acl_codesigning.cpp b/OSX/libsecurity_cdsa_utilities/lib/acl_codesigning.cpp
index a848449f4365a165111d50d3ea4644fe092f36c6..340bbd2be81878964014a6521c9ea2e3eb6f6747 100644 (file)
--- a/OSX/libsecurity_cdsa_utilities/lib/acl_codesigning.cpp
+++ b/OSX/libsecurity_cdsa_utilities/lib/acl_codesigning.cpp
@@ -36,7 +36,7 @@
 // a feature of "the" process (defined by the environment), and take no
 // samples whatsoever.
 //
 // a feature of "the" process (defined by the environment), and take no
 // samples whatsoever.
 //

-bool CodeSignatureAclSubject::validate(const AclValidationContext &context) const
+bool CodeSignatureAclSubject::validates(const AclValidationContext &context) const

 {
        // a suitable environment is required for a match
     if (Environment *env = context.environment<Environment>())
 {
        // a suitable environment is required for a match
     if (Environment *env = context.environment<Environment>())


@@ -91,11 +91,11 @@ CodeSignatureAclSubject *CodeSignatureAclSubject::Maker::make(const TypedList &l
                        if (list[n].is(CSSM_LIST_ELEMENT_DATUM)) {
                                const BlobCore *blob = list[n].data().interpretedAs<const BlobCore>();
                                if (blob->length() < sizeof(BlobCore)) {
                        if (list[n].is(CSSM_LIST_ELEMENT_DATUM)) {
                                const BlobCore *blob = list[n].data().interpretedAs<const BlobCore>();
                                if (blob->length() < sizeof(BlobCore)) {

-                                       secdebug("csblob", "runt blob (0x%x/%zd) slot %d in CSSM_LIST",
+                                       secinfo("csblob", "runt blob (0x%x/%zd) slot %d in CSSM_LIST",

                                                blob->magic(), blob->length(), n);
                                        CssmError::throwMe(CSSM_ERRCODE_INVALID_ACL_SUBJECT_VALUE);
                                } else if (blob->length() != list[n].data().length()) {
                                                blob->magic(), blob->length(), n);
                                        CssmError::throwMe(CSSM_ERRCODE_INVALID_ACL_SUBJECT_VALUE);
                                } else if (blob->length() != list[n].data().length()) {

-                                       secdebug("csblob", "badly sized blob (0x%x/%zd) slot %d in CSSM_LIST",
+                                       secinfo("csblob", "badly sized blob (0x%x/%zd) slot %d in CSSM_LIST",

                                                blob->magic(), blob->length(), n);
                                        CssmError::throwMe(CSSM_ERRCODE_INVALID_ACL_SUBJECT_VALUE);
                                }
                                                blob->magic(), blob->length(), n);
                                        CssmError::throwMe(CSSM_ERRCODE_INVALID_ACL_SUBJECT_VALUE);
                                }


@@ -133,7 +133,7 @@ CodeSignatureAclSubject *CodeSignatureAclSubject::Maker::make(const SHA1::Byte *
                        blob = increment<const BlobCore>(blob, alignUp(blob->length(), commentBagAlignment))) {
                size_t leftInBag = difference(commentBag.end(), blob);
                if (leftInBag < sizeof(BlobCore) || blob->length() < sizeof(BlobCore) || blob->length() > leftInBag) {
                        blob = increment<const BlobCore>(blob, alignUp(blob->length(), commentBagAlignment))) {
                size_t leftInBag = difference(commentBag.end(), blob);
                if (leftInBag < sizeof(BlobCore) || blob->length() < sizeof(BlobCore) || blob->length() > leftInBag) {

-                       secdebug("csblob", "invalid blob (0x%x/%zd) [%zd in bag] in code signing ACL for %s - stopping scan",
+                       secinfo("csblob", "invalid blob (0x%x/%zd) [%zd in bag] in code signing ACL for %s - stopping scan",

                                blob->magic(), blob->length(), leftInBag, subj->path().c_str());
                        break;  // can't trust anything beyond this blob
                }
                                blob->magic(), blob->length(), leftInBag, subj->path().c_str());
                        break;  // can't trust anything beyond this blob
                }