Add support for signing symbolic links (sort of?).

[ldid.git] / ldid.cpp

diff --git a/ldid.cpp b/ldid.cpp
index e800dfee50c2b94586d2dece222c9fd0189ec175..21e886349a38fb37e1c1ae706a26ac3a77adf406 100644 (file)
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -1,5 +1,5 @@
 /* ldid - (Mach-O) Link-Loader Identity Editor
 /* ldid - (Mach-O) Link-Loader Identity Editor

- * Copyright (C) 2007-2012  Jay Freeman (saurik)
+ * Copyright (C) 2007-2015  Jay Freeman (saurik)

 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -19,21 +19,188 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

-#include "minimal/stdlib.h"
-
+#include <cstdio>
+#include <cstdlib>

 #include <cstring>
 #include <cstring>

+#include <fstream>
+#include <iostream>
+#include <memory>
+#include <set>
+#include <sstream>

 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

-#include <dlfcn.h>
+#include <dirent.h>
+#include <errno.h>

 #include <fcntl.h>
 #include <fcntl.h>

+#include <regex.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <unistd.h>

 
 #include <sys/mman.h>
 #include <sys/stat.h>
 
 #include <sys/mman.h>
 #include <sys/stat.h>

-
+#include <sys/types.h>
+
+#ifndef LDID_NOSMIME
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pkcs12.h>
+#endif
+
+#ifdef __APPLE__
+#include <CommonCrypto/CommonDigest.h>
+
+#define LDID_SHA1_DIGEST_LENGTH CC_SHA1_DIGEST_LENGTH
+#define LDID_SHA1 CC_SHA1
+#define LDID_SHA1_CTX CC_SHA1_CTX
+#define LDID_SHA1_Init CC_SHA1_Init
+#define LDID_SHA1_Update CC_SHA1_Update
+#define LDID_SHA1_Final CC_SHA1_Final
+
+#define LDID_SHA256_DIGEST_LENGTH CC_SHA256_DIGEST_LENGTH
+#define LDID_SHA256 CC_SHA256
+#define LDID_SHA256_CTX CC_SHA256_CTX
+#define LDID_SHA256_Init CC_SHA256_Init
+#define LDID_SHA256_Update CC_SHA256_Update
+#define LDID_SHA256_Final CC_SHA256_Final
+#else

 #include <openssl/sha.h>
 
 #include <openssl/sha.h>
 

+#define LDID_SHA1_DIGEST_LENGTH SHA_DIGEST_LENGTH
+#define LDID_SHA1 SHA1
+#define LDID_SHA1_CTX SHA_CTX
+#define LDID_SHA1_Init SHA1_Init
+#define LDID_SHA1_Update SHA1_Update
+#define LDID_SHA1_Final SHA1_Final
+
+#define LDID_SHA256_DIGEST_LENGTH SHA256_DIGEST_LENGTH
+#define LDID_SHA256 SHA256
+#define LDID_SHA256_CTX SHA256_CTX
+#define LDID_SHA256_Init SHA256_Init
+#define LDID_SHA256_Update SHA256_Update
+#define LDID_SHA256_Final SHA256_Final
+#endif
+
+#ifndef LDID_NOPLIST

 #include <plist/plist.h>
 #include <plist/plist.h>

+#endif
+
+#include "ldid.hpp"
+
+#define _assert___(line) \
+    #line
+#define _assert__(line) \
+    _assert___(line)
+
+#ifdef __EXCEPTIONS
+#define _assert_(expr, format, ...) \
+    do if (!(expr)) { \
+        fprintf(stderr, "%s(%u): _assert(): " format "\n", __FILE__, __LINE__, ## __VA_ARGS__); \
+        throw __FILE__ "(" _assert__(__LINE__) "): _assert(" #expr ")"; \
+    } while (false)
+#else
+// XXX: this is not acceptable
+#define _assert_(expr, format, ...) \
+    do if (!(expr)) { \
+        fprintf(stderr, "%s(%u): _assert(): " format "\n", __FILE__, __LINE__, ## __VA_ARGS__); \
+        exit(-1); \
+    } while (false)
+#endif
+
+#define _assert(expr) \
+    _assert_(expr, "%s", #expr)
+
+#define _syscall(expr, ...) [&] { for (;;) { \
+    auto _value(expr); \
+    if ((long) _value != -1) \
+        return _value; \
+    int error(errno); \
+    if (error == EINTR) \
+        continue; \
+    /* XXX: EINTR is included in this list to fix g++ */ \
+    for (auto success : (long[]) {EINTR, __VA_ARGS__}) \
+        if (error == success) \
+            return (decltype(expr)) -success; \
+    _assert_(false, "errno=%u", error); \
+} }()
+
+#define _trace() \
+    fprintf(stderr, "_trace(%s:%u): %s\n", __FILE__, __LINE__, __FUNCTION__)
+
+#define _not(type) \
+    ((type) ~ (type) 0)
+
+#define _packed \
+    __attribute__((packed))
+
+template <typename Type_>
+struct Iterator_ {
+    typedef typename Type_::const_iterator Result;
+};
+
+#define _foreach(item, list) \
+    for (bool _stop(true); _stop; ) \
+        for (const __typeof__(list) &_list = (list); _stop; _stop = false) \
+            for (Iterator_<__typeof__(list)>::Result _item = _list.begin(); _item != _list.end(); ++_item) \
+                for (bool _suck(true); _suck; _suck = false) \
+                    for (const __typeof__(*_item) &item = *_item; _suck; _suck = false)
+
+class _Scope {
+};
+
+template <typename Function_>
+class Scope :
+    public _Scope
+{
+  private:
+    Function_ function_;
+
+  public:
+    Scope(const Function_ &function) :
+        function_(function)
+    {
+    }
+
+    ~Scope() {
+        function_();
+    }
+};
+
+template <typename Function_>
+Scope<Function_> _scope(const Function_ &function) {
+    return Scope<Function_>(function);
+}
+
+#define _scope__(counter, function) \
+    __attribute__((__unused__)) \
+    const _Scope &_scope ## counter(_scope([&]function))
+#define _scope_(counter, function) \
+    _scope__(counter, function)
+#define _scope(function) \
+    _scope_(__COUNTER__, function)
+
+#define CPU_ARCH_MASK  uint32_t(0xff000000)
+#define CPU_ARCH_ABI64 uint32_t(0x01000000)
+
+#define CPU_TYPE_ANY     uint32_t(-1)
+#define CPU_TYPE_VAX     uint32_t( 1)
+#define CPU_TYPE_MC680x0 uint32_t( 6)
+#define CPU_TYPE_X86     uint32_t( 7)
+#define CPU_TYPE_MC98000 uint32_t(10)
+#define CPU_TYPE_HPPA    uint32_t(11)
+#define CPU_TYPE_ARM     uint32_t(12)
+#define CPU_TYPE_MC88000 uint32_t(13)
+#define CPU_TYPE_SPARC   uint32_t(14)
+#define CPU_TYPE_I860    uint32_t(15)
+#define CPU_TYPE_POWERPC uint32_t(18)
+
+#define CPU_TYPE_I386 CPU_TYPE_X86
+
+#define CPU_TYPE_ARM64     (CPU_ARCH_ABI64 | CPU_TYPE_ARM)
+#define CPU_TYPE_POWERPC64 (CPU_ARCH_ABI64 | CPU_TYPE_POWERPC)
+#define CPU_TYPE_X86_64    (CPU_ARCH_ABI64 | CPU_TYPE_X86)

 
 struct fat_header {
     uint32_t magic;
 
 struct fat_header {
     uint32_t magic;


@@ -97,6 +264,16 @@ struct load_command {
 #define LC_DYLD_INFO_ONLY     uint32_t(0x22 | LC_REQ_DYLD)
 #define LC_ENCRYPTION_INFO_64 uint32_t(0x2c)
 
 #define LC_DYLD_INFO_ONLY     uint32_t(0x22 | LC_REQ_DYLD)
 #define LC_ENCRYPTION_INFO_64 uint32_t(0x2c)
 

+union Version {
+    struct {
+        uint8_t patch;
+        uint8_t minor;
+        uint16_t major;
+    } _packed;
+
+    uint32_t value;
+};
+

 struct dylib {
     uint32_t name;
     uint32_t timestamp;
 struct dylib {
     uint32_t name;
     uint32_t timestamp;


@@ -264,6 +441,7 @@ struct section_64 {
     uint32_t flags;
     uint32_t reserved1;
     uint32_t reserved2;
     uint32_t flags;
     uint32_t reserved1;
     uint32_t reserved2;

+    uint32_t reserved3;

 } _packed;
 
 struct linkedit_data_command {
 } _packed;
 
 struct linkedit_data_command {


@@ -297,6 +475,35 @@ struct encryption_info_command {
 #define BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED      0xb0
 #define BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB 0xc0
 
 #define BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED      0xb0
 #define BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB 0xc0
 

+static std::streamsize read(std::streambuf &stream, void *data, size_t size) {
+    auto writ(stream.sgetn(static_cast<char *>(data), size));
+    _assert(writ >= 0);
+    return writ;
+}
+
+static inline void get(std::streambuf &stream, void *data, size_t size) {
+    _assert(read(stream, data, size) == size);
+}
+
+static inline void put(std::streambuf &stream, const void *data, size_t size) {
+    _assert(stream.sputn(static_cast<const char *>(data), size) == size);
+}
+
+static size_t most(std::streambuf &stream, void *data, size_t size) {
+    size_t total(size);
+    while (size > 0)
+        if (auto writ = read(stream, data, size))
+            size -= writ;
+        else break;
+    return total - size;
+}
+
+static inline void pad(std::streambuf &stream, size_t size) {
+    char padding[size];
+    memset(padding, 0, size);
+    put(stream, padding, size);
+}
+

 template <typename Type_>
 Type_ Align(Type_ value, size_t align) {
     value += align - 1;
 template <typename Type_>
 Type_ Align(Type_ value, size_t align) {
     value += align - 1;


@@ -305,13 +512,16 @@ Type_ Align(Type_ value, size_t align) {
     return value;
 }
 
     return value;
 }
 

-uint16_t Swap_(uint16_t value) {
+static const uint8_t PageShift_(0x0c);
+static const uint32_t PageSize_(1 << PageShift_);
+
+static inline uint16_t Swap_(uint16_t value) {

     return
         ((value >>  8) & 0x00ff) |
         ((value <<  8) & 0xff00);
 }
 
     return
         ((value >>  8) & 0x00ff) |
         ((value <<  8) & 0xff00);
 }
 

-uint32_t Swap_(uint32_t value) {
+static inline uint32_t Swap_(uint32_t value) {

     value = ((value >>  8) & 0x00ff00ff) |
             ((value <<  8) & 0xff00ff00);
     value = ((value >> 16) & 0x0000ffff) |
     value = ((value >>  8) & 0x00ff00ff) |
             ((value <<  8) & 0xff00ff00);
     value = ((value >> 16) & 0x0000ffff) |


@@ -319,92 +529,84 @@ uint32_t Swap_(uint32_t value) {
     return value;
 }
 
     return value;
 }
 

-uint64_t Swap_(uint64_t value) {
+static inline uint64_t Swap_(uint64_t value) {

     value = (value & 0x00000000ffffffff) << 32 | (value & 0xffffffff00000000) >> 32;
     value = (value & 0x0000ffff0000ffff) << 16 | (value & 0xffff0000ffff0000) >> 16;
     value = (value & 0x00ff00ff00ff00ff) << 8  | (value & 0xff00ff00ff00ff00) >> 8;
     return value;
 }
 
     value = (value & 0x00000000ffffffff) << 32 | (value & 0xffffffff00000000) >> 32;
     value = (value & 0x0000ffff0000ffff) << 16 | (value & 0xffff0000ffff0000) >> 16;
     value = (value & 0x00ff00ff00ff00ff) << 8  | (value & 0xff00ff00ff00ff00) >> 8;
     return value;
 }
 

-int16_t Swap_(int16_t value) {
+static inline int16_t Swap_(int16_t value) {

     return Swap_(static_cast<uint16_t>(value));
 }
 
     return Swap_(static_cast<uint16_t>(value));
 }
 

-int32_t Swap_(int32_t value) {
+static inline int32_t Swap_(int32_t value) {

     return Swap_(static_cast<uint32_t>(value));
 }
 
     return Swap_(static_cast<uint32_t>(value));
 }
 

-int64_t Swap_(int64_t value) {
+static inline int64_t Swap_(int64_t value) {

     return Swap_(static_cast<uint64_t>(value));
 }
 
     return Swap_(static_cast<uint64_t>(value));
 }
 

-bool little_(true);
+static bool little_(true);

 
 

-uint16_t Swap(uint16_t value) {
+static inline uint16_t Swap(uint16_t value) {

     return little_ ? Swap_(value) : value;
 }
 
     return little_ ? Swap_(value) : value;
 }
 

-uint32_t Swap(uint32_t value) {
+static inline uint32_t Swap(uint32_t value) {

     return little_ ? Swap_(value) : value;
 }
 
     return little_ ? Swap_(value) : value;
 }
 

-uint64_t Swap(uint64_t value) {
+static inline uint64_t Swap(uint64_t value) {

     return little_ ? Swap_(value) : value;
 }
 
     return little_ ? Swap_(value) : value;
 }
 

-int16_t Swap(int16_t value) {
+static inline int16_t Swap(int16_t value) {

     return Swap(static_cast<uint16_t>(value));
 }
 
     return Swap(static_cast<uint16_t>(value));
 }
 

-int32_t Swap(int32_t value) {
+static inline int32_t Swap(int32_t value) {

     return Swap(static_cast<uint32_t>(value));
 }
 
     return Swap(static_cast<uint32_t>(value));
 }
 

-int64_t Swap(int64_t value) {
+static inline int64_t Swap(int64_t value) {

     return Swap(static_cast<uint64_t>(value));
 }
 
     return Swap(static_cast<uint64_t>(value));
 }
 

-template <typename Target_>
-class Pointer;
-
-class Data {
-  private:
-    void *base_;
-    size_t size_;
-
+class Swapped {

   protected:
     bool swapped_;
 
   protected:
     bool swapped_;
 

-  public:
-    Data(void *base, size_t size) :
-        base_(base),
-        size_(size),
+    Swapped() :

         swapped_(false)
     {
     }
 
         swapped_(false)
     {
     }
 

-    uint16_t Swap(uint16_t value) const {
-        return swapped_ ? Swap_(value) : value;
-    }
-
-    uint32_t Swap(uint32_t value) const {
-        return swapped_ ? Swap_(value) : value;
+  public:
+    Swapped(bool swapped) :
+        swapped_(swapped)
+    {

     }
 
     }
 

-    uint64_t Swap(uint64_t value) const {
+    template <typename Type_>
+    Type_ Swap(Type_ value) const {

         return swapped_ ? Swap_(value) : value;
     }
         return swapped_ ? Swap_(value) : value;
     }

+};

 
 

-    int16_t Swap(int16_t value) const {
-        return Swap(static_cast<uint16_t>(value));
-    }
-
-    int32_t Swap(int32_t value) const {
-        return Swap(static_cast<uint32_t>(value));
-    }
+class Data :
+    public Swapped
+{
+  private:
+    void *base_;
+    size_t size_;

 
 

-    int64_t Swap(int64_t value) const {
-        return Swap(static_cast<uint64_t>(value));
+  public:
+    Data(void *base, size_t size) :
+        base_(base),
+        size_(size)
+    {

     }
 
     void *GetBase() const {
     }
 
     void *GetBase() const {


@@ -460,6 +662,10 @@ class MachHeader :
         );
     }
 
         );
     }
 

+    bool Bits64() const {
+        return bits64_;
+    }
+

     struct mach_header *operator ->() const {
         return mach_header_;
     }
     struct mach_header *operator ->() const {
         return mach_header_;
     }


@@ -492,85 +698,30 @@ class MachHeader :
         return load_commands;
     }
 
         return load_commands;
     }
 

-    std::vector<segment_command *> GetSegments(const char *segment_name) const {
-        std::vector<struct segment_command *> segment_commands;
-
-        _foreach (load_command, GetLoadCommands()) {
-            if (Swap(load_command->cmd) == LC_SEGMENT) {
-                segment_command *segment_command = reinterpret_cast<struct segment_command *>(load_command);
-                if (strncmp(segment_command->segname, segment_name, 16) == 0)
-                    segment_commands.push_back(segment_command);
+    void ForSection(const ldid::Functor<void (const char *, const char *, void *, size_t)> &code) const {
+        _foreach (load_command, GetLoadCommands())
+            switch (Swap(load_command->cmd)) {
+                case LC_SEGMENT: {
+                    auto segment(reinterpret_cast<struct segment_command *>(load_command));
+                    code(segment->segname, NULL, GetOffset<void>(segment->fileoff), segment->filesize);
+                    auto section(reinterpret_cast<struct section *>(segment + 1));
+                    for (uint32_t i(0), e(Swap(segment->nsects)); i != e; ++i, ++section)
+                        code(segment->segname, section->sectname, GetOffset<void>(segment->fileoff + section->offset), section->size);
+                } break;
+
+                case LC_SEGMENT_64: {
+                    auto segment(reinterpret_cast<struct segment_command_64 *>(load_command));
+                    code(segment->segname, NULL, GetOffset<void>(segment->fileoff), segment->filesize);
+                    auto section(reinterpret_cast<struct section_64 *>(segment + 1));
+                    for (uint32_t i(0), e(Swap(segment->nsects)); i != e; ++i, ++section)
+                        code(segment->segname, section->sectname, GetOffset<void>(segment->fileoff + section->offset), section->size);
+                } break;

             }
             }

-        }
-
-        return segment_commands;
-    }
-
-    std::vector<segment_command_64 *> GetSegments64(const char *segment_name) const {
-        std::vector<struct segment_command_64 *> segment_commands;
-
-        _foreach (load_command, GetLoadCommands()) {
-            if (Swap(load_command->cmd) == LC_SEGMENT_64) {
-                segment_command_64 *segment_command = reinterpret_cast<struct segment_command_64 *>(load_command);
-                if (strncmp(segment_command->segname, segment_name, 16) == 0)
-                    segment_commands.push_back(segment_command);
-            }
-        }
-
-        return segment_commands;
-    }
-
-    std::vector<section *> GetSections(const char *segment_name, const char *section_name) const {
-        std::vector<section *> sections;
-
-        _foreach (segment, GetSegments(segment_name)) {
-            section *section = (struct section *) (segment + 1);
-
-            uint32_t sect;
-            for (sect = 0; sect != Swap(segment->nsects); ++sect) {
-                if (strncmp(section->sectname, section_name, 16) == 0)
-                    sections.push_back(section);
-                ++section;
-            }
-        }
-
-        return sections;
-    }
-
-    template <typename Target_>
-    Pointer<Target_> GetPointer(uint32_t address, const char *segment_name = NULL) const {
-        load_command *load_command = (struct load_command *) (mach_header_ + 1);
-        uint32_t cmd;
-
-        for (cmd = 0; cmd != Swap(mach_header_->ncmds); ++cmd) {
-            if (Swap(load_command->cmd) == LC_SEGMENT) {
-                segment_command *segment_command = (struct segment_command *) load_command;
-                if (segment_name != NULL && strncmp(segment_command->segname, segment_name, 16) != 0)
-                    goto next_command;
-
-                section *sections = (struct section *) (segment_command + 1);
-
-                uint32_t sect;
-                for (sect = 0; sect != Swap(segment_command->nsects); ++sect) {
-                    section *section = &sections[sect];
-                    //printf("%s %u %p %p %u\n", segment_command->segname, sect, address, section->addr, section->size);
-                    if (address >= Swap(section->addr) && address < Swap(section->addr) + Swap(section->size)) {
-                        //printf("0x%.8x %s\n", address, segment_command->segname);
-                        return Pointer<Target_>(this, reinterpret_cast<Target_ *>(address - Swap(section->addr) + Swap(section->offset) + (char *) mach_header_));
-                    }
-                }
-            }
-
-          next_command:
-            load_command = (struct load_command *) ((char *) load_command + Swap(load_command->cmdsize));
-        }
-
-        return Pointer<Target_>(this);

     }
 
     template <typename Target_>
     }
 
     template <typename Target_>

-    Pointer<Target_> GetOffset(uint32_t offset) {
-        return Pointer<Target_>(this, reinterpret_cast<Target_ *>(offset + (uint8_t *) mach_header_));
+    Target_ *GetOffset(uint32_t offset) const {
+        return reinterpret_cast<Target_ *>(offset + (uint8_t *) mach_header_);

     }
 };
 
     }
 };
 


@@ -641,45 +792,25 @@ class FatHeader :
     }
 };
 
     }
 };
 

-template <typename Target_>
-class Pointer {
-  private:
-    const MachHeader *framework_;
-    const Target_ *pointer_;
-
-  public:
-    Pointer(const MachHeader *framework = NULL, const Target_ *pointer = NULL) :
-        framework_(framework),
-        pointer_(pointer)
-    {
-    }
+#define CSMAGIC_REQUIREMENT            uint32_t(0xfade0c00)
+#define CSMAGIC_REQUIREMENTS           uint32_t(0xfade0c01)
+#define CSMAGIC_CODEDIRECTORY          uint32_t(0xfade0c02)
+#define CSMAGIC_EMBEDDED_SIGNATURE     uint32_t(0xfade0cc0)
+#define CSMAGIC_EMBEDDED_SIGNATURE_OLD uint32_t(0xfade0b02)
+#define CSMAGIC_EMBEDDED_ENTITLEMENTS  uint32_t(0xfade7171)
+#define CSMAGIC_DETACHED_SIGNATURE     uint32_t(0xfade0cc1)
+#define CSMAGIC_BLOBWRAPPER            uint32_t(0xfade0b01)

 
 

-    operator const Target_ *() const {
-        return pointer_;
-    }
-
-    const Target_ *operator ->() const {
-        return pointer_;
-    }
-
-    Pointer<Target_> &operator ++() {
-        ++pointer_;
-        return *this;
-    }
-
-    template <typename Value_>
-    Value_ Swap(Value_ value) {
-        return framework_->Swap(value);
-    }
-};
+#define CSSLOT_CODEDIRECTORY uint32_t(0x00000)
+#define CSSLOT_INFOSLOT      uint32_t(0x00001)
+#define CSSLOT_REQUIREMENTS  uint32_t(0x00002)
+#define CSSLOT_RESOURCEDIR   uint32_t(0x00003)
+#define CSSLOT_APPLICATION   uint32_t(0x00004)
+#define CSSLOT_ENTITLEMENTS  uint32_t(0x00005)

 
 

-#define CSMAGIC_CODEDIRECTORY      uint32_t(0xfade0c02)
-#define CSMAGIC_EMBEDDED_SIGNATURE uint32_t(0xfade0cc0)
-#define CSMAGIC_ENTITLEMENTS       uint32_t(0xfade7171)
+#define CSSLOT_SIGNATURESLOT uint32_t(0x10000)

 
 

-#define CSSLOT_CODEDIRECTORY uint32_t(0)
-#define CSSLOT_REQUIREMENTS  uint32_t(2)
-#define CSSLOT_ENTITLEMENTS  uint32_t(5)
+#define CS_HASHTYPE_SHA1 1

 
 struct BlobIndex {
     uint32_t type;
 
 struct BlobIndex {
     uint32_t type;


@@ -698,7 +829,6 @@ struct SuperBlob {
 } _packed;
 
 struct CodeDirectory {
 } _packed;
 
 struct CodeDirectory {

-    struct Blob blob;

     uint32_t version;
     uint32_t flags;
     uint32_t hashOffset;
     uint32_t version;
     uint32_t flags;
     uint32_t hashOffset;


@@ -711,31 +841,45 @@ struct CodeDirectory {
     uint8_t spare1;
     uint8_t pageSize;
     uint32_t spare2;
     uint8_t spare1;
     uint8_t pageSize;
     uint32_t spare2;

+    uint32_t scatterOffset;
+    uint32_t teamIDOffset;
+    uint32_t spare3;
+    uint64_t codeLimit64;

 } _packed;
 
 } _packed;
 

+#ifndef LDID_NOFLAGT

 extern "C" uint32_t hash(uint8_t *k, uint32_t length, uint32_t initval);
 extern "C" uint32_t hash(uint8_t *k, uint32_t length, uint32_t initval);

+#endif
+
+static void sha1(uint8_t *hash, const void *data, size_t size) {
+    LDID_SHA1(static_cast<const uint8_t *>(data), size, hash);
+}

 
 

-void sha1(uint8_t *hash, uint8_t *data, size_t size) {
-    SHA1(data, size, hash);
+static void sha1(std::vector<char> &hash, const void *data, size_t size) {
+    hash.resize(LDID_SHA1_DIGEST_LENGTH);
+    sha1(reinterpret_cast<uint8_t *>(hash.data()), data, size);

 }
 
 struct CodesignAllocation {
     FatMachHeader mach_header_;
     uint32_t offset_;
     uint32_t size_;
 }
 
 struct CodesignAllocation {
     FatMachHeader mach_header_;
     uint32_t offset_;
     uint32_t size_;

+    uint32_t limit_;

     uint32_t alloc_;
     uint32_t align_;
 
     uint32_t alloc_;
     uint32_t align_;
 

-    CodesignAllocation(FatMachHeader mach_header, size_t offset, size_t size, size_t alloc, size_t align) :
+    CodesignAllocation(FatMachHeader mach_header, size_t offset, size_t size, size_t limit, size_t alloc, size_t align) :

         mach_header_(mach_header),
         offset_(offset),
         size_(size),
         mach_header_(mach_header),
         offset_(offset),
         size_(size),

+        limit_(limit),

         alloc_(alloc),
         align_(align)
     {
     }
 };
 
         alloc_(alloc),
         align_(align)
     {
     }
 };
 

+#ifndef LDID_NOTOOLS

 class File {
   private:
     int file_;
 class File {
   private:
     int file_;


@@ -753,7 +897,7 @@ class File {
 
     void open(const char *path, int flags) {
         _assert(file_ == -1);
 
     void open(const char *path, int flags) {
         _assert(file_ == -1);

-        _syscall(file_ = ::open(path, flags));
+        file_ = _syscall(::open(path, flags));

     }
 
     int file() const {
     }
 
     int file() const {


@@ -782,13 +926,13 @@ class Map {
     {
     }
 
     {
     }
 

-    Map(const char *path, int oflag, int pflag, int mflag) :
+    Map(const std::string &path, int oflag, int pflag, int mflag) :

         Map()
     {
         open(path, oflag, pflag, mflag);
     }
 
         Map()
     {
         open(path, oflag, pflag, mflag);
     }
 

-    Map(const char *path, bool edit) :
+    Map(const std::string &path, bool edit) :

         Map()
     {
         open(path, edit);
         Map()
     {
         open(path, edit);


@@ -798,20 +942,24 @@ class Map {
         clear();
     }
 
         clear();
     }
 

-    void open(const char *path, int oflag, int pflag, int mflag) {
+    bool empty() const {
+        return data_ == NULL;
+    }
+
+    void open(const std::string &path, int oflag, int pflag, int mflag) {

         clear();
 
         clear();
 

-        file_.open(path, oflag);
+        file_.open(path.c_str(), oflag);

         int file(file_.file());
 
         struct stat stat;
         _syscall(fstat(file, &stat));
         size_ = stat.st_size;
 
         int file(file_.file());
 
         struct stat stat;
         _syscall(fstat(file, &stat));
         size_ = stat.st_size;
 

-        _syscall(data_ = mmap(NULL, size_, pflag, mflag, file, 0));
+        data_ = _syscall(mmap(NULL, size_, pflag, mflag, file, 0));

     }
 
     }
 

-    void open(const char *path, bool edit) {
+    void open(const std::string &path, bool edit) {

         if (edit)
             open(path, O_RDWR, PROT_READ | PROT_WRITE, MAP_SHARED);
         else
         if (edit)
             open(path, O_RDWR, PROT_READ | PROT_WRITE, MAP_SHARED);
         else


@@ -830,10 +978,12 @@ class Map {
         return std::string(static_cast<char *>(data_), size_);
     }
 };
         return std::string(static_cast<char *>(data_), size_);
     }
 };

+#endif
+
+namespace ldid {

 
 

-void resign(const char *path, const char *temp, const char *name, const std::string &xml) {
-    Map input(path, O_RDONLY, PROT_READ | PROT_WRITE, MAP_PRIVATE);
-    FatHeader source(input.data(), input.size());
+static void Allocate(const void *idata, size_t isize, std::streambuf &output, const Functor<size_t (const MachHeader &, size_t)> &allocate, const Functor<size_t (const MachHeader &, std::streambuf &output, size_t, const std::string &, const char *)> &save) {
+    FatHeader source(const_cast<void *>(idata), isize);

 
     size_t offset(0);
     if (source.IsFat())
 
     size_t offset(0);
     if (source.IsFat())


@@ -868,221 +1018,1225 @@ void resign(const char *path, const char *temp, const char *name, const std::str
             size = end;
         }
 
             size = end;
         }
 

-        size_t alloc(0);
-        if (name != NULL) {
-            alloc += sizeof(struct SuperBlob);
-            uint32_t special(0);
+        size_t alloc(allocate(mach_header, size));

 
 

-            special = std::max(special, CSSLOT_CODEDIRECTORY);
-            alloc += sizeof(struct BlobIndex);
-            alloc += sizeof(struct CodeDirectory);
-            alloc += strlen(name) + 1;
+        auto *fat_arch(mach_header.GetFatArch());
+        uint32_t align;
+
+        if (fat_arch != NULL)
+            align = source.Swap(fat_arch->align);
+        else switch (mach_header.GetCPUType()) {
+            case CPU_TYPE_POWERPC:
+            case CPU_TYPE_POWERPC64:
+            case CPU_TYPE_X86:
+            case CPU_TYPE_X86_64:
+                align = 0xc;
+                break;
+            case CPU_TYPE_ARM:
+            case CPU_TYPE_ARM64:
+                align = 0xe;
+                break;
+            default:
+                align = 0x0;
+                break;
+        }

 
 

-            special = std::max(special, CSSLOT_REQUIREMENTS);
-            alloc += sizeof(struct BlobIndex);
-            alloc += 0xc;
+        offset = Align(offset, 1 << align);

 
 

-            if (xml.size() != 0) {
-                special = std::max(special, CSSLOT_ENTITLEMENTS);
-                alloc += sizeof(struct BlobIndex);
-                alloc += sizeof(struct Blob);
-                alloc += xml.size();
+        uint32_t limit(size);
+        if (alloc != 0)
+            limit = Align(limit, 0x10);
+
+        allocations.push_back(CodesignAllocation(mach_header, offset, size, limit, alloc, align));
+        offset += size + alloc;
+        offset = Align(offset, 0x10);
+    }
+
+    size_t position(0);
+
+    if (source.IsFat()) {
+        fat_header fat_header;
+        fat_header.magic = Swap(FAT_MAGIC);
+        fat_header.nfat_arch = Swap(uint32_t(allocations.size()));
+        put(output, &fat_header, sizeof(fat_header));
+        position += sizeof(fat_header);
+
+        _foreach (allocation, allocations) {
+            auto &mach_header(allocation.mach_header_);
+
+            fat_arch fat_arch;
+            fat_arch.cputype = Swap(mach_header->cputype);
+            fat_arch.cpusubtype = Swap(mach_header->cpusubtype);
+            fat_arch.offset = Swap(allocation.offset_);
+            fat_arch.size = Swap(allocation.limit_ + allocation.alloc_);
+            fat_arch.align = Swap(allocation.align_);
+            put(output, &fat_arch, sizeof(fat_arch));
+            position += sizeof(fat_arch);
+        }
+    }
+
+    _foreach (allocation, allocations) {
+        auto &mach_header(allocation.mach_header_);
+
+        pad(output, allocation.offset_ - position);
+        position = allocation.offset_;
+
+        std::vector<std::string> commands;
+
+        _foreach (load_command, mach_header.GetLoadCommands()) {
+            std::string copy(reinterpret_cast<const char *>(load_command), load_command->cmdsize);
+
+            switch (mach_header.Swap(load_command->cmd)) {
+                case LC_CODE_SIGNATURE:
+                    continue;
+                break;
+
+                case LC_SEGMENT: {
+                    auto segment_command(reinterpret_cast<struct segment_command *>(&copy[0]));
+                    if (strncmp(segment_command->segname, "__LINKEDIT", 16) != 0)
+                        break;
+                    size_t size(mach_header.Swap(allocation.limit_ + allocation.alloc_ - mach_header.Swap(segment_command->fileoff)));
+                    segment_command->filesize = size;
+                    segment_command->vmsize = Align(size, 1 << allocation.align_);
+                } break;
+
+                case LC_SEGMENT_64: {
+                    auto segment_command(reinterpret_cast<struct segment_command_64 *>(&copy[0]));
+                    if (strncmp(segment_command->segname, "__LINKEDIT", 16) != 0)
+                        break;
+                    size_t size(mach_header.Swap(allocation.limit_ + allocation.alloc_ - mach_header.Swap(segment_command->fileoff)));
+                    segment_command->filesize = size;
+                    segment_command->vmsize = Align(size, 1 << allocation.align_);
+                } break;

             }
 
             }
 

-            size_t normal((size + 0x1000 - 1) / 0x1000);
-            alloc = Align(alloc + (special + normal) * 0x14, 16);
+            commands.push_back(copy);

         }
 
         }
 

-        auto *fat_arch(mach_header.GetFatArch());
-        uint32_t align(fat_arch == NULL ? 0 : source.Swap(fat_arch->align));
-        offset = Align(offset, 1 << align);
+        if (allocation.alloc_ != 0) {
+            linkedit_data_command signature;
+            signature.cmd = mach_header.Swap(LC_CODE_SIGNATURE);
+            signature.cmdsize = mach_header.Swap(uint32_t(sizeof(signature)));
+            signature.dataoff = mach_header.Swap(allocation.limit_);
+            signature.datasize = mach_header.Swap(allocation.alloc_);
+            commands.push_back(std::string(reinterpret_cast<const char *>(&signature), sizeof(signature)));
+        }

 
 

-        allocations.push_back(CodesignAllocation(mach_header, offset, size, alloc, align));
-        offset += size + alloc;
-        offset = Align(offset, 16);
+        size_t begin(position);
+
+        uint32_t after(0);
+        _foreach(command, commands)
+            after += command.size();
+
+        std::stringbuf altern;
+
+        struct mach_header header(*mach_header);
+        header.ncmds = mach_header.Swap(uint32_t(commands.size()));
+        header.sizeofcmds = mach_header.Swap(after);
+        put(output, &header, sizeof(header));
+        put(altern, &header, sizeof(header));
+        position += sizeof(header);
+
+        if (mach_header.Bits64()) {
+            auto pad(mach_header.Swap(uint32_t(0)));
+            put(output, &pad, sizeof(pad));
+            put(altern, &pad, sizeof(pad));
+            position += sizeof(pad);
+        }
+
+        _foreach(command, commands) {
+            put(output, command.data(), command.size());
+            put(altern, command.data(), command.size());
+            position += command.size();
+        }
+
+        uint32_t before(mach_header.Swap(mach_header->sizeofcmds));
+        if (before > after) {
+            pad(output, before - after);
+            pad(altern, before - after);
+            position += before - after;
+        }
+
+        auto top(reinterpret_cast<char *>(mach_header.GetBase()));
+
+        std::string overlap(altern.str());
+        overlap.append(top + overlap.size(), Align(overlap.size(), 0x1000) - overlap.size());
+
+        put(output, top + (position - begin), allocation.size_ - (position - begin));
+        position = begin + allocation.size_;
+
+        pad(output, allocation.limit_ - allocation.size_);
+        position += allocation.limit_ - allocation.size_;
+
+        size_t saved(save(mach_header, output, allocation.limit_, overlap, top));
+        if (allocation.alloc_ > saved)
+            pad(output, allocation.alloc_ - saved);
+        position += allocation.alloc_;

     }
     }

+}

 
 

-    fclose(fopen(temp, "w+"));
-    _syscall(truncate(temp, offset));
+}
+
+typedef std::map<uint32_t, std::string> Blobs;

 
 

-    Map output(temp, O_RDWR, PROT_READ | PROT_WRITE, MAP_SHARED);
-    _assert(output.size() == offset);
-    void *file(output.data());
-    memset(file, 0, offset);
+static void insert(Blobs &blobs, uint32_t slot, const std::stringbuf &buffer) {
+    auto value(buffer.str());
+    std::swap(blobs[slot], value);
+}

 
 

-    fat_arch *fat_arch;
-    if (!source.IsFat())
-        fat_arch = NULL;
-    else {
-        auto *fat_header(reinterpret_cast<struct fat_header *>(file));
-        fat_header->magic = Swap(FAT_MAGIC);
-        fat_header->nfat_arch = Swap(source.Swap(source->nfat_arch));
-        fat_arch = reinterpret_cast<struct fat_arch *>(fat_header + 1);
+static void insert(Blobs &blobs, uint32_t slot, uint32_t magic, const std::stringbuf &buffer) {
+    auto value(buffer.str());
+    Blob blob;
+    blob.magic = Swap(magic);
+    blob.length = Swap(uint32_t(sizeof(blob) + value.size()));
+    value.insert(0, reinterpret_cast<char *>(&blob), sizeof(blob));
+    std::swap(blobs[slot], value);
+}
+
+static size_t put(std::streambuf &output, uint32_t magic, const Blobs &blobs) {
+    size_t total(0);
+    _foreach (blob, blobs)
+        total += blob.second.size();
+
+    struct SuperBlob super;
+    super.blob.magic = Swap(magic);
+    super.blob.length = Swap(uint32_t(sizeof(SuperBlob) + blobs.size() * sizeof(BlobIndex) + total));
+    super.count = Swap(uint32_t(blobs.size()));
+    put(output, &super, sizeof(super));
+
+    size_t offset(sizeof(SuperBlob) + sizeof(BlobIndex) * blobs.size());
+
+    _foreach (blob, blobs) {
+        BlobIndex index;
+        index.type = Swap(blob.first);
+        index.offset = Swap(uint32_t(offset));
+        put(output, &index, sizeof(index));
+        offset += blob.second.size();

     }
 
     }
 

-    _foreach (allocation, allocations) {
-        auto &source(allocation.mach_header_);
-
-        uint32_t align(allocation.size_);
-        if (allocation.alloc_ != 0)
-            align = Align(align, 0x10);
-
-        if (fat_arch != NULL) {
-            fat_arch->cputype = Swap(source->cputype);
-            fat_arch->cpusubtype = Swap(source->cpusubtype);
-            fat_arch->offset = Swap(allocation.offset_);
-            fat_arch->size = Swap(align + allocation.alloc_);
-            fat_arch->align = Swap(allocation.align_);
-            ++fat_arch;
+    _foreach (blob, blobs)
+        put(output, blob.second.data(), blob.second.size());
+
+    return offset;
+}
+
+#ifndef LDID_NOSMIME
+class Buffer {
+  private:
+    BIO *bio_;
+
+  public:
+    Buffer(BIO *bio) :
+        bio_(bio)
+    {
+        _assert(bio_ != NULL);
+    }
+
+    Buffer() :
+        bio_(BIO_new(BIO_s_mem()))
+    {
+    }
+
+    Buffer(const char *data, size_t size) :
+        Buffer(BIO_new_mem_buf(const_cast<char *>(data), size))
+    {
+    }
+
+    Buffer(const std::string &data) :
+        Buffer(data.data(), data.size())
+    {
+    }
+
+    Buffer(PKCS7 *pkcs) :
+        Buffer()
+    {
+        _assert(i2d_PKCS7_bio(bio_, pkcs) != 0);
+    }
+
+    ~Buffer() {
+        BIO_free_all(bio_);
+    }
+
+    operator BIO *() const {
+        return bio_;
+    }
+
+    explicit operator std::string() const {
+        char *data;
+        auto size(BIO_get_mem_data(bio_, &data));
+        return std::string(data, size);
+    }
+};
+
+class Stuff {
+  private:
+    PKCS12 *value_;
+    EVP_PKEY *key_;
+    X509 *cert_;
+    STACK_OF(X509) *ca_;
+
+  public:
+    Stuff(BIO *bio) :
+        value_(d2i_PKCS12_bio(bio, NULL)),
+        ca_(NULL)
+    {
+        _assert(value_ != NULL);
+        _assert(PKCS12_parse(value_, "", &key_, &cert_, &ca_) != 0);
+        _assert(key_ != NULL);
+        _assert(cert_ != NULL);
+    }
+
+    Stuff(const std::string &data) :
+        Stuff(Buffer(data))
+    {
+    }
+
+    ~Stuff() {
+        sk_X509_pop_free(ca_, X509_free);
+        X509_free(cert_);
+        EVP_PKEY_free(key_);
+        PKCS12_free(value_);
+    }
+
+    operator PKCS12 *() const {
+        return value_;
+    }
+
+    operator EVP_PKEY *() const {
+        return key_;
+    }
+
+    operator X509 *() const {
+        return cert_;
+    }
+
+    operator STACK_OF(X509) *() const {
+        return ca_;
+    }
+};
+
+class Signature {
+  private:
+    PKCS7 *value_;
+
+  public:
+    Signature(const Stuff &stuff, const Buffer &data) :
+        value_(PKCS7_sign(stuff, stuff, stuff, data, PKCS7_BINARY | PKCS7_DETACHED))
+    {
+        _assert(value_ != NULL);
+    }
+
+    ~Signature() {
+        PKCS7_free(value_);
+    }
+
+    operator PKCS7 *() const {
+        return value_;
+    }
+};
+#endif
+
+class NullBuffer :
+    public std::streambuf
+{
+  public:
+    virtual std::streamsize xsputn(const char_type *data, std::streamsize size) {
+        return size;
+    }
+
+    virtual int_type overflow(int_type next) {
+        return next;
+    }
+};
+
+class Hash {
+  public:
+    char sha1_[LDID_SHA1_DIGEST_LENGTH];
+    char sha256_[LDID_SHA256_DIGEST_LENGTH];
+
+    operator std::vector<char>() const {
+        return {sha1_, sha1_ + sizeof(sha1_)};
+    }
+};
+
+class HashBuffer :
+    public std::streambuf
+{
+  private:
+    Hash &hash_;
+
+    LDID_SHA1_CTX sha1_;
+    LDID_SHA256_CTX sha256_;
+
+  public:
+    HashBuffer(Hash &hash) :
+        hash_(hash)
+    {
+        LDID_SHA1_Init(&sha1_);
+        LDID_SHA256_Init(&sha256_);
+    }
+
+    ~HashBuffer() {
+        LDID_SHA1_Final(reinterpret_cast<uint8_t *>(hash_.sha1_), &sha1_);
+        LDID_SHA256_Final(reinterpret_cast<uint8_t *>(hash_.sha256_), &sha256_);
+    }
+
+    virtual std::streamsize xsputn(const char_type *data, std::streamsize size) {
+        LDID_SHA1_Update(&sha1_, data, size);
+        LDID_SHA256_Update(&sha256_, data, size);
+        return size;
+    }
+
+    virtual int_type overflow(int_type next) {
+        if (next == traits_type::eof())
+            return sync();
+        char value(next);
+        xsputn(&value, 1);
+        return next;
+    }
+};
+
+class HashProxy :
+    public HashBuffer
+{
+  private:
+    std::streambuf &buffer_;
+
+  public:
+    HashProxy(Hash &hash, std::streambuf &buffer) :
+        HashBuffer(hash),
+        buffer_(buffer)
+    {
+    }
+
+    virtual std::streamsize xsputn(const char_type *data, std::streamsize size) {
+        _assert(HashBuffer::xsputn(data, size) == size);
+        return buffer_.sputn(data, size);
+    }
+};
+
+#ifndef LDID_NOTOOLS
+static bool Starts(const std::string &lhs, const std::string &rhs) {
+    return lhs.size() >= rhs.size() && lhs.compare(0, rhs.size(), rhs) == 0;
+}
+
+class Split {
+  public:
+    std::string dir;
+    std::string base;
+
+    Split(const std::string &path) {
+        size_t slash(path.rfind('/'));
+        if (slash == std::string::npos)
+            base = path;
+        else {
+            dir = path.substr(0, slash + 1);
+            base = path.substr(slash + 1);

         }
         }

+    }
+};

 
 

-        void *target(reinterpret_cast<uint8_t *>(file) + allocation.offset_);
-        memcpy(target, source, allocation.size_);
-        MachHeader mach_header(target, align + allocation.alloc_);
+static void mkdir_p(const std::string &path) {
+    if (path.empty())
+        return;
+#ifdef __WIN32__
+    if (_syscall(mkdir(path.c_str()), EEXIST) == -EEXIST)
+        return;
+#else
+    if (_syscall(mkdir(path.c_str(), 0755), EEXIST) == -EEXIST)
+        return;
+#endif
+    auto slash(path.rfind('/', path.size() - 1));
+    if (slash == std::string::npos)
+        return;
+    mkdir_p(path.substr(0, slash));
+}

 
 

-        struct linkedit_data_command *signature(NULL);
-        _foreach (load_command, mach_header.GetLoadCommands()) {
-            uint32_t cmd(mach_header.Swap(load_command->cmd));
-            if (cmd != LC_CODE_SIGNATURE)
-                continue;
-            signature = reinterpret_cast<struct linkedit_data_command *>(load_command);
-            break;
+static std::string Temporary(std::filebuf &file, const Split &split) {
+    std::string temp(split.dir + ".ldid." + split.base);
+    mkdir_p(split.dir);
+    _assert_(file.open(temp.c_str(), std::ios::out | std::ios::trunc | std::ios::binary) == &file, "open(): %s", temp.c_str());
+    return temp;
+}
+
+static void Commit(const std::string &path, const std::string &temp) {
+    struct stat info;
+    if (_syscall(stat(path.c_str(), &info), ENOENT) == 0) {
+#ifndef __WIN32__
+        _syscall(chown(temp.c_str(), info.st_uid, info.st_gid));
+#endif
+        _syscall(chmod(temp.c_str(), info.st_mode));
+    }
+
+    _syscall(rename(temp.c_str(), path.c_str()));
+}
+#endif
+
+namespace ldid {
+
+void Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, const std::string &requirement, const std::string &key, const Slots &slots) {
+    std::string team;
+
+#ifndef LDID_NOSMIME
+    if (!key.empty()) {
+        Stuff stuff(key);
+        auto name(X509_get_subject_name(stuff));
+        _assert(name != NULL);
+        auto index(X509_NAME_get_index_by_NID(name, NID_organizationalUnitName, -1));
+        _assert(index >= 0);
+        auto next(X509_NAME_get_index_by_NID(name, NID_organizationalUnitName, index));
+        _assert(next == -1);
+        auto entry(X509_NAME_get_entry(name, index));
+        _assert(entry != NULL);
+        auto asn(X509_NAME_ENTRY_get_data(entry));
+        _assert(asn != NULL);
+        team.assign(reinterpret_cast<char *>(ASN1_STRING_data(asn)), ASN1_STRING_length(asn));
+    }
+#endif
+
+    Allocate(idata, isize, output, fun([&](const MachHeader &mach_header, size_t size) -> size_t {
+        size_t alloc(sizeof(struct SuperBlob));
+
+        uint32_t special(0);
+
+        special = std::max(special, CSSLOT_REQUIREMENTS);
+        alloc += sizeof(struct BlobIndex);
+        if (!requirement.empty())
+            alloc += 0xc;
+        else
+            alloc += requirement.size();
+
+        if (!entitlements.empty()) {
+            special = std::max(special, CSSLOT_ENTITLEMENTS);
+            alloc += sizeof(struct BlobIndex);
+            alloc += sizeof(struct Blob);
+            alloc += entitlements.size();

         }
 
         }
 

-        _foreach (segment, mach_header.GetSegments("__LINKEDIT")) {
-            size_t size(mach_header.Swap(align + allocation.alloc_ - mach_header.Swap(segment->fileoff)));
-            segment->filesize = size;
-            segment->vmsize = Align(size, 0x1000);
+        special = std::max(special, CSSLOT_CODEDIRECTORY);
+        alloc += sizeof(struct BlobIndex);
+        alloc += sizeof(struct Blob);
+        alloc += sizeof(struct CodeDirectory);
+        alloc += identifier.size() + 1;
+
+        if (!team.empty())
+            alloc += team.size() + 1;
+
+        if (!key.empty()) {
+            alloc += sizeof(struct BlobIndex);
+            alloc += sizeof(struct Blob);
+            // XXX: this is just a "sufficiently large number"
+            alloc += 0x3000;

         }
 
         }
 

-        _foreach (segment, mach_header.GetSegments64("__LINKEDIT")) {
-            size_t size(mach_header.Swap(align + allocation.alloc_ - mach_header.Swap(segment->fileoff)));
-            segment->filesize = size;
-            segment->vmsize = Align(size, 0x1000);
+        _foreach (slot, slots)
+            special = std::max(special, slot.first);
+
+        mach_header.ForSection(fun([&](const char *segment, const char *section, void *data, size_t size) {
+            if (strcmp(segment, "__TEXT") == 0 && section != NULL && strcmp(section, "__info_plist") == 0)
+                special = std::max(special, CSSLOT_INFOSLOT);
+        }));
+
+        uint32_t normal((size + PageSize_ - 1) / PageSize_);
+        alloc = Align(alloc + (special + normal) * LDID_SHA1_DIGEST_LENGTH, 16);
+        return alloc;
+    }), fun([&](const MachHeader &mach_header, std::streambuf &output, size_t limit, const std::string &overlap, const char *top) -> size_t {
+        Blobs blobs;
+
+        if (true) {
+            std::stringbuf data;
+
+            if (requirement.empty()) {
+                Blobs requirements;
+                put(data, CSMAGIC_REQUIREMENTS, requirements);
+            } else {
+                put(data, requirement.data(), requirement.size());
+            }
+
+            insert(blobs, CSSLOT_REQUIREMENTS, data);

         }
 
         }
 

-        if (name == NULL && signature != NULL) {
-            auto before(reinterpret_cast<uint8_t *>(mach_header.GetLoadCommand()));
-            auto after(reinterpret_cast<uint8_t *>(signature));
-            auto next(mach_header.Swap(signature->cmdsize));
-            auto total(mach_header.Swap(mach_header->sizeofcmds));
-            memmove(signature, after + next, before + total - after - next);
-            memset(before + total - next, 0, next);
-            mach_header->ncmds = mach_header.Swap(mach_header.Swap(mach_header->ncmds) - 1);
-            mach_header->sizeofcmds = mach_header.Swap(total - next);
-            signature = NULL;
+        if (!entitlements.empty()) {
+            std::stringbuf data;
+            put(data, entitlements.data(), entitlements.size());
+            insert(blobs, CSSLOT_ENTITLEMENTS, CSMAGIC_EMBEDDED_ENTITLEMENTS, data);

         }
 
         }
 

-        if (name != NULL) {
-            if (signature == NULL) {
-                signature = reinterpret_cast<struct linkedit_data_command *>(reinterpret_cast<uint8_t *>(mach_header.GetLoadCommand()) + mach_header.Swap(mach_header->sizeofcmds));
-                signature->cmd = mach_header.Swap(LC_CODE_SIGNATURE);
-                signature->cmdsize = mach_header.Swap(uint32_t(sizeof(*signature)));
-                mach_header->ncmds = mach_header.Swap(mach_header.Swap(mach_header->ncmds) + 1);
-                mach_header->sizeofcmds = mach_header.Swap(mach_header.Swap(mach_header->sizeofcmds) + uint32_t(sizeof(*signature)));
+        if (true) {
+            std::stringbuf data;
+
+            Slots posts(slots);
+
+            mach_header.ForSection(fun([&](const char *segment, const char *section, void *data, size_t size) {
+                if (strcmp(segment, "__TEXT") == 0 && section != NULL && strcmp(section, "__info_plist") == 0)
+                    sha1(posts[CSSLOT_INFOSLOT], data, size);
+            }));
+
+            uint32_t special(0);
+            _foreach (blob, blobs)
+                special = std::max(special, blob.first);
+            _foreach (slot, posts)
+                special = std::max(special, slot.first);
+            uint32_t normal((limit + PageSize_ - 1) / PageSize_);
+
+            CodeDirectory directory;
+            directory.version = Swap(uint32_t(0x00020200));
+            directory.flags = Swap(uint32_t(0));
+            directory.nSpecialSlots = Swap(special);
+            directory.codeLimit = Swap(uint32_t(limit));
+            directory.nCodeSlots = Swap(normal);
+            directory.hashSize = LDID_SHA1_DIGEST_LENGTH;
+            directory.hashType = CS_HASHTYPE_SHA1;
+            directory.spare1 = 0x00;
+            directory.pageSize = PageShift_;
+            directory.spare2 = Swap(uint32_t(0));
+            directory.scatterOffset = Swap(uint32_t(0));
+            directory.spare3 = Swap(uint32_t(0));
+            directory.codeLimit64 = Swap(uint64_t(0));
+
+            uint32_t offset(sizeof(Blob) + sizeof(CodeDirectory));
+
+            directory.identOffset = Swap(uint32_t(offset));
+            offset += identifier.size() + 1;
+
+            if (team.empty())
+                directory.teamIDOffset = Swap(uint32_t(0));
+            else {
+                directory.teamIDOffset = Swap(uint32_t(offset));
+                offset += team.size() + 1;

             }
 
             }
 

-            signature->dataoff = mach_header.Swap(align);
-            signature->datasize = mach_header.Swap(allocation.alloc_);
+            offset += LDID_SHA1_DIGEST_LENGTH * special;
+            directory.hashOffset = Swap(uint32_t(offset));
+            offset += LDID_SHA1_DIGEST_LENGTH * normal;

 
 

-            uint32_t data = mach_header.Swap(signature->dataoff);
-            uint32_t size = mach_header.Swap(signature->datasize);
+            put(data, &directory, sizeof(directory));

 
 

-            uint8_t *top = reinterpret_cast<uint8_t *>(mach_header.GetBase());
-            uint8_t *blob = top + data;
-            struct SuperBlob *super = reinterpret_cast<struct SuperBlob *>(blob);
-            super->blob.magic = Swap(CSMAGIC_EMBEDDED_SIGNATURE);
+            put(data, identifier.c_str(), identifier.size() + 1);
+            put(data, team.c_str(), team.size() + 1);

 
 

-            uint32_t count = xml.size() == 0 ? 2 : 3;
-            uint32_t offset = sizeof(struct SuperBlob) + count * sizeof(struct BlobIndex);
+            uint8_t storage[special + normal][LDID_SHA1_DIGEST_LENGTH];
+            uint8_t (*hashes)[LDID_SHA1_DIGEST_LENGTH] = storage + special;

 
 

-            super->index[0].type = Swap(CSSLOT_CODEDIRECTORY);
-            super->index[0].offset = Swap(offset);
+            memset(storage, 0, sizeof(*storage) * special);

 
 

-            uint32_t begin = offset;
-            struct CodeDirectory *directory = reinterpret_cast<struct CodeDirectory *>(blob + begin);
-            offset += sizeof(struct CodeDirectory);
+            _foreach (blob, blobs) {
+                auto local(reinterpret_cast<const Blob *>(&blob.second[0]));
+                sha1((uint8_t *) (hashes - blob.first), local, Swap(local->length));
+            }

 
 

-            directory->blob.magic = Swap(CSMAGIC_CODEDIRECTORY);
-            directory->version = Swap(uint32_t(0x00020001));
-            directory->flags = Swap(uint32_t(0));
-            directory->codeLimit = Swap(data);
-            directory->hashSize = 0x14;
-            directory->hashType = 0x01;
-            directory->spare1 = 0x00;
-            directory->pageSize = 0x0c;
-            directory->spare2 = Swap(uint32_t(0));
+            _foreach (slot, posts) {
+                _assert(sizeof(*hashes) == slot.second.size());
+                memcpy(hashes - slot.first, slot.second.data(), slot.second.size());
+            }

 
 

-            directory->identOffset = Swap(offset - begin);
-            strcpy(reinterpret_cast<char *>(blob + offset), name);
-            offset += strlen(name) + 1;
+            if (normal != 1)
+                for (size_t i = 0; i != normal - 1; ++i)
+                    sha1(hashes[i], (PageSize_ * i < overlap.size() ? overlap.data() : top) + PageSize_ * i, PageSize_);
+            if (normal != 0)
+                sha1(hashes[normal - 1], top + PageSize_ * (normal - 1), ((limit - 1) % PageSize_) + 1);

 
 

-            uint32_t special = xml.size() == 0 ? CSSLOT_REQUIREMENTS : CSSLOT_ENTITLEMENTS;
-            directory->nSpecialSlots = Swap(special);
+            put(data, storage, sizeof(storage));

 
 

-            uint8_t (*hashes)[20] = reinterpret_cast<uint8_t (*)[20]>(blob + offset);
-            memset(hashes, 0, sizeof(*hashes) * special);
+            insert(blobs, CSSLOT_CODEDIRECTORY, CSMAGIC_CODEDIRECTORY, data);
+        }

 
 

-            offset += sizeof(*hashes) * special;
-            hashes += special;
+#ifndef LDID_NOSMIME
+        if (!key.empty()) {
+            std::stringbuf data;
+            const std::string &sign(blobs[CSSLOT_CODEDIRECTORY]);

 
 

-            uint32_t pages = (data + 0x1000 - 1) / 0x1000;
-            directory->nCodeSlots = Swap(pages);
+            Stuff stuff(key);
+            Buffer bio(sign);

 
 

-            if (pages != 1)
-                for (size_t i = 0; i != pages - 1; ++i)
-                    sha1(hashes[i], top + 0x1000 * i, 0x1000);
-            if (pages != 0)
-                sha1(hashes[pages - 1], top + 0x1000 * (pages - 1), ((data - 1) % 0x1000) + 1);
+            Signature signature(stuff, sign);
+            Buffer result(signature);
+            std::string value(result);
+            put(data, value.data(), value.size());

 
 

-            directory->hashOffset = Swap(offset - begin);
-            offset += sizeof(*hashes) * pages;
-            directory->blob.length = Swap(offset - begin);
+            insert(blobs, CSSLOT_SIGNATURESLOT, CSMAGIC_BLOBWRAPPER, data);
+        }
+#endif

 
 

-            super->index[1].type = Swap(CSSLOT_REQUIREMENTS);
-            super->index[1].offset = Swap(offset);
+        return put(output, CSMAGIC_EMBEDDED_SIGNATURE, blobs);
+    }));
+}

 
 

-            memcpy(blob + offset, "\xfa\xde\x0c\x01\x00\x00\x00\x0c\x00\x00\x00\x00", 0xc);
-            offset += 0xc;
+#ifndef LDID_NOTOOLS
+static void Unsign(void *idata, size_t isize, std::streambuf &output) {
+    Allocate(idata, isize, output, fun([](const MachHeader &mach_header, size_t size) -> size_t {
+        return 0;
+    }), fun([](const MachHeader &mach_header, std::streambuf &output, size_t limit, const std::string &overlap, const char *top) -> size_t {
+        return 0;
+    }));
+}

 
 

-            if (xml.size() != 0) {
-                super->index[2].type = Swap(CSSLOT_ENTITLEMENTS);
-                super->index[2].offset = Swap(offset);
+std::string DiskFolder::Path(const std::string &path) {
+    return path_ + "/" + path;
+}

 
 

-                uint32_t begin = offset;
-                struct Blob *entitlements = reinterpret_cast<struct Blob *>(blob + begin);
-                offset += sizeof(struct Blob);
+DiskFolder::DiskFolder(const std::string &path) :
+    path_(path)
+{
+}

 
 

-                memcpy(blob + offset, xml.data(), xml.size());
-                offset += xml.size();
+DiskFolder::~DiskFolder() {
+    if (!std::uncaught_exception())
+        for (const auto &commit : commit_)
+            Commit(commit.first, commit.second);
+}

 
 

-                entitlements->magic = Swap(CSMAGIC_ENTITLEMENTS);
-                entitlements->length = Swap(offset - begin);
-            }
+#ifndef __WIN32__
+std::string readlink(const std::string &path) {
+    for (size_t size(1024); ; size *= 2) {
+        std::string data;
+        data.resize(size);
+
+        int writ(_syscall(::readlink(path.c_str(), &data[0], data.size())));
+        if (size_t(writ) >= size)
+            continue;
+
+        data.resize(writ);
+        return data;
+    }
+}
+#endif
+
+void DiskFolder::Find(const std::string &root, const std::string &base, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) {
+    std::string path(Path(root) + base);
+
+    DIR *dir(opendir(path.c_str()));
+    _assert(dir != NULL);
+    _scope({ _syscall(closedir(dir)); });
+
+    while (auto child = readdir(dir)) {
+        std::string name(child->d_name);
+        if (name == "." || name == "..")
+            continue;
+        if (Starts(name, ".ldid."))
+            continue;
+
+        bool directory;
+
+#ifdef __WIN32__
+        struct stat info;
+        _syscall(stat((path + name).c_str(), &info));
+        if (false);
+        else if (S_ISDIR(info.st_mode))
+            directory = true;
+        else if (S_ISREG(info.st_mode))
+            directory = false;
+        else
+            _assert_(false, "st_mode=%x", info.st_mode);
+#else
+        switch (child->d_type) {
+            case DT_DIR:
+                directory = true;
+                break;
+            case DT_REG:
+                directory = false;
+                break;
+            case DT_LNK:
+                link(base + name, fun([&]() { return readlink(path + name); }));
+                continue;
+            default:
+                _assert_(false, "d_type=%u", child->d_type);
+        }
+#endif
+
+        if (directory)
+            Find(root, base + name + "/", code, link);
+        else
+            code(base + name, fun([&](const Functor<void (std::streambuf &, std::streambuf &)> &code) {
+                std::string access(root + base + name);
+                _assert_(Open(access, fun([&](std::streambuf &data, const void *flag) {
+                    auto from(path + name);
+                    std::filebuf save;
+                    commit_[from] = Temporary(save, from);
+                    code(data, save);
+                })), "open(): %s", access.c_str());
+            }));
+    }
+}
+
+void DiskFolder::Save(const std::string &path, const void *flag, const Functor<void (std::streambuf &)> &code) {
+    std::filebuf save;
+    auto from(Path(path));
+    commit_[from] = Temporary(save, from);
+    code(save);
+}
+
+bool DiskFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) {
+    std::filebuf data;
+    auto result(data.open(Path(path).c_str(), std::ios::binary | std::ios::in));
+    if (result == NULL)
+        return false;
+    _assert(result == &data);
+    code(data, NULL);
+    return true;
+}
+
+void DiskFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) {
+    Find(path, "", code, link);
+}
+#endif
+
+SubFolder::SubFolder(Folder &parent, const std::string &path) :
+    parent_(parent),
+    path_(path)
+{
+}
+
+void SubFolder::Save(const std::string &path, const void *flag, const Functor<void (std::streambuf &)> &code) {
+    return parent_.Save(path_ + path, flag, code);
+}
+
+bool SubFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) {
+    return parent_.Open(path_ + path, code);
+}

 
 

-            for (size_t index(0); index != count; ++index) {
-                uint32_t type = Swap(super->index[index].type);
-                if (type != 0 && type <= special) {
-                    uint32_t offset = Swap(super->index[index].offset);
-                    struct Blob *local = (struct Blob *) (blob + offset);
-                    sha1((uint8_t *) (hashes - type), (uint8_t *) local, Swap(local->length));
+void SubFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) {
+    return parent_.Find(path_ + path, code, link);
+}
+
+std::string UnionFolder::Map(const std::string &path) {
+    auto remap(remaps_.find(path));
+    if (remap == remaps_.end())
+        return path;
+    return remap->second;
+}
+
+void UnionFolder::Map(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const std::string &file, const Functor<void (const Functor<void (std::streambuf &, const void *)> &)> &save) {
+    if (file.size() >= path.size() && file.substr(0, path.size()) == path)
+        code(file.substr(path.size()), fun([&](const Functor<void (std::streambuf &, std::streambuf &)> &code) {
+            save(fun([&](std::streambuf &data, const void *flag) {
+                parent_.Save(file, flag, fun([&](std::streambuf &save) {
+                    code(data, save);
+                }));
+            }));
+        }));
+}
+
+UnionFolder::UnionFolder(Folder &parent) :
+    parent_(parent)
+{
+}
+
+void UnionFolder::Save(const std::string &path, const void *flag, const Functor<void (std::streambuf &)> &code) {
+    return parent_.Save(Map(path), flag, code);
+}
+
+bool UnionFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) {
+    auto file(resets_.find(path));
+    if (file == resets_.end())
+        return parent_.Open(Map(path), code);
+    auto &entry(file->second);
+
+    auto &data(entry.first);
+    data.pubseekpos(0, std::ios::in);
+    code(data, entry.second);
+    return true;
+}
+
+void UnionFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) {
+    parent_.Find(path, fun([&](const std::string &name, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &save) {
+        if (deletes_.find(path + name) == deletes_.end())
+            code(name, save);
+    }), fun([&](const std::string &name, const Functor<std::string ()> &read) {
+        if (deletes_.find(path + name) == deletes_.end())
+            link(name, read);
+    }));
+
+    for (auto &reset : resets_)
+        Map(path, code, reset.first, fun([&](const Functor<void (std::streambuf &, const void *)> &code) {
+            auto &entry(reset.second);
+            entry.first.pubseekpos(0, std::ios::in);
+            code(entry.first, entry.second);
+        }));
+
+    for (auto &remap : remaps_)
+        Map(path, code, remap.first, fun([&](const Functor<void (std::streambuf &, const void *)> &code) {
+            parent_.Open(remap.second, fun([&](std::streambuf &data, const void *flag) {
+                code(data, flag);
+            }));
+        }));
+}
+
+#ifndef LDID_NOTOOLS
+static size_t copy(std::streambuf &source, std::streambuf &target) {
+    size_t total(0);
+    for (;;) {
+        char data[4096];
+        size_t writ(source.sgetn(data, sizeof(data)));
+        if (writ == 0)
+            break;
+        _assert(target.sputn(data, writ) == writ);
+        total += writ;
+    }
+    return total;
+}
+
+#ifndef LDID_NOPLIST
+static plist_t plist(const std::string &data) {
+    plist_t plist(NULL);
+    if (Starts(data, "bplist00"))
+        plist_from_bin(data.data(), data.size(), &plist);
+    else
+        plist_from_xml(data.data(), data.size(), &plist);
+    _assert(plist != NULL);
+    return plist;
+}
+
+static void plist_d(std::streambuf &buffer, const Functor<void (plist_t)> &code) {
+    std::stringbuf data;
+    copy(buffer, data);
+    auto node(plist(data.str()));
+    _scope({ plist_free(node); });
+    _assert(plist_get_node_type(node) == PLIST_DICT);
+    code(node);
+}
+
+static std::string plist_s(plist_t node) {
+    _assert(node != NULL);
+    _assert(plist_get_node_type(node) == PLIST_STRING);
+    char *data;
+    plist_get_string_val(node, &data);
+    _scope({ free(data); });
+    return data;
+}
+#endif
+
+enum Mode {
+    NoMode,
+    OptionalMode,
+    OmitMode,
+    NestedMode,
+    TopMode,
+};
+
+class Expression {
+  private:
+    regex_t regex_;
+
+  public:
+    Expression(const std::string &code) {
+        _assert_(regcomp(&regex_, code.c_str(), REG_EXTENDED | REG_NOSUB) == 0, "regcomp()");
+    }
+
+    ~Expression() {
+        regfree(&regex_);
+    }
+
+    bool operator ()(const std::string &data) const {
+        auto value(regexec(&regex_, data.c_str(), 0, NULL, 0));
+        if (value == REG_NOMATCH)
+            return false;
+        _assert_(value == 0, "regexec()");
+        return true;
+    }
+};
+
+struct Rule {
+    unsigned weight_;
+    Mode mode_;
+    std::string code_;
+
+    mutable std::auto_ptr<Expression> regex_;
+
+    Rule(unsigned weight, Mode mode, const std::string &code) :
+        weight_(weight),
+        mode_(mode),
+        code_(code)
+    {
+    }
+
+    Rule(const Rule &rhs) :
+        weight_(rhs.weight_),
+        mode_(rhs.mode_),
+        code_(rhs.code_)
+    {
+    }
+
+    void Compile() const {
+        regex_.reset(new Expression(code_));
+    }
+
+    bool operator ()(const std::string &data) const {
+        _assert(regex_.get() != NULL);
+        return (*regex_)(data);
+    }
+
+    bool operator <(const Rule &rhs) const {
+        if (weight_ > rhs.weight_)
+            return true;
+        if (weight_ < rhs.weight_)
+            return false;
+        return mode_ > rhs.mode_;
+    }
+};
+
+struct RuleCode {
+    bool operator ()(const Rule *lhs, const Rule *rhs) const {
+        return lhs->code_ < rhs->code_;
+    }
+};
+
+#ifndef LDID_NOPLIST
+static void Sign(const uint8_t *prefix, size_t size, std::streambuf &buffer, Hash &hash, std::streambuf &save, const std::string &identifier, const std::string &entitlements, const std::string &requirement, const std::string &key, const Slots &slots) {
+    // XXX: this is a miserable fail
+    std::stringbuf temp;
+    put(temp, prefix, size);
+    copy(buffer, temp);
+    auto data(temp.str());
+
+    HashProxy proxy(hash, save);
+    Sign(data.data(), data.size(), proxy, identifier, entitlements, requirement, key, slots);
+}
+
+std::string Bundle(const std::string &root, Folder &folder, const std::string &key, std::set<std::string> &remote, const std::string &entitlements, const std::string &requirement) {
+    std::string executable;
+    std::string identifier;
+
+    static const std::string info("Info.plist");
+
+    _assert_(folder.Open(info, fun([&](std::streambuf &buffer, const void *flag) {
+        plist_d(buffer, fun([&](plist_t node) {
+            executable = plist_s(plist_dict_get_item(node, "CFBundleExecutable"));
+            identifier = plist_s(plist_dict_get_item(node, "CFBundleIdentifier"));
+        }));
+    })), "open(): Info.plist");
+
+    static const std::string directory("_CodeSignature/");
+    static const std::string signature(directory + "CodeResources");
+
+    std::map<std::string, std::multiset<Rule>> versions;
+
+    auto &rules1(versions[""]);
+    auto &rules2(versions["2"]);
+
+    folder.Open(signature, fun([&](std::streambuf &buffer, const void *) {
+        plist_d(buffer, fun([&](plist_t node) {
+            // XXX: maybe attempt to preserve existing rules
+        }));
+    }));
+
+    if (true) {
+        rules1.insert(Rule{1, NoMode, "^"});
+        rules1.insert(Rule{10000, OmitMode, "^(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/|())SC_Info/[^/]+\\.(sinf|supf|supp)$"});
+        rules1.insert(Rule{1000, OptionalMode, "^.*\\.lproj/"});
+        rules1.insert(Rule{1100, OmitMode, "^.*\\.lproj/locversion.plist$"});
+        rules1.insert(Rule{10000, OmitMode, "^Watch/[^/]+\\.app/(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/)SC_Info/[^/]+\\.(sinf|supf|supp)$"});
+        rules1.insert(Rule{1, NoMode, "^version.plist$"});
+    }
+
+    if (true) {
+        rules2.insert(Rule{11, NoMode, ".*\\.dSYM($|/)"});
+        rules2.insert(Rule{20, NoMode, "^"});
+        rules2.insert(Rule{2000, OmitMode, "^(.*/)?\\.DS_Store$"});
+        rules2.insert(Rule{10000, OmitMode, "^(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/|())SC_Info/[^/]+\\.(sinf|supf|supp)$"});
+        rules2.insert(Rule{10, NestedMode, "^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/"});
+        rules2.insert(Rule{1, NoMode, "^.*"});
+        rules2.insert(Rule{1000, OptionalMode, "^.*\\.lproj/"});
+        rules2.insert(Rule{1100, OmitMode, "^.*\\.lproj/locversion.plist$"});
+        rules2.insert(Rule{20, OmitMode, "^Info\\.plist$"});
+        rules2.insert(Rule{20, OmitMode, "^PkgInfo$"});
+        rules2.insert(Rule{10000, OmitMode, "^Watch/[^/]+\\.app/(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/)SC_Info/[^/]+\\.(sinf|supf|supp)$"});
+        rules2.insert(Rule{10, NestedMode, "^[^/]+$"});
+        rules2.insert(Rule{20, NoMode, "^embedded\\.provisionprofile$"});
+        rules2.insert(Rule{20, NoMode, "^version\\.plist$"});
+    }
+
+    std::map<std::string, Hash> hashes;
+    std::set<std::string> local;
+
+    static Expression nested("^PlugIns/[^/]*\\.appex/Info\\.plist$");
+
+    folder.Find("", fun([&](const std::string &name, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &code) {
+        if (!nested(name))
+            return;
+        auto bundle(root + Split(name).dir);
+        SubFolder subfolder(folder, bundle);
+        Bundle(bundle, subfolder, key, local, "", "");
+    }), fun([&](const std::string &name, const Functor<std::string ()> &read) {
+    }));
+
+    std::map<std::string, std::string> links;
+
+    folder.Find("", fun([&](const std::string &name, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &code) {
+        // BundleDiskRep::adjustResources -> builder.addExclusion
+        if (name == executable || Starts(name, directory) || Starts(name, "_MASReceipt/") || name == "CodeResources")
+            return;
+
+        if (local.find(name) != local.end())
+            return;
+        local.insert(name);
+
+        auto &hash(hashes[name]);
+
+        code(fun([&](std::streambuf &data, std::streambuf &save) {
+            union {
+                struct {
+                    uint32_t magic;
+                    uint32_t count;
+                };
+
+                uint8_t bytes[8];
+            } header;
+
+            auto size(most(data, &header.bytes, sizeof(header.bytes)));
+            if (size == sizeof(header.bytes))
+                switch (Swap(header.magic)) {
+                    case FAT_MAGIC:
+                        // Java class file format
+                        if (Swap(header.count) >= 40)
+                            break;
+                    case FAT_CIGAM:
+                    case MH_MAGIC: case MH_MAGIC_64:
+                    case MH_CIGAM: case MH_CIGAM_64:
+                        Slots slots;
+                        Sign(header.bytes, size, data, hash, save, identifier, "", "", key, slots);
+                        return;

                 }
                 }

-            }

 
 

-            super->count = Swap(count);
-            super->blob.length = Swap(offset);
+            HashProxy proxy(hash, save);
+            put(proxy, header.bytes, size);
+            copy(data, proxy);
+        }));
+    }), fun([&](const std::string &name, const Functor<std::string ()> &read) {
+        links[name] = read();
+        local.insert(name);
+    }));
+
+    auto plist(plist_new_dict());
+    _scope({ plist_free(plist); });
+
+    for (const auto &version : versions) {
+        auto files(plist_new_dict());
+        plist_dict_set_item(plist, ("files" + version.first).c_str(), files);
+
+        for (const auto &rule : version.second)
+            rule.Compile();
+
+        bool old(&version.second == &rules1);
+
+        for (const auto &hash : hashes)
+            for (const auto &rule : version.second)
+                if (rule(hash.first)) {
+                    if (rule.mode_ == NestedMode) {
+                        // XXX: implement
+                    } else if (rule.mode_ == NoMode && old)
+                        plist_dict_set_item(files, hash.first.c_str(), plist_new_data(hash.second.sha1_, sizeof(hash.second.sha1_)));
+                    else if (rule.mode_ != OmitMode) {
+                        auto entry(plist_new_dict());
+                        plist_dict_set_item(entry, "hash", plist_new_data(hash.second.sha1_, sizeof(hash.second.sha1_)));
+                        if (!old)
+                            plist_dict_set_item(entry, "hash2", plist_new_data(hash.second.sha256_, sizeof(hash.second.sha256_)));
+                        if (rule.mode_ == OptionalMode)
+                            plist_dict_set_item(entry, "optional", plist_new_bool(true));
+                        plist_dict_set_item(files, hash.first.c_str(), entry);
+                    }

 
 

-            if (offset > size) {
-                fprintf(stderr, "offset (%u) > size (%u)\n", offset, size);
-                _assert(false);
-            } //else fprintf(stderr, "offset (%zu) <= size (%zu)\n", offset, size);
+                    break;
+                }

 
 

-            memset(blob + offset, 0, size - offset);
-        }
+        for (const auto &link : links)
+            for (const auto &rule : version.second)
+                if (rule(link.first)) {
+                    if (rule.mode_ == NestedMode) {
+                        // XXX: implement
+                    } else if (rule.mode_ != OmitMode) {
+                        auto entry(plist_new_dict());
+                        plist_dict_set_item(entry, "symlink", plist_new_string(link.second.c_str()));
+                        if (rule.mode_ == OptionalMode)
+                            plist_dict_set_item(entry, "optional", plist_new_bool(true));
+                        plist_dict_set_item(files, link.first.c_str(), entry);
+                    }
+
+                    break;
+                }

     }
     }

+
+    for (const auto &version : versions) {
+        auto rules(plist_new_dict());
+        plist_dict_set_item(plist, ("rules" + version.first).c_str(), rules);
+
+        std::multiset<const Rule *, RuleCode> ordered;
+        for (const auto &rule : version.second)
+            ordered.insert(&rule);
+
+        for (const auto &rule : ordered)
+            if (rule->weight_ == 1 && rule->mode_ == NoMode)
+                plist_dict_set_item(rules, rule->code_.c_str(), plist_new_bool(true));
+            else {
+                auto entry(plist_new_dict());
+                plist_dict_set_item(rules, rule->code_.c_str(), entry);
+
+                switch (rule->mode_) {
+                    case NoMode:
+                        break;
+                    case OmitMode:
+                        plist_dict_set_item(entry, "omit", plist_new_bool(true));
+                        break;
+                    case OptionalMode:
+                        plist_dict_set_item(entry, "optional", plist_new_bool(true));
+                        break;
+                    case NestedMode:
+                        plist_dict_set_item(entry, "nested", plist_new_bool(true));
+                        break;
+                    case TopMode:
+                        plist_dict_set_item(entry, "top", plist_new_bool(true));
+                        break;
+                }
+
+                if (rule->weight_ >= 10000)
+                    plist_dict_set_item(entry, "weight", plist_new_uint(rule->weight_));
+                else if (rule->weight_ != 1)
+                    plist_dict_set_item(entry, "weight", plist_new_real(rule->weight_));
+            }
+    }
+
+    folder.Save(signature, NULL, fun([&](std::streambuf &save) {
+        HashProxy proxy(hashes[signature], save);
+        char *xml(NULL);
+        uint32_t size;
+        plist_to_xml(plist, &xml, &size);
+        _scope({ free(xml); });
+        put(proxy, xml, size);
+    }));
+
+    folder.Open(executable, fun([&](std::streambuf &buffer, const void *flag) {
+        folder.Save(executable, flag, fun([&](std::streambuf &save) {
+            Slots slots;
+            slots[1] = hashes.at(info);
+            slots[3] = hashes.at(signature);
+            Sign(NULL, 0, buffer, hashes[executable], save, identifier, entitlements, requirement, key, slots);
+        }));
+    }));
+
+    local.insert(signature);
+    local.insert(executable);
+
+    for (const auto &name : local)
+        remote.insert(root + name);
+
+    return executable;

 }
 
 }
 

-int main(int argc, const char *argv[]) {
+std::string Bundle(const std::string &root, Folder &folder, const std::string &key, const std::string &entitlements, const std::string &requirement) {
+    std::set<std::string> local;
+    return Bundle(root, folder, key, local, entitlements, requirement);
+}
+#endif
+
+#endif
+}
+
+#ifndef LDID_NOTOOLS
+int main(int argc, char *argv[]) {
+#ifndef LDID_NOSMIME
+    OpenSSL_add_all_algorithms();
+#endif
+

     union {
         uint16_t word;
         uint8_t byte[2];
     union {
         uint16_t word;
         uint8_t byte[2];


@@ -1092,8 +2246,11 @@ int main(int argc, const char *argv[]) {
 
     bool flag_r(false);
     bool flag_e(false);
 
     bool flag_r(false);
     bool flag_e(false);

+    bool flag_q(false);

 
 

+#ifndef LDID_NOFLAGT

     bool flag_T(false);
     bool flag_T(false);

+#endif

 
     bool flag_S(false);
     bool flag_s(false);
 
     bool flag_S(false);
     bool flag_s(false);


@@ -1103,15 +2260,22 @@ int main(int argc, const char *argv[]) {
     bool flag_A(false);
     bool flag_a(false);
 
     bool flag_A(false);
     bool flag_a(false);
 

+    bool flag_u(false);
+

     uint32_t flag_CPUType(_not(uint32_t));
     uint32_t flag_CPUSubtype(_not(uint32_t));
 
     const char *flag_I(NULL);
 
     uint32_t flag_CPUType(_not(uint32_t));
     uint32_t flag_CPUSubtype(_not(uint32_t));
 
     const char *flag_I(NULL);
 

+#ifndef LDID_NOFLAGT

     bool timeh(false);
     uint32_t timev(0);
     bool timeh(false);
     uint32_t timev(0);

+#endif

 
 

-    Map xmlm;
+    Map entitlements;
+    Map requirement;
+    Map key;
+    ldid::Slots slots;

 
     std::vector<std::string> files;
 
 
     std::vector<std::string> files;
 


@@ -1127,14 +2291,38 @@ int main(int argc, const char *argv[]) {
         if (argv[argi][0] != '-')
             files.push_back(argv[argi]);
         else switch (argv[argi][1]) {
         if (argv[argi][0] != '-')
             files.push_back(argv[argi]);
         else switch (argv[argi][1]) {

-            case 'r': flag_r = true; break;
+            case 'r':
+                _assert(!flag_s);
+                _assert(!flag_S);
+                flag_r = true;
+            break;
+

             case 'e': flag_e = true; break;
 
             case 'e': flag_e = true; break;
 

+            case 'E': {
+                const char *slot = argv[argi] + 2;
+                const char *colon = strchr(slot, ':');
+                _assert(colon != NULL);
+                Map file(colon + 1, O_RDONLY, PROT_READ, MAP_PRIVATE);
+                char *arge;
+                unsigned number(strtoul(slot, &arge, 0));
+                _assert(arge == colon);
+                sha1(slots[number], file.data(), file.size());
+            } break;
+
+            case 'q': flag_q = true; break;
+
+            case 'Q': {
+                const char *xml = argv[argi] + 2;
+                requirement.open(xml, O_RDONLY, PROT_READ, MAP_PRIVATE);
+            } break;
+

             case 'D': flag_D = true; break;
 
             case 'a': flag_a = true; break;
 
             case 'A':
             case 'D': flag_D = true; break;
 
             case 'a': flag_a = true; break;
 
             case 'A':

+                _assert(!flag_A);

                 flag_A = true;
                 if (argv[argi][2] != '\0') {
                     const char *cpu = argv[argi] + 2;
                 flag_A = true;
                 if (argv[argi][2] != '\0') {
                     const char *cpu = argv[argi] + 2;


@@ -1149,19 +2337,27 @@ int main(int argc, const char *argv[]) {
             break;
 
             case 's':
             break;
 
             case 's':

+                _assert(!flag_r);

                 _assert(!flag_S);
                 flag_s = true;
             break;
 
             case 'S':
                 _assert(!flag_S);
                 flag_s = true;
             break;
 
             case 'S':

+                _assert(!flag_r);

                 _assert(!flag_s);
                 flag_S = true;
                 if (argv[argi][2] != '\0') {
                     const char *xml = argv[argi] + 2;
                 _assert(!flag_s);
                 flag_S = true;
                 if (argv[argi][2] != '\0') {
                     const char *xml = argv[argi] + 2;

-                    xmlm.open(xml, O_RDONLY, PROT_READ, MAP_PRIVATE);
+                    entitlements.open(xml, O_RDONLY, PROT_READ, MAP_PRIVATE);

                 }
             break;
 
                 }
             break;
 

+            case 'K':
+                if (argv[argi][2] != '\0')
+                    key.open(argv[argi] + 2, O_RDONLY, PROT_READ, MAP_PRIVATE);
+            break;
+
+#ifndef LDID_NOFLAGT

             case 'T': {
                 flag_T = true;
                 if (argv[argi][2] == '-')
             case 'T': {
                 flag_T = true;
                 if (argv[argi][2] == '-')


@@ -1172,6 +2368,11 @@ int main(int argc, const char *argv[]) {
                     _assert(arge == argv[argi] + strlen(argv[argi]));
                 }
             } break;
                     _assert(arge == argv[argi] + strlen(argv[argi]));
                 }
             } break;

+#endif
+
+            case 'u': {
+                flag_u = true;
+            } break;

 
             case 'I': {
                 flag_I = argv[argi] + 2;
 
             case 'I': {
                 flag_I = argv[argi] + 2;


@@ -1182,7 +2383,8 @@ int main(int argc, const char *argv[]) {
             break;
         }
 
             break;
         }
 

-    _assert(!flag_S || !flag_r);
+    _assert(flag_S || key.empty());
+    _assert(flag_S || flag_I == NULL);

 
     if (files.empty()) usage: {
         exit(0);
 
     if (files.empty()) usage: {
         exit(0);


@@ -1190,24 +2392,45 @@ int main(int argc, const char *argv[]) {
 
     size_t filei(0), filee(0);
     _foreach (file, files) try {
 
     size_t filei(0), filee(0);
     _foreach (file, files) try {

-        const char *path(file.c_str());
-        const char *base = strrchr(path, '/');
-
-        std::string dir;
-        if (base != NULL)
-            dir.assign(path, base++ - path + 1);
-        else
-            base = path;
-
-        const char *name(flag_I ?: base);
-        char *temp(NULL);
+        std::string path(file);
+
+        struct stat info;
+        _syscall(stat(path.c_str(), &info));
+
+        if (S_ISDIR(info.st_mode)) {
+#ifndef LDID_NOPLIST
+            _assert(!flag_r);
+            ldid::DiskFolder folder(path);
+            path += "/" + Bundle("", folder, key, entitlements, requirement);
+#else
+            _assert(false);
+#endif
+        } else if (flag_S || flag_r) {
+            Map input(path, O_RDONLY, PROT_READ, MAP_PRIVATE);
+
+            std::filebuf output;
+            Split split(path);
+            auto temp(Temporary(output, split));
+
+            if (flag_r)
+                ldid::Unsign(input.data(), input.size(), output);
+            else {
+                std::string identifier(flag_I ?: split.base.c_str());
+                ldid::Sign(input.data(), input.size(), output, identifier, entitlements, requirement, key, slots);
+            }

 
 

-        if (flag_S || flag_r) {
-            asprintf(&temp, "%s.%s.cs", dir.c_str(), base);
-            resign(path, temp, flag_S ? name : NULL, xmlm);
+            Commit(path, temp);

         }
 
         }
 

-        Map mapping(temp ?: path, flag_T || flag_s);
+        bool modify(false);
+#ifndef LDID_NOFLAGT
+        if (flag_T)
+            modify = true;
+#endif
+        if (flag_s)
+            modify = true;
+
+        Map mapping(path, modify);

         FatHeader fat_header(mapping.data(), mapping.size());
 
         _foreach (mach_header, fat_header.GetMachHeaders()) {
         FatHeader fat_header(mapping.data(), mapping.size());
 
         _foreach (mach_header, fat_header.GetMachHeaders()) {


@@ -1232,6 +2455,19 @@ int main(int argc, const char *argv[]) {
                     signature = reinterpret_cast<struct linkedit_data_command *>(load_command);
                 else if (cmd == LC_ENCRYPTION_INFO || cmd == LC_ENCRYPTION_INFO_64)
                     encryption = reinterpret_cast<struct encryption_info_command *>(load_command);
                     signature = reinterpret_cast<struct linkedit_data_command *>(load_command);
                 else if (cmd == LC_ENCRYPTION_INFO || cmd == LC_ENCRYPTION_INFO_64)
                     encryption = reinterpret_cast<struct encryption_info_command *>(load_command);

+                else if (cmd == LC_LOAD_DYLIB) {
+                    volatile struct dylib_command *dylib_command(reinterpret_cast<struct dylib_command *>(load_command));
+                    const char *name(reinterpret_cast<const char *>(load_command) + mach_header.Swap(dylib_command->dylib.name));
+
+                    if (strcmp(name, "/System/Library/Frameworks/UIKit.framework/UIKit") == 0) {
+                        if (flag_u) {
+                            Version version;
+                            version.value = mach_header.Swap(dylib_command->dylib.current_version);
+                            printf("uikit=%u.%u.%u\n", version.major, version.minor, version.patch);
+                        }
+                    }
+                }
+#ifndef LDID_NOFLAGT

                 else if (cmd == LC_ID_DYLIB) {
                     volatile struct dylib_command *dylib_command(reinterpret_cast<struct dylib_command *>(load_command));
 
                 else if (cmd == LC_ID_DYLIB) {
                     volatile struct dylib_command *dylib_command(reinterpret_cast<struct dylib_command *>(load_command));
 


@@ -1248,6 +2484,7 @@ int main(int argc, const char *argv[]) {
                         dylib_command->dylib.timestamp = mach_header.Swap(timed);
                     }
                 }
                         dylib_command->dylib.timestamp = mach_header.Swap(timed);
                     }
                 }

+#endif

             }
 
             if (flag_D) {
             }
 
             if (flag_D) {


@@ -1268,7 +2505,24 @@ int main(int argc, const char *argv[]) {
                     if (Swap(super->index[index].type) == CSSLOT_ENTITLEMENTS) {
                         uint32_t begin = Swap(super->index[index].offset);
                         struct Blob *entitlements = reinterpret_cast<struct Blob *>(blob + begin);
                     if (Swap(super->index[index].type) == CSSLOT_ENTITLEMENTS) {
                         uint32_t begin = Swap(super->index[index].offset);
                         struct Blob *entitlements = reinterpret_cast<struct Blob *>(blob + begin);

-                        fwrite(entitlements + 1, 1, Swap(entitlements->length) - sizeof(struct Blob), stdout);
+                        fwrite(entitlements + 1, 1, Swap(entitlements->length) - sizeof(*entitlements), stdout);
+                    }
+            }
+
+            if (flag_q) {
+                _assert(signature != NULL);
+
+                uint32_t data = mach_header.Swap(signature->dataoff);
+
+                uint8_t *top = reinterpret_cast<uint8_t *>(mach_header.GetBase());
+                uint8_t *blob = top + data;
+                struct SuperBlob *super = reinterpret_cast<struct SuperBlob *>(blob);
+
+                for (size_t index(0); index != Swap(super->count); ++index)
+                    if (Swap(super->index[index].type) == CSSLOT_REQUIREMENTS) {
+                        uint32_t begin = Swap(super->index[index].offset);
+                        struct Blob *requirement = reinterpret_cast<struct Blob *>(blob + begin);
+                        fwrite(requirement, 1, Swap(requirement->length), stdout);

                     }
             }
 
                     }
             }
 


@@ -1284,30 +2538,20 @@ int main(int argc, const char *argv[]) {
                 for (size_t index(0); index != Swap(super->count); ++index)
                     if (Swap(super->index[index].type) == CSSLOT_CODEDIRECTORY) {
                         uint32_t begin = Swap(super->index[index].offset);
                 for (size_t index(0); index != Swap(super->count); ++index)
                     if (Swap(super->index[index].type) == CSSLOT_CODEDIRECTORY) {
                         uint32_t begin = Swap(super->index[index].offset);

-                        struct CodeDirectory *directory = reinterpret_cast<struct CodeDirectory *>(blob + begin);
+                        struct CodeDirectory *directory = reinterpret_cast<struct CodeDirectory *>(blob + begin + sizeof(Blob));

 
 

-                        uint8_t (*hashes)[20] = reinterpret_cast<uint8_t (*)[20]>(blob + begin + Swap(directory->hashOffset));
+                        uint8_t (*hashes)[LDID_SHA1_DIGEST_LENGTH] = reinterpret_cast<uint8_t (*)[LDID_SHA1_DIGEST_LENGTH]>(blob + begin + Swap(directory->hashOffset));

                         uint32_t pages = Swap(directory->nCodeSlots);
 
                         if (pages != 1)
                             for (size_t i = 0; i != pages - 1; ++i)
                         uint32_t pages = Swap(directory->nCodeSlots);
 
                         if (pages != 1)
                             for (size_t i = 0; i != pages - 1; ++i)

-                                sha1(hashes[i], top + 0x1000 * i, 0x1000);
+                                sha1(hashes[i], top + PageSize_ * i, PageSize_);

                         if (pages != 0)
                         if (pages != 0)

-                            sha1(hashes[pages - 1], top + 0x1000 * (pages - 1), ((data - 1) % 0x1000) + 1);
+                            sha1(hashes[pages - 1], top + PageSize_ * (pages - 1), ((data - 1) % PageSize_) + 1);

                     }
             }
         }
 
                     }
             }
         }
 

-        if (temp != NULL) {
-            struct stat info;
-            _syscall(stat(path, &info));
-            _syscall(chown(temp, info.st_uid, info.st_gid));
-            _syscall(chmod(temp, info.st_mode));
-            _syscall(unlink(path));
-            _syscall(rename(temp, path));
-            free(temp);
-        }
-

         ++filei;
     } catch (const char *) {
         ++filee;
         ++filei;
     } catch (const char *) {
         ++filee;


@@ -1316,3 +2560,4 @@ int main(int argc, const char *argv[]) {
 
     return filee;
 }
 
     return filee;
 }

+#endif