libsecurity_codesigning-55005.tar.gz

[apple/libsecurity_codesigning.git] / lib / sigblob.cpp

diff --git a/lib/sigblob.cpp b/lib/sigblob.cpp
index e2d65de1f7884d2567f4b5a63292b0b3c93c1474..95ad32dccd6f24d7a2167189f2553fbf015c09e0 100644 (file)
--- a/lib/sigblob.cpp
+++ b/lib/sigblob.cpp
@@ -25,6 +25,7 @@
 // sigblob - signature (Super)Blob types
 //
 #include "sigblob.h"
 // sigblob - signature (Super)Blob types
 //
 #include "sigblob.h"

+#include "CSCommon.h"

 
 
 namespace Security {
 
 
 namespace Security {


@@ -36,8 +37,10 @@ CFDataRef EmbeddedSignatureBlob::component(CodeDirectory::SpecialSlot slot) cons
        if (const BlobCore *blob = this->find(slot))
                if (CodeDirectory::slotAttributes(slot) & cdComponentIsBlob)
                        return makeCFData(*blob);       // is a native Blob
        if (const BlobCore *blob = this->find(slot))
                if (CodeDirectory::slotAttributes(slot) & cdComponentIsBlob)
                        return makeCFData(*blob);       // is a native Blob

+               else if (const BlobWrapper *wrap = BlobWrapper::specific(blob))
+                       return makeCFData(*wrap);

                else
                else

-                       return makeCFData(*BlobWrapper::specific(blob)); // unwrap payload
+                       MacOSError::throwMe(errSecCSSignatureInvalid);

        return NULL;
 }
 
        return NULL;
 }