Support signing binaries without any symbol table.

[ldid.git] / ldid.cpp

diff --git a/ldid.cpp b/ldid.cpp
index 353a20eec116117be6ceb1490b4dbe5a563e2965..1f9287ce59884a68fcada53e13390e67ae4ef564 100644 (file)
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -85,6 +85,8 @@
 
 #ifndef LDID_NOPLIST
 #include <plist/plist.h>
 
 #ifndef LDID_NOPLIST
 #include <plist/plist.h>

+#elif __APPLE__
+#include <CoreFoundation/CoreFoundation.h>

 #endif
 
 #include "ldid.hpp"
 #endif
 
 #include "ldid.hpp"


@@ -1218,9 +1220,11 @@ static void Allocate(const void *idata, size_t isize, std::streambuf &output, co
 
         if (symtab != NULL) {
             auto end(mach_header.Swap(symtab->stroff) + mach_header.Swap(symtab->strsize));
 
         if (symtab != NULL) {
             auto end(mach_header.Swap(symtab->stroff) + mach_header.Swap(symtab->strsize));

-            _assert(end <= size);
-            _assert(end >= size - 0x10);
-            size = end;
+            if (symtab->stroff != 0 || symtab->strsize != 0) {
+                _assert(end <= size);
+                _assert(end >= size - 0x10);
+                size = end;
+            }

         }
 
         size_t alloc(allocate(mach_header, size));
         }
 
         size_t alloc(allocate(mach_header, size));


@@ -1731,6 +1735,7 @@ static void Commit(const std::string &path, const std::string &temp) {
 
 namespace ldid {
 
 
 namespace ldid {
 

+#ifndef LDID_NOSMIME

 static void get(std::string &value, X509_NAME *name, int nid) {
     auto index(X509_NAME_get_index_by_NID(name, nid, -1));
     _assert(index >= 0);
 static void get(std::string &value, X509_NAME *name, int nid) {
     auto index(X509_NAME_get_index_by_NID(name, nid, -1));
     _assert(index >= 0);


@@ -1742,6 +1747,7 @@ static void get(std::string &value, X509_NAME *name, int nid) {
     _assert(asn != NULL);
     value.assign(reinterpret_cast<char *>(ASN1_STRING_data(asn)), ASN1_STRING_length(asn));
 }
     _assert(asn != NULL);
     value.assign(reinterpret_cast<char *>(ASN1_STRING_data(asn)), ASN1_STRING_length(asn));
 }

+#endif

 
 static void req(std::streambuf &buffer, uint32_t value) {
     value = Swap(value);
 
 static void req(std::streambuf &buffer, uint32_t value) {
     value = Swap(value);


@@ -1968,11 +1974,21 @@ Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::st
 
 #ifndef LDID_NOSMIME
         if (!key.empty()) {
 
 #ifndef LDID_NOSMIME
         if (!key.empty()) {

+#ifdef LDID_NOPLIST
+            auto plist(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+            _scope({ CFRelease(plist); });
+
+            auto cdhashes(CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks));
+            _scope({ CFRelease(cdhashes); });
+
+            CFDictionarySetValue(plist, CFSTR("cdhashes"), cdhashes);
+#else

             auto plist(plist_new_dict());
             _scope({ plist_free(plist); });
 
             auto cdhashes(plist_new_array());
             plist_dict_set_item(plist, "cdhashes", cdhashes);
             auto plist(plist_new_dict());
             _scope({ plist_free(plist); });
 
             auto cdhashes(plist_new_array());
             plist_dict_set_item(plist, "cdhashes", cdhashes);

+#endif

 
             unsigned total(0);
             for (Algorithm *pointer : GetAlgorithms()) {
 
             unsigned total(0);
             for (Algorithm *pointer : GetAlgorithms()) {


@@ -1986,13 +2002,26 @@ Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::st
                 algorithm(hash, blob.data(), blob.size());
                 hash.resize(20);
 
                 algorithm(hash, blob.data(), blob.size());
                 hash.resize(20);
 

+#ifdef LDID_NOPLIST
+                auto value(CFDataCreate(kCFAllocatorDefault, reinterpret_cast<const UInt8 *>(hash.data()), hash.size()));
+                _scope({ CFRelease(value); });
+                CFArrayAppendValue(cdhashes, value);
+#else

                 plist_array_append_item(cdhashes, plist_new_data(hash.data(), hash.size()));
                 plist_array_append_item(cdhashes, plist_new_data(hash.data(), hash.size()));

+#endif

             }
 
             }
 

+#ifdef LDID_NOPLIST
+            auto created(CFPropertyListCreateXMLData(kCFAllocatorDefault, plist));
+            _scope({ CFRelease(created); });
+            auto xml(reinterpret_cast<const char *>(CFDataGetBytePtr(created)));
+            auto size(CFDataGetLength(created));
+#else

             char *xml(NULL);
             uint32_t size;
             plist_to_xml(plist, &xml, &size);
             _scope({ free(xml); });
             char *xml(NULL);
             uint32_t size;
             plist_to_xml(plist, &xml, &size);
             _scope({ free(xml); });

+#endif

 
             std::stringbuf data;
             const std::string &sign(blobs[CSSLOT_CODEDIRECTORY]);
 
             std::stringbuf data;
             const std::string &sign(blobs[CSSLOT_CODEDIRECTORY]);