Finish implementating application bundle codesign.

[ldid.git] / ldid.cpp

diff --git a/ldid.cpp b/ldid.cpp
index e1fbda9b5412e3b9d077bfb98f674e5f0cb9da5a..374dfcd6e883af7ebd9860348621e4149a3d8753 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,19 +19,119 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

-#include "minimal/stdlib.h"
-#include "minimal/string.h"
-#include "minimal/mapping.h"
-
-extern "C" {
-#include "sha1.h"
-}
-
+#include <cstdio>
+#include <cstdlib>

 #include <cstring>
 #include <cstring>

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

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

-#include <plist/plist.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <fts.h>
+#include <regex.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pkcs12.h>
+#include <openssl/sha.h>
+
+#include <plist/plist++.h>
+
+#include "ldid.hpp"
+
+#define _assert___(line) \
+    #line
+#define _assert__(line) \
+    _assert___(line)
+
+#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)
+
+#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; \
+    for (auto success : (long[]) {__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)

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


@@ -93,6 +193,7 @@ struct load_command {
 #define LC_ENCRYPTION_INFO    uint32_t(0x21)
 #define LC_DYLD_INFO          uint32_t(0x22)
 #define LC_DYLD_INFO_ONLY     uint32_t(0x22 | LC_REQ_DYLD)
 #define LC_ENCRYPTION_INFO    uint32_t(0x21)
 #define LC_DYLD_INFO          uint32_t(0x22)
 #define LC_DYLD_INFO_ONLY     uint32_t(0x22 | LC_REQ_DYLD)

+#define LC_ENCRYPTION_INFO_64 uint32_t(0x2c)

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


@@ -294,6 +395,20 @@ 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
 

+inline void get(std::streambuf &stream, void *data, size_t size) {
+    _assert(stream.sgetn(static_cast<char *>(data), size) == size);
+}
+
+inline void put(std::streambuf &stream, const void *data, size_t size) {
+    _assert(stream.sputn(static_cast<const char *>(data), size) == size);
+}
+
+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;


@@ -302,13 +417,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) |


@@ -316,92 +434,87 @@ 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));
 }
 
 template <typename Target_>
 class Pointer;
 
     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 {


@@ -457,6 +570,10 @@ class MachHeader :
         );
     }
 
         );
     }
 

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

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


@@ -638,12 +755,6 @@ class FatHeader :
     }
 };
 
     }
 };
 

-FatHeader Map(const char *path, bool ro = false) {
-    size_t size;
-    void *base(map(path, 0, _not(size_t), &size, ro));
-    return FatHeader(base, size);
-}
-

 template <typename Target_>
 class Pointer {
   private:
 template <typename Target_>
 class Pointer {
   private:


@@ -676,13 +787,25 @@ class Pointer {
     }
 };
 
     }
 };
 

-#define CSMAGIC_CODEDIRECTORY      uint32_t(0xfade0c02)
-#define CSMAGIC_EMBEDDED_SIGNATURE uint32_t(0xfade0cc0)
-#define CSMAGIC_ENTITLEMENTS       uint32_t(0xfade7171)
+#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)
+
+#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 CSSLOT_CODEDIRECTORY uint32_t(0)
-#define CSSLOT_REQUIREMENTS  uint32_t(2)
-#define CSSLOT_ENTITLEMENTS  uint32_t(5)
+#define CSSLOT_SIGNATURESLOT uint32_t(0x10000)
+
+#define CS_HASHTYPE_SHA1 1

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


@@ -701,7 +824,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;


@@ -718,452 +840,1285 @@ struct CodeDirectory {
 
 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);
 

-void sha1(uint8_t *hash, uint8_t *data, size_t size) {
-    SHA1Context context;
-    SHA1Reset(&context);
-    SHA1Input(&context, data, size);
-    SHA1Result(&context, hash);
+static void sha1(uint8_t *hash, const void *data, size_t size) {
+    SHA1(static_cast<const uint8_t *>(data), size, hash);

 }
 
 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)
     {
     }
 };
 

-int main(int argc, const char *argv[]) {
-    union {
-        uint16_t word;
-        uint8_t byte[2];
-    } endian = {1};
+class File {
+  private:
+    int file_;

 
 

-    little_ = endian.byte[0];
+  public:
+    File() :
+        file_(-1)
+    {
+    }

 
 

-    bool flag_R(false);
-    bool flag_r(false);
+    ~File() {
+        if (file_ != -1)
+            _syscall(close(file_));
+    }

 
 

-    bool flag_t(false);
-    bool flag_p(false);
-    bool flag_u(false);
-    bool flag_e(false);
+    void open(const char *path, int flags) {
+        _assert(file_ == -1);
+        file_ = _syscall(::open(path, flags));
+    }

 
 

-    bool flag_T(false);
+    int file() const {
+        return file_;
+    }
+};

 
 

-    bool flag_S(false);
-    bool flag_s(false);
+class Map {
+  private:
+    File file_;
+    void *data_;
+    size_t size_;

 
 

-    bool flag_O(false);
+    void clear() {
+        if (data_ == NULL)
+            return;
+        _syscall(munmap(data_, size_));
+        data_ = NULL;
+        size_ = 0;
+    }

 
 

-    bool flag_D(false);
-    bool flag_d(false);
+  public:
+    Map() :
+        data_(NULL),
+        size_(0)
+    {
+    }

 
 

-    bool flag_A(false);
-    bool flag_a(false);
+    Map(const std::string &path, int oflag, int pflag, int mflag) :
+        Map()
+    {
+        open(path, oflag, pflag, mflag);
+    }

 
 

-    uint32_t flag_CPUType(_not(uint32_t));
-    uint32_t flag_CPUSubtype(_not(uint32_t));
+    Map(const std::string &path, bool edit) :
+        Map()
+    {
+        open(path, edit);
+    }

 
 

-    const char *flag_I(NULL);
+    ~Map() {
+        clear();
+    }

 
 

-    bool timeh(false);
-    uint32_t timev(0);
+    bool empty() const {
+        return data_ == NULL;
+    }

 
 

-    const void *xmld(NULL);
-    size_t xmls(0);
+    void open(const std::string &path, int oflag, int pflag, int mflag) {
+        clear();

 
 

-    uintptr_t noffset(_not(uintptr_t));
-    uintptr_t woffset(_not(uintptr_t));
+        file_.open(path.c_str(), oflag);
+        int file(file_.file());

 
 

-    std::vector<std::string> files;
+        struct stat stat;
+        _syscall(fstat(file, &stat));
+        size_ = stat.st_size;

 
 

-    if (argc == 1) {
-        fprintf(stderr, "usage: %s -S[entitlements.xml] <binary>\n", argv[0]);
-        fprintf(stderr, "   %s -e MobileSafari\n", argv[0]);
-        fprintf(stderr, "   %s -S cat\n", argv[0]);
-        fprintf(stderr, "   %s -Stfp.xml gdb\n", argv[0]);
-        exit(0);
+        data_ = _syscall(mmap(NULL, size_, pflag, mflag, file, 0));

     }
 
     }
 

-    for (int argi(1); argi != argc; ++argi)
-        if (argv[argi][0] != '-')
-            files.push_back(argv[argi]);
-        else switch (argv[argi][1]) {
-            case 'R': flag_R = true; break;
-            case 'r': flag_r = true; break;
-
-            case 't': flag_t = true; break;
-            case 'u': flag_u = true; break;
-            case 'p': flag_p = true; break;
-            case 'e': flag_e = true; break;
-            case 'O': flag_O = true; break;
+    void open(const std::string &path, bool edit) {
+        if (edit)
+            open(path, O_RDWR, PROT_READ | PROT_WRITE, MAP_SHARED);
+        else
+            open(path, O_RDONLY, PROT_READ, MAP_PRIVATE);
+    }

 
 

-            case 'D': flag_D = true; break;
-            case 'd': flag_d = true; break;
+    void *data() const {
+        return data_;
+    }

 
 

-            case 'a': flag_a = true; break;
+    size_t size() const {
+        return size_;
+    }

 
 

-            case 'A':
-                flag_A = true;
-                if (argv[argi][2] != '\0') {
-                    const char *cpu = argv[argi] + 2;
-                    const char *colon = strchr(cpu, ':');
-                    _assert(colon != NULL);
-                    char *arge;
-                    flag_CPUType = strtoul(cpu, &arge, 0);
-                    _assert(arge == colon);
-                    flag_CPUSubtype = strtoul(colon + 1, &arge, 0);
-                    _assert(arge == argv[argi] + strlen(argv[argi]));
-                }
-            break;
+    operator std::string() const {
+        return std::string(static_cast<char *>(data_), size_);
+    }
+};

 
 

-            case 's':
-                _assert(!flag_S);
-                flag_s = true;
-            break;
+namespace ldid {

 
 

-            case 'S':
-                _assert(!flag_s);
-                flag_S = true;
-                if (argv[argi][2] != '\0') {
-                    const char *xml = argv[argi] + 2;
-                    xmld = map(xml, 0, _not(size_t), &xmls, true);
-                }
-            break;
+static void Allocate(const void *idata, size_t isize, std::streambuf &output, const Functor<size_t (size_t)> &allocate, const Functor<size_t (std::streambuf &output, size_t, const std::string &, const char *)> &save) {
+    FatHeader source(const_cast<void *>(idata), isize);

 
 

-            case 'T': {
-                flag_T = true;
-                if (argv[argi][2] == '-')
-                    timeh = true;
-                else {
-                    char *arge;
-                    timev = strtoul(argv[argi] + 2, &arge, 0);
-                    _assert(arge == argv[argi] + strlen(argv[argi]));
-                }
-            } break;
+    size_t offset(0);
+    if (source.IsFat())
+        offset += sizeof(fat_header) + sizeof(fat_arch) * source.Swap(source->nfat_arch);

 
 

-            case 'I': {
-                flag_I = argv[argi] + 2;
-            } break;
+    std::vector<CodesignAllocation> allocations;
+    _foreach (mach_header, source.GetMachHeaders()) {
+        struct linkedit_data_command *signature(NULL);
+        struct symtab_command *symtab(NULL);

 
 

-            case 'n': {
-                char *arge;
-                noffset = strtoul(argv[argi] + 2, &arge, 0);
-                _assert(arge == argv[argi] + strlen(argv[argi]));
-            } break;
+        _foreach (load_command, mach_header.GetLoadCommands()) {
+            uint32_t cmd(mach_header.Swap(load_command->cmd));
+            if (false);
+            else if (cmd == LC_CODE_SIGNATURE)
+                signature = reinterpret_cast<struct linkedit_data_command *>(load_command);
+            else if (cmd == LC_SYMTAB)
+                symtab = reinterpret_cast<struct symtab_command *>(load_command);
+        }

 
 

-            case 'w': {
-                char *arge;
-                woffset = strtoul(argv[argi] + 2, &arge, 0);
-                _assert(arge == argv[argi] + strlen(argv[argi]));
-            } break;
+        size_t size;
+        if (signature == NULL)
+            size = mach_header.GetSize();
+        else {
+            size = mach_header.Swap(signature->dataoff);
+            _assert(size <= mach_header.GetSize());
+        }

 
 

-            default:
-                goto usage;
-            break;
+        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 (files.empty()) usage: {
-        exit(0);
-    }
+        size_t alloc(allocate(size));

 
 

-    size_t filei(0), filee(0);
-    _foreach (file, files) try {
-        const char *path(file.c_str());
-        const char *base = strrchr(path, '/');
-        char *temp(NULL), *dir;
+        auto *fat_arch(mach_header.GetFatArch());
+        uint32_t align(fat_arch == NULL ? 0 : source.Swap(fat_arch->align));
+        offset = Align(offset, 1 << align);

 
 

-        if (base != NULL)
-            dir = strndup_(path, base++ - path + 1);
-        else {
-            dir = strdup("");
-            base = path;
-        }
+        uint32_t limit(size);
+        if (alloc != 0)
+            limit = Align(limit, 0x10);

 
 

-        const char *name(flag_I ?: base);
-
-        if (flag_r) {
-            uint32_t clip(0); {
-                FatHeader fat_header(Map(path));
-                _foreach (mach_header, fat_header.GetMachHeaders()) {
-                    if (flag_A) {
-                        if (mach_header.GetCPUType() != flag_CPUType)
-                            continue;
-                        if (mach_header.GetCPUSubtype() != flag_CPUSubtype)
-                            continue;
-                    }
+        allocations.push_back(CodesignAllocation(mach_header, offset, size, limit, alloc, align));
+        offset += size + alloc;
+        offset = Align(offset, 0x10);
+    }

 
 

-                    mach_header->flags = mach_header.Swap(mach_header.Swap(mach_header->flags) | MH_DYLDLINK);
-
-                    uint32_t size(_not(uint32_t)); {
-                        _foreach (load_command, mach_header.GetLoadCommands()) {
-                            switch (mach_header.Swap(load_command->cmd)) {
-                                case LC_CODE_SIGNATURE: {
-                                    struct linkedit_data_command *signature = reinterpret_cast<struct linkedit_data_command *>(load_command);
-                                    memset(reinterpret_cast<uint8_t *>(mach_header.GetBase()) + mach_header.Swap(signature->dataoff), 0, mach_header.Swap(signature->datasize));
-                                    memset(signature, 0, sizeof(struct linkedit_data_command));
-
-                                    mach_header->ncmds = mach_header.Swap(mach_header.Swap(mach_header->ncmds) - 1);
-                                    mach_header->sizeofcmds = mach_header.Swap(uint32_t(mach_header.Swap(mach_header->sizeofcmds) - sizeof(struct linkedit_data_command)));
-                                } break;
-
-                                case LC_SYMTAB: {
-                                    struct symtab_command *symtab = reinterpret_cast<struct symtab_command *>(load_command);
-                                    size = mach_header.Swap(symtab->stroff) + mach_header.Swap(symtab->strsize);
-                                } break;
-                            }
-                        }
-                    }
+    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);
+        }
+    }

 
 

-                    _assert(size != _not(uint32_t));
+    _foreach (allocation, allocations) {
+        auto &mach_header(allocation.mach_header_);

 
 

-                    _foreach (segment, mach_header.GetSegments("__LINKEDIT")) {
-                        segment->filesize -= mach_header.GetSize() - size;
+        pad(output, allocation.offset_ - position);
+        position = allocation.offset_;

 
 

-                        if (fat_arch *fat_arch = mach_header.GetFatArch()) {
-                            fat_arch->size = fat_header.Swap(size);
-                            clip = std::max(clip, fat_header.Swap(fat_arch->offset) + size);
-                        } else
-                            clip = std::max(clip, size);
-                    }
+        std::vector<std::string> commands;

 
 

-                    _foreach (segment, mach_header.GetSegments64("__LINKEDIT")) {
-                        segment->filesize -= mach_header.GetSize() - size;
+        _foreach (load_command, mach_header.GetLoadCommands()) {
+            std::string copy(reinterpret_cast<const char *>(load_command), load_command->cmdsize);

 
 

-                        if (fat_arch *fat_arch = mach_header.GetFatArch()) {
-                            fat_arch->size = fat_header.Swap(size);
-                            clip = std::max(clip, fat_header.Swap(fat_arch->offset) + size);
-                        } else
-                            clip = std::max(clip, size);
-                    }
-                }
+            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, PageSize_);
+                } 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, PageSize_);
+                } break;

             }
 
             }
 

-            if (clip != 0)
-                _syscall(truncate(path, clip));
+            commands.push_back(copy);

         }
 
         }
 

-        if (flag_S) {
-            FatHeader source(Map(path));
+        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)));
+        }

 
 

-            size_t offset(0);
+        size_t begin(position);

 
 

-            if (source.IsFat())
-                offset += sizeof(fat_header) + sizeof(fat_arch) * source.Swap(source->nfat_arch);
+        uint32_t after(0);
+        _foreach(command, commands)
+            after += command.size();

 
 

-            std::vector<CodesignAllocation> allocations; {
-                _foreach (mach_header, source.GetMachHeaders()) {
-                    if (flag_A) {
-                        if (mach_header.GetCPUType() != flag_CPUType)
-                            continue;
-                        if (mach_header.GetCPUSubtype() != flag_CPUSubtype)
-                            continue;
-                    }
+        std::stringbuf altern;

 
 

-                    mach_header->flags = mach_header.Swap(mach_header.Swap(mach_header->flags) | MH_DYLDLINK);
-
-                    size_t size(_not(size_t)); {
-                        _foreach (load_command, mach_header.GetLoadCommands()) {
-                            uint32_t cmd(mach_header.Swap(load_command->cmd));
-                            if (cmd == LC_CODE_SIGNATURE) {
-                                struct linkedit_data_command *signature = reinterpret_cast<struct linkedit_data_command *>(load_command);
-                                size = mach_header.Swap(signature->dataoff);
-                                _assert(size < mach_header.GetSize());
-                                break;
-                            }
-                        }
+        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 (size == _not(size_t))
-                            size = mach_header.GetSize();
-                    }
+        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);
+        }

 
 

-                    size_t alloc(0);
-                    alloc += sizeof(struct SuperBlob);
-                    uint32_t special(0);
+        _foreach(command, commands) {
+            put(output, command.data(), command.size());
+            put(altern, command.data(), command.size());
+            position += command.size();
+        }

 
 

-                    special = std::max(special, CSSLOT_CODEDIRECTORY);
-                    alloc += sizeof(struct BlobIndex);
-                    alloc += sizeof(struct CodeDirectory);
-                    alloc += strlen(name) + 1;
+        uint32_t before(mach_header.Swap(mach_header->sizeofcmds));
+        if (before > after) {
+            pad(output, before - after);
+            pad(altern, before - after);
+            position += before - after;
+        }

 
 

-                    special = std::max(special, CSSLOT_REQUIREMENTS);
-                    alloc += sizeof(struct BlobIndex);
-                    alloc += 0xc;
+        auto top(reinterpret_cast<char *>(mach_header.GetBase()));

 
 

-                    if (xmld != NULL) {
-                        special = std::max(special, CSSLOT_ENTITLEMENTS);
-                        alloc += sizeof(struct BlobIndex);
-                        alloc += sizeof(struct Blob);
-                        alloc += xmls;
-                    }
+        std::string overlap(altern.str());
+        overlap.append(top + overlap.size(), Align(overlap.size(), 0x1000) - overlap.size());

 
 

-                    size_t normal((size + 0x1000 - 1) / 0x1000);
-                    alloc = Align(alloc + (special + normal) * 0x14, 16);
+        put(output, top + (position - begin), allocation.size_ - (position - begin));
+        position = begin + allocation.size_;

 
 

-                    auto *fat_arch(mach_header.GetFatArch());
-                    uint32_t align(fat_arch == NULL ? 0 : source.Swap(fat_arch->align));
-                    offset = Align(offset, 1 << align);
+        pad(output, allocation.limit_ - allocation.size_);
+        position += allocation.limit_ - allocation.size_;

 
 

-                    allocations.push_back(CodesignAllocation(mach_header, offset, size, alloc, align));
-                    offset += size + alloc;
-                    offset = Align(offset, 16);
-                }
-            }
+        size_t saved(save(output, allocation.limit_, overlap, top));
+        if (allocation.alloc_ > saved)
+            pad(output, allocation.alloc_ - saved);
+        position += allocation.alloc_;
+    }
+}

 
 

-            asprintf(&temp, "%s.%s.cs", dir, base);
-            fclose(fopen(temp, "w+"));
-            _syscall(truncate(temp, offset));
+}

 
 

-            void *file(map(temp, 0, offset, NULL, false));
-            memset(file, 0, offset);
+typedef std::map<uint32_t, std::string> Blobs;

 
 

-            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, const std::stringbuf &buffer) {
+    auto value(buffer.str());
+    std::swap(blobs[slot], value);
+}

 
 

-            _foreach (allocation, allocations) {
-                auto &source(allocation.mach_header_);
+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);
+}

 
 

-                uint32_t align(allocation.size_);
-                align = Align(align, 0x10);
+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();
+    }

 
 

-                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());

 
 

-                void *target(reinterpret_cast<uint8_t *>(file) + allocation.offset_);
-                memcpy(target, source, allocation.size_);
-                MachHeader mach_header(target, align + allocation.alloc_);
+    return offset;
+}

 
 

-                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;
-                }
+class Buffer {
+  private:
+    BIO *bio_;

 
 

-                if (signature == NULL) {
-                    mach_header->ncmds = mach_header.Swap(mach_header.Swap(mach_header->ncmds) + 1);
-                    signature = reinterpret_cast<struct linkedit_data_command *>(reinterpret_cast<uint8_t *>(mach_header.GetLoadCommand()) + mach_header.Swap(mach_header->sizeofcmds));
-                    mach_header->sizeofcmds = mach_header.Swap(mach_header.Swap(mach_header->sizeofcmds) + uint32_t(sizeof(*signature)));
-                    signature->cmd = mach_header.Swap(LC_CODE_SIGNATURE);
-                    signature->cmdsize = mach_header.Swap(uint32_t(sizeof(*signature)));
-                }
+  public:
+    Buffer(BIO *bio) :
+        bio_(bio)
+    {
+        _assert(bio_ != NULL);
+    }

 
 

-                signature->dataoff = mach_header.Swap(align);
-                signature->datasize = mach_header.Swap(allocation.alloc_);
+    Buffer() :
+        bio_(BIO_new(BIO_s_mem()))
+    {
+    }

 
 

-                _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);
-                }
+    Buffer(const char *data, size_t size) :
+        Buffer(BIO_new_mem_buf(const_cast<char *>(data), size))
+    {
+    }

 
 

-                _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);
-                }
-            }
-        }
+    Buffer(const std::string &data) :
+        Buffer(data.data(), data.size())
+    {
+    }

 
 

-        if (flag_p)
-            printf("path%zu='%s'\n", filei, file.c_str());
+    Buffer(PKCS7 *pkcs) :
+        Buffer()
+    {
+        _assert(i2d_PKCS7_bio(bio_, pkcs) != 0);
+    }

 
 

-        FatHeader fat_header(Map(temp == NULL ? path : temp, !(flag_R || flag_T || flag_s || flag_S || flag_O || flag_D)));
+    ~Buffer() {
+        BIO_free_all(bio_);
+    }

 
 

-        _foreach (mach_header, fat_header.GetMachHeaders()) {
-            struct linkedit_data_command *signature(NULL);
-            struct encryption_info_command *encryption(NULL);
+    operator BIO *() const {
+        return bio_;
+    }

 
 

-            if (flag_A) {
-                if (mach_header.GetCPUType() != flag_CPUType)
-                    continue;
-                if (mach_header.GetCPUSubtype() != flag_CPUSubtype)
-                    continue;
-            }
+    explicit operator std::string() const {
+        char *data;
+        auto size(BIO_get_mem_data(bio_, &data));
+        return std::string(data, size);
+    }
+};

 
 

-            if (flag_a)
-                printf("cpu=0x%x:0x%x\n", mach_header.GetCPUType(), mach_header.GetCPUSubtype());
+class Stuff {
+  private:
+    PKCS12 *value_;
+    EVP_PKEY *key_;
+    X509 *cert_;
+    STACK_OF(X509) *ca_;

 
 

-            if (flag_d) {
-                if (struct fat_arch *fat_arch = mach_header.GetFatArch())
-                    printf("offset=0x%x\n", Swap(fat_arch->offset));
-                else
-                    printf("offset=0x0\n");
-            }
+  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);
+    }

 
 

-            if (woffset != _not(uintptr_t)) {
-                Pointer<uint32_t> wvalue(mach_header.GetPointer<uint32_t>(woffset));
-                if (wvalue == NULL)
-                    printf("(null) %p\n", reinterpret_cast<void *>(woffset));
-                else
-                    printf("0x%.08x\n", *wvalue);
-            }
+    Stuff(const std::string &data) :
+        Stuff(Buffer(data))
+    {
+    }

 
 

-            if (noffset != _not(uintptr_t))
-                printf("%s\n", &*mach_header.GetPointer<char>(noffset));
+    ~Stuff() {
+        sk_X509_pop_free(ca_, X509_free);
+        X509_free(cert_);
+        EVP_PKEY_free(key_);
+        PKCS12_free(value_);
+    }

 
 

-            if (flag_d)
-                _foreach(segment, mach_header.GetSegments("__TEXT")) {
-                    printf("vmaddr=0x%x\n", mach_header.Swap(segment->vmaddr));
-                    printf("fileoff=0x%x\n", mach_header.Swap(segment->fileoff));
-                }
+    operator PKCS12 *() const {
+        return value_;
+    }

 
 

-            if (flag_O) {
-                _foreach(section, mach_header.GetSections("__TEXT", "__text"))
-                    section->addr = mach_header.Swap(0);
-            }
+    operator EVP_PKEY *() const {
+        return key_;
+    }

 
 

-            _foreach (load_command, mach_header.GetLoadCommands()) {
-                uint32_t cmd(mach_header.Swap(load_command->cmd));
+    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_;
+    }
+};
+
+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 HashBuffer :
+    public std::streambuf
+{
+  private:
+    std::vector<char> &hash_;
+    SHA_CTX context_;
+
+  public:
+    HashBuffer(std::vector<char> &hash) :
+        hash_(hash)
+    {
+        SHA1_Init(&context_);
+    }
+
+    ~HashBuffer() {
+        hash_.resize(SHA_DIGEST_LENGTH);
+        SHA1_Final(reinterpret_cast<uint8_t *>(hash_.data()), &context_);
+    }
+
+    virtual std::streamsize xsputn(const char_type *data, std::streamsize size) {
+        SHA1_Update(&context_, 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(std::vector<char> &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);
+    }
+};
+
+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);
+        }
+    }
+};
+
+static void mkdir_p(const std::string &path) {
+    if (path.empty())
+        return;
+    if (_syscall(mkdir(path.c_str(), 0755), EEXIST) == -EEXIST)
+        return;
+    auto slash(path.rfind('/', path.size() - 1));
+    if (slash == std::string::npos)
+        return;
+    mkdir_p(path.substr(0, slash));
+}
+
+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()));
+}
+
+namespace ldid {
+
+void Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, const std::string &key, const Slots &slots) {
+    Allocate(idata, isize, output, fun([&](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);
+        alloc += 0xc;
+
+        if (!entitlements.empty()) {
+            special = std::max(special, CSSLOT_ENTITLEMENTS);
+            alloc += sizeof(struct BlobIndex);
+            alloc += sizeof(struct Blob);
+            alloc += entitlements.size();
+        }
+
+        special = std::max(special, CSSLOT_CODEDIRECTORY);
+        alloc += sizeof(struct BlobIndex);
+        alloc += sizeof(struct Blob);
+        alloc += sizeof(struct CodeDirectory);
+        alloc += identifier.size() + 1;
+
+        if (!key.empty()) {
+            alloc += sizeof(struct BlobIndex);
+            alloc += sizeof(struct Blob);
+            // XXX: this is just a "sufficiently large number"
+            alloc += 0x3000;
+        }
+
+        _foreach (slot, slots)
+            special = std::max(special, slot.first);
+
+        uint32_t normal((size + PageSize_ - 1) / PageSize_);
+        alloc = Align(alloc + (special + normal) * SHA_DIGEST_LENGTH, 16);
+        return alloc;
+    }), fun([&](std::streambuf &output, size_t limit, const std::string &overlap, const char *top) -> size_t {
+        Blobs blobs;
+
+        if (true) {
+            std::stringbuf data;
+
+            Blobs requirements;
+            put(data, CSMAGIC_REQUIREMENTS, requirements);
+
+            insert(blobs, CSSLOT_REQUIREMENTS, data);
+        }
+
+        if (!entitlements.empty()) {
+            std::stringbuf data;
+            put(data, entitlements.data(), entitlements.size());
+            insert(blobs, CSSLOT_ENTITLEMENTS, CSMAGIC_EMBEDDED_ENTITLEMENTS, data);
+        }
+
+        if (true) {
+            std::stringbuf data;
+
+            uint32_t special(0);
+            _foreach (blob, blobs)
+                special = std::max(special, blob.first);
+            _foreach (slot, slots)
+                special = std::max(special, slot.first);
+            uint32_t normal((limit + PageSize_ - 1) / PageSize_);
+
+            CodeDirectory directory;
+            directory.version = Swap(uint32_t(0x00020001));
+            directory.flags = Swap(uint32_t(0));
+            directory.hashOffset = Swap(uint32_t(sizeof(Blob) + sizeof(CodeDirectory) + identifier.size() + 1 + SHA_DIGEST_LENGTH * special));
+            directory.identOffset = Swap(uint32_t(sizeof(Blob) + sizeof(CodeDirectory)));
+            directory.nSpecialSlots = Swap(special);
+            directory.codeLimit = Swap(uint32_t(limit));
+            directory.nCodeSlots = Swap(normal);
+            directory.hashSize = SHA_DIGEST_LENGTH;
+            directory.hashType = CS_HASHTYPE_SHA1;
+            directory.spare1 = 0x00;
+            directory.pageSize = PageShift_;
+            directory.spare2 = Swap(uint32_t(0));
+            put(data, &directory, sizeof(directory));
+
+            put(data, identifier.c_str(), identifier.size() + 1);
+
+            uint8_t storage[special + normal][SHA_DIGEST_LENGTH];
+            uint8_t (*hashes)[SHA_DIGEST_LENGTH] = storage + special;
+
+            memset(storage, 0, sizeof(*storage) * special);
+
+            _foreach (blob, blobs) {
+                auto local(reinterpret_cast<const Blob *>(&blob.second[0]));
+                sha1((uint8_t *) (hashes - blob.first), local, Swap(local->length));
+            }
+
+            _foreach (slot, slots) {
+                _assert(sizeof(*hashes) == slot.second.size());
+                memcpy(hashes - slot.first, slot.second.data(), slot.second.size());
+            }
+
+            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);
+
+            put(data, storage, sizeof(storage));
+
+            insert(blobs, CSSLOT_CODEDIRECTORY, CSMAGIC_CODEDIRECTORY, data);
+        }
+
+        if (!key.empty()) {
+            std::stringbuf data;
+            const std::string &sign(blobs[CSSLOT_CODEDIRECTORY]);
+
+            Stuff stuff(key);
+            Buffer bio(sign);
+
+            Signature signature(stuff, sign);
+            Buffer result(signature);
+            std::string value(result);
+            put(data, value.data(), value.size());
+
+            insert(blobs, CSSLOT_SIGNATURESLOT, CSMAGIC_BLOBWRAPPER, data);
+        }
+
+        return put(output, CSMAGIC_EMBEDDED_SIGNATURE, blobs);
+    }));
+}
+
+static void Unsign(void *idata, size_t isize, std::streambuf &output) {
+    Allocate(idata, isize, output, fun([](size_t size) -> size_t {
+        return 0;
+    }), fun([](std::streambuf &output, size_t limit, const std::string &overlap, const char *top) -> size_t {
+        return 0;
+    }));
+}
+
+std::string DiskFolder::Path(const std::string &path) {
+    return path_ + "/" + path;
+}
+
+DiskFolder::DiskFolder(const std::string &path) :
+    path_(path)
+{
+}
+
+DiskFolder::~DiskFolder() {
+    if (!std::uncaught_exception())
+        for (const auto &commit : commit_)
+            Commit(commit.first, commit.second);
+}
+
+void DiskFolder::Save(const std::string &path, 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 &)> &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);
+    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) {
+    auto root(Path(path));
+
+    FTS *fts(fts_open((char *[]) {const_cast<char *>(root.c_str()), NULL}, FTS_PHYSICAL | FTS_NOCHDIR, NULL));
+    _assert(fts != NULL);
+    _scope({ fts_close(fts); });
+
+    while (FTSENT *entry = fts_read(fts)) {
+        _assert(entry->fts_pathlen >= root.size());
+        _assert(strncmp(entry->fts_path, root.c_str(), root.size()) == 0);
+        if (entry->fts_pathlen == root.size())
+            continue;
+
+        _assert(entry->fts_path[root.size()] == '/');
+        std::string name(entry->fts_path + root.size() + 1);
+
+        if (Starts(Split(name).base, ".ldid."))
+            continue;
+
+        switch (auto info = entry->fts_info) {
+            case FTS_D:
+            case FTS_DP:
+            break;
+
+            case FTS_F: {
+                code(name, fun([&](const Functor<void (std::streambuf &, std::streambuf &)> &code) {
+                    std::string access(path + name);
+                    _assert_(Open(access, fun([&](std::streambuf &data) {
+                        NullBuffer save;
+                        code(data, save);
+                    })), "open(): %s", access.c_str());
+                }));
+            } break;
+
+            default:
+                _assert_(false, "fts_info=%u", info);
+        }
+    }
+}
+
+SubFolder::SubFolder(Folder *parent, const std::string &path) :
+    parent_(parent),
+    path_(path)
+{
+}
+
+void SubFolder::Save(const std::string &path, const Functor<void (std::streambuf &)> &code) {
+    return parent_->Save(path_ + path, code);
+}

 
 

-                if (flag_R && cmd == LC_REEXPORT_DYLIB)
-                    load_command->cmd = mach_header.Swap(LC_LOAD_DYLIB);
+bool SubFolder::Open(const std::string &path, const Functor<void (std::streambuf &)> &code) {
+    return parent_->Open(path_ + path, code);
+}
+
+void SubFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code) {
+    return parent_->Find(path_ + path, code);
+}
+
+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;
+}
+
+static PList::Structure *plist(const std::string &data) {
+    if (!Starts(data, "bplist00"))
+        return PList::Structure::FromXml(data);
+    std::vector<char> bytes(data.data(), data.data() + data.size());
+    return PList::Structure::FromBin(bytes);
+}
+
+static void plist_d(std::streambuf &buffer, const Functor<void (PList::Dictionary *)> &code) {
+    std::stringbuf data;
+    copy(buffer, data);
+    PList::Structure *structure(plist(data.str()));
+    _scope({ delete structure; });
+    auto dictionary(dynamic_cast<PList::Dictionary *>(structure));
+    _assert(dictionary != NULL);
+    code(dictionary);
+}
+
+static std::string plist_s(PList::Node *node) {
+    auto value(dynamic_cast<PList::String *>(node));
+    _assert(value != NULL);
+    return value->GetValue();
+}
+
+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_;
+    }
+};
+
+std::string Bundle(const std::string &root, Folder &folder, const std::string &key, std::map<std::string, std::vector<char>> &remote) {
+    std::string executable;
+    std::string identifier;
+
+    static const std::string info("Info.plist");
+
+    _assert_(folder.Open(info, fun([&](std::streambuf &buffer) {
+        plist_d(buffer, fun([&](PList::Dictionary *dictionary) {
+            executable = plist_s(((*dictionary)["CFBundleExecutable"]));
+            identifier = plist_s(((*dictionary)["CFBundleIdentifier"]));
+        }));
+    })), "open(): Info.plist");
+
+    std::map<std::string, std::multiset<Rule>> versions;
+
+    auto &rules1(versions[""]);
+    auto &rules2(versions["2"]);
+
+    static const std::string signature("_CodeSignature/CodeResources");
+
+    folder.Open(signature, fun([&](std::streambuf &buffer) {
+        plist_d(buffer, fun([&](PList::Dictionary *dictionary) {
+            // 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, std::vector<char>> 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);
+    }));
+
+    folder.Find("", fun([&](const std::string &name, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &code) {
+        if (name == executable || name == signature)
+            return;
+
+        auto &hash(local[name]);
+        if (!hash.empty())
+            return;
+
+        code(fun([&](std::streambuf &data, std::streambuf &save) {
+            HashProxy proxy(hash, save);
+            copy(data, proxy);
+        }));
+
+        _assert(hash.size() == SHA_DIGEST_LENGTH);
+    }));
+
+    PList::Dictionary plist;
+
+    for (const auto &version : versions) {
+        PList::Dictionary files;
+
+        for (const auto &rule : version.second)
+            rule.Compile();
+
+        for (const auto &hash : local)
+            for (const auto &rule : version.second)
+                if (rule(hash.first)) {
+                    if (rule.mode_ == NoMode)
+                        files.Set(hash.first, PList::Data(hash.second));
+                    else if (rule.mode_ == OptionalMode) {
+                        PList::Dictionary entry;
+                        entry.Set("hash", PList::Data(hash.second));
+                        entry.Set("optional", PList::Boolean(true));
+                        files.Set(hash.first, entry);
+                    }
+
+                    break;
+                }
+
+        plist.Set("files" + version.first, files);
+    }
+
+    for (const auto &version : versions) {
+        PList::Dictionary 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)
+                rules.Set(rule->code_, PList::Boolean(true));
+            else {
+                PList::Dictionary entry;
+
+                switch (rule->mode_) {
+                    case NoMode:
+                        break;
+                    case OmitMode:
+                        entry.Set("omit", PList::Boolean(true));
+                        break;
+                    case OptionalMode:
+                        entry.Set("optional", PList::Boolean(true));
+                        break;
+                    case NestedMode:
+                        entry.Set("nested", PList::Boolean(true));
+                        break;
+                    case TopMode:
+                        entry.Set("top", PList::Boolean(true));
+                        break;
+                }
+
+                if (rule->weight_ >= 10000)
+                    entry.Set("weight", PList::Integer(rule->weight_));
+                else if (rule->weight_ != 1)
+                    entry.Set("weight", PList::Real(rule->weight_));
+
+                rules.Set(rule->code_, entry);
+            }
+
+        plist.Set("rules" + version.first, rules);
+    }
+
+    folder.Save(signature, fun([&](std::streambuf &save) {
+        HashProxy proxy(local[signature], save);
+        auto xml(plist.ToXml());
+        put(proxy, xml.data(), xml.size());
+    }));
+
+    folder.Open(executable, fun([&](std::streambuf &buffer) {
+        // XXX: this is a miserable fail
+        std::stringbuf temp;
+        copy(buffer, temp);
+        auto data(temp.str());
+
+        folder.Save(executable, fun([&](std::streambuf &save) {
+            Slots slots;
+            slots[1] = local.at(info);
+            slots[3] = local.at(signature);
+
+            HashProxy proxy(local[executable], save);
+            Sign(data.data(), data.size(), proxy, identifier, "", key, slots);
+        }));
+    }));
+
+    for (const auto &hash : local)
+        remote[root + hash.first] = hash.second;
+
+    return executable;
+}
+
+}
+
+int main(int argc, char *argv[]) {
+    OpenSSL_add_all_algorithms();
+
+    union {
+        uint16_t word;
+        uint8_t byte[2];
+    } endian = {1};
+
+    little_ = endian.byte[0];
+
+    bool flag_r(false);
+    bool flag_e(false);
+
+    bool flag_T(false);
+
+    bool flag_S(false);
+    bool flag_s(false);
+
+    bool flag_D(false);
+
+    bool flag_A(false);
+    bool flag_a(false);
+
+    uint32_t flag_CPUType(_not(uint32_t));
+    uint32_t flag_CPUSubtype(_not(uint32_t));
+
+    const char *flag_I(NULL);
+
+    bool timeh(false);
+    uint32_t timev(0);
+
+    Map entitlements;
+    Map key;
+    ldid::Slots slots;
+
+    std::vector<std::string> files;
+
+    if (argc == 1) {
+        fprintf(stderr, "usage: %s -S[entitlements.xml] <binary>\n", argv[0]);
+        fprintf(stderr, "   %s -e MobileSafari\n", argv[0]);
+        fprintf(stderr, "   %s -S cat\n", argv[0]);
+        fprintf(stderr, "   %s -Stfp.xml gdb\n", argv[0]);
+        exit(0);
+    }
+
+    for (int argi(1); argi != argc; ++argi)
+        if (argv[argi][0] != '-')
+            files.push_back(argv[argi]);
+        else switch (argv[argi][1]) {
+            case 'r':
+                _assert(!flag_s);
+                _assert(!flag_S);
+                flag_r = 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);
+                std::vector<char> &hash(slots[number]);
+                hash.resize(SHA_DIGEST_LENGTH);
+                sha1(reinterpret_cast<uint8_t *>(hash.data()), file.data(), file.size());
+            } break;
+
+            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;
+                    const char *colon = strchr(cpu, ':');
+                    _assert(colon != NULL);
+                    char *arge;
+                    flag_CPUType = strtoul(cpu, &arge, 0);
+                    _assert(arge == colon);
+                    flag_CPUSubtype = strtoul(colon + 1, &arge, 0);
+                    _assert(arge == argv[argi] + strlen(argv[argi]));
+                }
+            break;
+
+            case 's':
+                _assert(!flag_r);
+                _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;
+                    entitlements.open(xml, O_RDONLY, PROT_READ, MAP_PRIVATE);
+                }
+            break;
+
+            case 'K':
+                key.open(argv[argi] + 2, O_RDONLY, PROT_READ, MAP_PRIVATE);
+            break;
+
+            case 'T': {
+                flag_T = true;
+                if (argv[argi][2] == '-')
+                    timeh = true;
+                else {
+                    char *arge;
+                    timev = strtoul(argv[argi] + 2, &arge, 0);
+                    _assert(arge == argv[argi] + strlen(argv[argi]));
+                }
+            } break;
+
+            case 'I': {
+                flag_I = argv[argi] + 2;
+            } break;
+
+            default:
+                goto usage;
+            break;
+        }
+
+    _assert(flag_S || key.empty());
+    _assert(flag_S || flag_I == NULL);
+
+    if (files.empty()) usage: {
+        exit(0);
+    }
+
+    size_t filei(0), filee(0);
+    _foreach (file, files) try {
+        std::string path(file);
+
+        struct stat info;
+        _syscall(stat(path.c_str(), &info));
+
+        if (S_ISDIR(info.st_mode)) {
+            _assert(!flag_r);
+            ldid::DiskFolder folder(path);
+            std::map<std::string, std::vector<char>> hashes;
+            path += "/" + Bundle("", folder, key, hashes);
+        } 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, key, slots);
+            }
+
+            Commit(path, temp);
+        }
+
+        Map mapping(path, flag_T || flag_s);
+        FatHeader fat_header(mapping.data(), mapping.size());
+
+        _foreach (mach_header, fat_header.GetMachHeaders()) {
+            struct linkedit_data_command *signature(NULL);
+            struct encryption_info_command *encryption(NULL);
+
+            if (flag_A) {
+                if (mach_header.GetCPUType() != flag_CPUType)
+                    continue;
+                if (mach_header.GetCPUSubtype() != flag_CPUSubtype)
+                    continue;
+            }
+
+            if (flag_a)
+                printf("cpu=0x%x:0x%x\n", mach_header.GetCPUType(), mach_header.GetCPUSubtype());
+
+            _foreach (load_command, mach_header.GetLoadCommands()) {
+                uint32_t cmd(mach_header.Swap(load_command->cmd));
+
+                if (false);

                 else if (cmd == LC_CODE_SIGNATURE)
                     signature = reinterpret_cast<struct linkedit_data_command *>(load_command);
                 else if (cmd == LC_CODE_SIGNATURE)
                     signature = reinterpret_cast<struct linkedit_data_command *>(load_command);

-                else if (cmd == LC_ENCRYPTION_INFO)
+                else if (cmd == LC_ENCRYPTION_INFO || cmd == LC_ENCRYPTION_INFO_64)

                     encryption = reinterpret_cast<struct encryption_info_command *>(load_command);
                     encryption = reinterpret_cast<struct encryption_info_command *>(load_command);

-                else if (cmd == LC_UUID) {
-                    volatile struct uuid_command *uuid_command(reinterpret_cast<struct uuid_command *>(load_command));
-
-                    if (flag_u) {
-                        printf("uuid%zu=%.2x%.2x%.2x%.2x-%.2x%.2x-%.2x%.2x-%.2x%.2x-%.2x%.2x%.2x%.2x%.2x%.2x\n", filei,
-                            uuid_command->uuid[ 0], uuid_command->uuid[ 1], uuid_command->uuid[ 2], uuid_command->uuid[ 3],
-                            uuid_command->uuid[ 4], uuid_command->uuid[ 5], uuid_command->uuid[ 6], uuid_command->uuid[ 7],
-                            uuid_command->uuid[ 8], uuid_command->uuid[ 9], uuid_command->uuid[10], uuid_command->uuid[11],
-                            uuid_command->uuid[12], uuid_command->uuid[13], uuid_command->uuid[14], uuid_command->uuid[15]
-                        );
-                    }
-                } else if (cmd == LC_ID_DYLIB) {
+                else if (cmd == LC_ID_DYLIB) {

                     volatile struct dylib_command *dylib_command(reinterpret_cast<struct dylib_command *>(load_command));
 
                     volatile struct dylib_command *dylib_command(reinterpret_cast<struct dylib_command *>(load_command));
 

-                    if (flag_t)
-                        printf("time%zu=0x%.8x\n", filei, mach_header.Swap(dylib_command->dylib.timestamp));
-

                     if (flag_T) {
                         uint32_t timed;
 
                     if (flag_T) {
                         uint32_t timed;
 


@@ -1179,14 +2134,6 @@ int main(int argc, const char *argv[]) {
                 }
             }
 
                 }
             }
 

-            if (flag_d) {
-                _assert(encryption != NULL);
-
-                printf("cryptoff=0x%x\n", mach_header.Swap(encryption->cryptoff));
-                printf("cryptsize=0x%x\n", mach_header.Swap(encryption->cryptsize));
-                printf("cryptid=0x%x\n", mach_header.Swap(encryption->cryptid));
-            }
-

             if (flag_D) {
                 _assert(encryption != NULL);
                 encryption->cryptid = mach_header.Swap(0);
             if (flag_D) {
                 _assert(encryption != NULL);
                 encryption->cryptid = mach_header.Swap(0);


@@ -1205,7 +2152,7 @@ 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);

                     }
             }
 
                     }
             }
 


@@ -1223,143 +2170,18 @@ int main(int argc, const char *argv[]) {
                         uint32_t begin = Swap(super->index[index].offset);
                         struct CodeDirectory *directory = reinterpret_cast<struct CodeDirectory *>(blob + begin);
 
                         uint32_t begin = Swap(super->index[index].offset);
                         struct CodeDirectory *directory = reinterpret_cast<struct CodeDirectory *>(blob + begin);
 

-                        uint8_t (*hashes)[20] = reinterpret_cast<uint8_t (*)[20]>(blob + begin + Swap(directory->hashOffset));
+                        uint8_t (*hashes)[SHA_DIGEST_LENGTH] = reinterpret_cast<uint8_t (*)[SHA_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);
-                    }
-            }
-
-            if (flag_S) {
-                _assert(signature != NULL);
-
-                uint32_t data = mach_header.Swap(signature->dataoff);
-                uint32_t size = mach_header.Swap(signature->datasize);
-
-                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);
-
-                uint32_t count = xmld == NULL ? 2 : 3;
-                uint32_t offset = sizeof(struct SuperBlob) + count * sizeof(struct BlobIndex);
-
-                super->index[0].type = Swap(CSSLOT_CODEDIRECTORY);
-                super->index[0].offset = Swap(offset);
-
-                uint32_t begin = offset;
-                struct CodeDirectory *directory = reinterpret_cast<struct CodeDirectory *>(blob + begin);
-                offset += sizeof(struct CodeDirectory);
-
-                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));
-
-                directory->identOffset = Swap(offset - begin);
-                strcpy(reinterpret_cast<char *>(blob + offset), name);
-                offset += strlen(name) + 1;
-
-                uint32_t special = xmld == NULL ? CSSLOT_REQUIREMENTS : CSSLOT_ENTITLEMENTS;
-                directory->nSpecialSlots = Swap(special);
-
-                uint8_t (*hashes)[20] = reinterpret_cast<uint8_t (*)[20]>(blob + offset);
-                memset(hashes, 0, sizeof(*hashes) * special);
-
-                offset += sizeof(*hashes) * special;
-                hashes += special;
-
-                uint32_t pages = (data + 0x1000 - 1) / 0x1000;
-                directory->nCodeSlots = Swap(pages);
-
-                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);
-
-                directory->hashOffset = Swap(offset - begin);
-                offset += sizeof(*hashes) * pages;
-                directory->blob.length = Swap(offset - begin);
-
-                super->index[1].type = Swap(CSSLOT_REQUIREMENTS);
-                super->index[1].offset = Swap(offset);
-
-                memcpy(blob + offset, "\xfa\xde\x0c\x01\x00\x00\x00\x0c\x00\x00\x00\x00", 0xc);
-                offset += 0xc;
-
-                if (xmld != NULL) {
-                    super->index[2].type = Swap(CSSLOT_ENTITLEMENTS);
-                    super->index[2].offset = Swap(offset);
-
-                    uint32_t begin = offset;
-                    struct Blob *entitlements = reinterpret_cast<struct Blob *>(blob + begin);
-                    offset += sizeof(struct Blob);
-
-                    memcpy(blob + offset, xmld, xmls);
-                    offset += xmls;
-
-                    entitlements->magic = Swap(CSMAGIC_ENTITLEMENTS);
-                    entitlements->length = Swap(offset - begin);
-                }
-
-                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));
+                            sha1(hashes[pages - 1], top + PageSize_ * (pages - 1), ((data - 1) % PageSize_) + 1);

                     }
                     }

-                }
-
-                super->count = Swap(count);
-                super->blob.length = Swap(offset);
-
-                if (offset > size) {
-                    fprintf(stderr, "offset (%u) > size (%u)\n", offset, size);
-                    _assert(false);
-                } //else fprintf(stderr, "offset (%zu) <= size (%zu)\n", offset, size);
-
-                memset(blob + offset, 0, size - offset);

             }
         }
 
             }
         }
 

-        if (flag_S) {
-            uint8_t *top = reinterpret_cast<uint8_t *>(fat_header.GetBase());
-            size_t size = fat_header.GetSize();
-
-            char *copy;
-            asprintf(&copy, "%s.%s.cp", dir, base);
-            FILE *file = fopen(copy, "w+");
-            size_t writ = fwrite(top, 1, size, file);
-            _assert(writ == size);
-            fclose(file);
-
-            _syscall(unlink(temp));
-            free(temp);
-            temp = copy;
-        }
-
-        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);
-        }
-
-        free(dir);

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