Avoid using minimal/mapping.h (use internal mmap).

[ldid.git] / ldid.cpp

diff --git a/ldid.cpp b/ldid.cpp
index 807c33362b9f67d4d90563423988208865316407..7dec246fab3133073f9f43c7e31519442458759d 100644 (file)
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -20,19 +20,21 @@
 /* }}} */
 
 #include "minimal/stdlib.h"
 /* }}} */
 
 #include "minimal/stdlib.h"

-#include "minimal/string.h"
-#include "minimal/mapping.h"
-
-#include "sha1.h"

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

-#include <sys/wait.h>
-#include <sys/types.h>
+#include <dlfcn.h>
+#include <fcntl.h>
+
+#include <sys/mman.h>

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

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

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


@@ -67,6 +69,7 @@ struct mach_header {
 
 #define MH_DYLDLINK   0x4
 
 
 #define MH_DYLDLINK   0x4
 

+#define MH_OBJECT     0x1

 #define MH_EXECUTE    0x2
 #define MH_DYLIB      0x6
 #define MH_BUNDLE     0x8
 #define MH_EXECUTE    0x2
 #define MH_DYLIB      0x6
 #define MH_BUNDLE     0x8


@@ -277,6 +280,30 @@ struct encryption_info_command {
     uint32_t cryptid;
 } _packed;
 
     uint32_t cryptid;
 } _packed;
 

+#define BIND_OPCODE_MASK                             0xf0
+#define BIND_IMMEDIATE_MASK                          0x0f
+#define BIND_OPCODE_DONE                             0x00
+#define BIND_OPCODE_SET_DYLIB_ORDINAL_IMM            0x10
+#define BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB           0x20
+#define BIND_OPCODE_SET_DYLIB_SPECIAL_IMM            0x30
+#define BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM    0x40
+#define BIND_OPCODE_SET_TYPE_IMM                     0x50
+#define BIND_OPCODE_SET_ADDEND_SLEB                  0x60
+#define BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB      0x70
+#define BIND_OPCODE_ADD_ADDR_ULEB                    0x80
+#define BIND_OPCODE_DO_BIND                          0x90
+#define BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB            0xa0
+#define BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED      0xb0
+#define BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB 0xc0
+
+template <typename Type_>
+Type_ Align(Type_ value, size_t align) {
+    value += align - 1;
+    value /= align;
+    value *= align;
+    return value;
+}
+

 uint16_t Swap_(uint16_t value) {
     return
         ((value >>  8) & 0x00ff) |
 uint16_t Swap_(uint16_t value) {
     return
         ((value >>  8) & 0x00ff) |


@@ -291,6 +318,13 @@ uint32_t Swap_(uint32_t value) {
     return value;
 }
 
     return value;
 }
 

+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;
+}
+

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


@@ -299,6 +333,10 @@ 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) {
+    return Swap_(static_cast<uint64_t>(value));
+}
+

 bool little_(true);
 
 uint16_t Swap(uint16_t value) {
 bool little_(true);
 
 uint16_t Swap(uint16_t value) {


@@ -309,6 +347,10 @@ uint32_t Swap(uint32_t value) {
     return little_ ? Swap_(value) : value;
 }
 
     return little_ ? Swap_(value) : value;
 }
 

+uint64_t Swap(uint64_t value) {
+    return little_ ? Swap_(value) : value;
+}
+

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


@@ -317,6 +359,10 @@ 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) {
+    return Swap(static_cast<uint64_t>(value));
+}
+

 template <typename Target_>
 class Pointer;
 
 template <typename Target_>
 class Pointer;
 


@@ -344,6 +390,10 @@ class Data {
         return swapped_ ? Swap_(value) : value;
     }
 
         return swapped_ ? Swap_(value) : value;
     }
 

+    uint64_t Swap(uint64_t value) const {
+        return swapped_ ? Swap_(value) : value;
+    }
+

     int16_t Swap(int16_t value) const {
         return Swap(static_cast<uint16_t>(value));
     }
     int16_t Swap(int16_t value) const {
         return Swap(static_cast<uint16_t>(value));
     }


@@ -352,6 +402,10 @@ class Data {
         return Swap(static_cast<uint32_t>(value));
     }
 
         return Swap(static_cast<uint32_t>(value));
     }
 

+    int64_t Swap(int64_t value) const {
+        return Swap(static_cast<uint64_t>(value));
+    }
+

     void *GetBase() const {
         return base_;
     }
     void *GetBase() const {
         return base_;
     }


@@ -409,14 +463,22 @@ class MachHeader :
         return mach_header_;
     }
 
         return mach_header_;
     }
 

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

     uint32_t GetCPUType() const {
         return Swap(mach_header_->cputype);
     }
 
     uint32_t GetCPUType() const {
         return Swap(mach_header_->cputype);
     }
 

-    uint16_t GetCPUSubtype() const {
+    uint32_t GetCPUSubtype() const {

         return Swap(mach_header_->cpusubtype) & 0xff;
     }
 
         return Swap(mach_header_->cpusubtype) & 0xff;
     }
 

+    struct load_command *GetLoadCommand() const {
+        return load_command_;
+    }
+

     std::vector<struct load_command *> GetLoadCommands() const {
         std::vector<struct load_command *> load_commands;
 
     std::vector<struct load_command *> GetLoadCommands() const {
         std::vector<struct load_command *> load_commands;
 


@@ -443,7 +505,7 @@ class MachHeader :
         return segment_commands;
     }
 
         return segment_commands;
     }
 

-    std::vector<segment_command_64 *> GetSegments64(const char *segment_name) {
+    std::vector<segment_command_64 *> GetSegments64(const char *segment_name) const {

         std::vector<struct segment_command_64 *> segment_commands;
 
         _foreach (load_command, GetLoadCommands()) {
         std::vector<struct segment_command_64 *> segment_commands;
 
         _foreach (load_command, GetLoadCommands()) {


@@ -572,13 +634,11 @@ class FatHeader :
     struct fat_header *operator ->() const {
         return fat_header_;
     }
     struct fat_header *operator ->() const {
         return fat_header_;
     }

-};

 
 

-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);
-}
+    operator struct fat_header *() const {
+        return fat_header_;
+    }
+};

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


@@ -655,23 +715,100 @@ struct CodeDirectory {
 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) {
 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);
+    SHA1(data, size, hash);

 }
 
 struct CodesignAllocation {
 }
 
 struct CodesignAllocation {

-    uint32_t type_;
-    uint16_t subtype_;
+    FatMachHeader mach_header_;
+    uint32_t offset_;
+    uint32_t size_;
+    uint32_t alloc_;
+    uint32_t align_;
+
+    CodesignAllocation(FatMachHeader mach_header, size_t offset, size_t size, size_t alloc, size_t align) :
+        mach_header_(mach_header),
+        offset_(offset),
+        size_(size),
+        alloc_(alloc),
+        align_(align)
+    {
+    }
+};
+
+class File {
+  private:
+    int file_;
+
+  public:
+    File() :
+        file_(-1)
+    {
+    }
+
+    ~File() {
+        if (file_ != -1)
+            _syscall(close(file_));
+    }
+
+    void open(const char *path, bool ro) {
+        _assert(file_ == -1);
+        _syscall(file_ = ::open(path, ro ? O_RDONLY : O_RDWR));
+    }
+
+    int file() const {
+        return file_;
+    }
+};
+
+class Map {
+  private:
+    File file_;
+    void *data_;

     size_t size_;
 
     size_t size_;
 

-    CodesignAllocation(uint32_t type, uint16_t subtype, size_t size) :
-        type_(type),
-        subtype_(subtype),
-        size_(size)
+    void clear() {
+        if (data_ == NULL)
+            return;
+        _syscall(munmap(data_, size_));
+        data_ = NULL;
+        size_ = 0;
+    }
+
+  public:
+    Map() :
+        data_(NULL),
+        size_(0)

     {
     }
     {
     }

+
+    Map(const char *path, bool ro) {
+        open(path, ro);
+    }
+
+    ~Map() {
+        clear();
+    }
+
+    void open(const char *path, bool ro) {
+        clear();
+
+        file_.open(path, ro);
+        int file(file_.file());
+
+        struct stat stat;
+        _syscall(fstat(file, &stat));
+        size_ = stat.st_size;
+
+        _syscall(data_ = mmap(NULL, size_, ro ? PROT_READ : PROT_READ | PROT_WRITE, ro ? MAP_PRIVATE : MAP_SHARED, file, 0));
+    }
+
+    void *data() const {
+        return data_;
+    }
+
+    size_t size() const {
+        return size_;
+    }

 };
 
 int main(int argc, const char *argv[]) {
 };
 
 int main(int argc, const char *argv[]) {


@@ -706,9 +843,12 @@ int main(int argc, const char *argv[]) {
     uint32_t flag_CPUType(_not(uint32_t));
     uint32_t flag_CPUSubtype(_not(uint32_t));
 
     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);
 
     bool timeh(false);
     uint32_t timev(0);
 

+    Map xmlm;

     const void *xmld(NULL);
     size_t xmls(0);
 
     const void *xmld(NULL);
     size_t xmls(0);
 


@@ -767,7 +907,9 @@ int main(int argc, const char *argv[]) {
                 flag_S = true;
                 if (argv[argi][2] != '\0') {
                     const char *xml = argv[argi] + 2;
                 flag_S = true;
                 if (argv[argi][2] != '\0') {
                     const char *xml = argv[argi] + 2;

-                    xmld = map(xml, 0, _not(size_t), &xmls, true);
+                    xmlm.open(xml, true);
+                    xmld = xmlm.data();
+                    xmls = xmlm.size();

                 }
             break;
 
                 }
             break;
 


@@ -782,6 +924,10 @@ int main(int argc, const char *argv[]) {
                 }
             } break;
 
                 }
             } break;
 

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

             case 'n': {
                 char *arge;
                 noffset = strtoul(argv[argi] + 2, &arge, 0);
             case 'n': {
                 char *arge;
                 noffset = strtoul(argv[argi] + 2, &arge, 0);


@@ -807,18 +953,20 @@ int main(int argc, const char *argv[]) {
     _foreach (file, files) try {
         const char *path(file.c_str());
         const char *base = strrchr(path, '/');
     _foreach (file, files) try {
         const char *path(file.c_str());
         const char *base = strrchr(path, '/');

-        char *temp(NULL), *dir;

 
 

+        std::string dir;

         if (base != NULL)
         if (base != NULL)

-            dir = strndup_(path, base++ - path + 1);
-        else {
-            dir = strdup("");
+            dir.assign(path, base++ - path + 1);
+        else

             base = path;
             base = path;

-        }
+
+        const char *name(flag_I ?: base);
+        char *temp(NULL);

 
         if (flag_r) {
             uint32_t clip(0); {
 
         if (flag_r) {
             uint32_t clip(0); {

-                FatHeader fat_header(Map(path));
+                Map mapping(path, false);
+                FatHeader fat_header(mapping.data(), mapping.size());

                 _foreach (mach_header, fat_header.GetMachHeaders()) {
                     if (flag_A) {
                         if (mach_header.GetCPUType() != flag_CPUType)
                 _foreach (mach_header, fat_header.GetMachHeaders()) {
                     if (flag_A) {
                         if (mach_header.GetCPUType() != flag_CPUType)


@@ -851,7 +999,7 @@ int main(int argc, const char *argv[]) {
 
                     _assert(size != _not(uint32_t));
 
 
                     _assert(size != _not(uint32_t));
 

-                    _foreach (segment, const_cast<FatMachHeader &>(mach_header).GetSegments("__LINKEDIT")) {
+                    _foreach (segment, mach_header.GetSegments("__LINKEDIT")) {

                         segment->filesize -= mach_header.GetSize() - size;
 
                         if (fat_arch *fat_arch = mach_header.GetFatArch()) {
                         segment->filesize -= mach_header.GetSize() - size;
 
                         if (fat_arch *fat_arch = mach_header.GetFatArch()) {


@@ -861,7 +1009,7 @@ int main(int argc, const char *argv[]) {
                             clip = std::max(clip, size);
                     }
 
                             clip = std::max(clip, size);
                     }
 

-                    _foreach (segment, const_cast<FatMachHeader &>(mach_header).GetSegments64("__LINKEDIT")) {
+                    _foreach (segment, mach_header.GetSegments64("__LINKEDIT")) {

                         segment->filesize -= mach_header.GetSize() - size;
 
                         if (fat_arch *fat_arch = mach_header.GetFatArch()) {
                         segment->filesize -= mach_header.GetSize() - size;
 
                         if (fat_arch *fat_arch = mach_header.GetFatArch()) {


@@ -878,14 +1026,16 @@ int main(int argc, const char *argv[]) {
         }
 
         if (flag_S) {
         }
 
         if (flag_S) {

-            asprintf(&temp, "%s.%s.cs", dir, base);
-            const char *allocate = getenv("CODESIGN_ALLOCATE");
-            if (allocate == NULL)
-                allocate = "codesign_allocate";
+            Map input(path, true);
+            FatHeader source(input.data(), input.size());
+
+            size_t offset(0);
+
+            if (source.IsFat())
+                offset += sizeof(fat_header) + sizeof(fat_arch) * source.Swap(source->nfat_arch);

 
             std::vector<CodesignAllocation> allocations; {
 
             std::vector<CodesignAllocation> allocations; {

-                FatHeader fat_header(Map(path));
-                _foreach (mach_header, fat_header.GetMachHeaders()) {
+                _foreach (mach_header, source.GetMachHeaders()) {

                     if (flag_A) {
                         if (mach_header.GetCPUType() != flag_CPUType)
                             continue;
                     if (flag_A) {
                         if (mach_header.GetCPUType() != flag_CPUType)
                             continue;


@@ -893,8 +1043,6 @@ int main(int argc, const char *argv[]) {
                             continue;
                     }
 
                             continue;
                     }
 

-                    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));
                     size_t size(_not(size_t)); {
                         _foreach (load_command, mach_header.GetLoadCommands()) {
                             uint32_t cmd(mach_header.Swap(load_command->cmd));


@@ -910,33 +1058,6 @@ int main(int argc, const char *argv[]) {
                             size = mach_header.GetSize();
                     }
 
                             size = mach_header.GetSize();
                     }
 

-                    allocations.push_back(CodesignAllocation(mach_header.GetCPUType(), mach_header.GetCPUSubtype(), size));
-                }
-            }
-
-            if (!allocations.empty()) {
-
-            pid_t pid = fork();
-            _syscall(pid);
-            if (pid == 0) {
-                // XXX: this leaks memory, but it doesn't really matter
-                std::vector<const char *> args;
-                char *arg;
-
-                args.push_back(allocate);
-
-                args.push_back("-i");
-                args.push_back(path);
-
-                _foreach (allocation, allocations) {
-                    args.push_back("-A");
-
-                    asprintf(&arg, "%u", allocation.type_);
-                    args.push_back(arg);
-
-                    asprintf(&arg, "%u", allocation.subtype_);
-                    args.push_back(arg);
-

                     size_t alloc(0);
                     alloc += sizeof(struct SuperBlob);
                     uint32_t special(0);
                     size_t alloc(0);
                     alloc += sizeof(struct SuperBlob);
                     uint32_t special(0);


@@ -944,7 +1065,7 @@ int main(int argc, const char *argv[]) {
                     special = std::max(special, CSSLOT_CODEDIRECTORY);
                     alloc += sizeof(struct BlobIndex);
                     alloc += sizeof(struct CodeDirectory);
                     special = std::max(special, CSSLOT_CODEDIRECTORY);
                     alloc += sizeof(struct BlobIndex);
                     alloc += sizeof(struct CodeDirectory);

-                    alloc += strlen(base) + 1;
+                    alloc += strlen(name) + 1;

 
                     special = std::max(special, CSSLOT_REQUIREMENTS);
                     alloc += sizeof(struct BlobIndex);
 
                     special = std::max(special, CSSLOT_REQUIREMENTS);
                     alloc += sizeof(struct BlobIndex);


@@ -957,48 +1078,101 @@ int main(int argc, const char *argv[]) {
                         alloc += xmls;
                     }
 
                         alloc += xmls;
                     }
 

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

 
 

-                    alloc += 15;
-                    alloc /= 16;
-                    alloc *= 16;
+                    auto *fat_arch(mach_header.GetFatArch());
+                    uint32_t align(fat_arch == NULL ? 0 : source.Swap(fat_arch->align));
+                    offset = Align(offset, 1 << align);

 
 

-                    asprintf(&arg, "%zu", alloc);
-                    args.push_back(arg);
+                    allocations.push_back(CodesignAllocation(mach_header, offset, size, alloc, align));
+                    offset += size + alloc;
+                    offset = Align(offset, 16);

                 }
                 }

+            }

 
 

-                args.push_back("-o");
-                args.push_back(temp);
+            asprintf(&temp, "%s.%s.cs", dir.c_str(), base);
+            fclose(fopen(temp, "w+"));
+            _syscall(truncate(temp, offset));
+
+            Map output(temp, false);
+            _assert(output.size() == offset);
+            void *file(output.data());
+            memset(file, 0, offset);
+
+            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);
+            }
+
+            _foreach (allocation, allocations) {
+                auto &source(allocation.mach_header_);

 
 

-                args.push_back(NULL);
+                uint32_t align(allocation.size_);
+                align = Align(align, 0x10);

 
 

-                if (false) {
-                    printf("run:");
-                    _foreach (arg, args)
-                        printf(" %s", arg);
-                    printf("\n");
+                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;

                 }
 
                 }
 

-                execvp(allocate, (char **) &args[0]);
-                _assert(false);
-            }
+                void *target(reinterpret_cast<uint8_t *>(file) + allocation.offset_);
+                memcpy(target, source, allocation.size_);
+                MachHeader mach_header(target, align + allocation.alloc_);

 
 

-            int status;
-            _syscall(waitpid(pid, &status, 0));
-            _assert(WIFEXITED(status));
-            _assert(WEXITSTATUS(status) == 0);
+                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;
+                }

 
 

+                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)));
+                }
+
+                signature->dataoff = mach_header.Swap(align);
+                signature->datasize = mach_header.Swap(allocation.alloc_);
+
+                _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);
+                }
+
+                _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);
+                }

             }
         }
 
         if (flag_p)
             printf("path%zu='%s'\n", filei, file.c_str());
 
             }
         }
 
         if (flag_p)
             printf("path%zu='%s'\n", filei, file.c_str());
 

-        FatHeader fat_header(Map(temp == NULL ? path : temp, !(flag_R || flag_T || flag_s || flag_S || flag_O || flag_D)));
-        struct linkedit_data_command *signature(NULL);
+        Map mapping(temp == NULL ? path : temp, !(flag_R || flag_T || flag_s || flag_S || flag_O || flag_D));
+        FatHeader fat_header(mapping.data(), mapping.size());

 
         _foreach (mach_header, fat_header.GetMachHeaders()) {
 
         _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 (flag_A) {
                 if (mach_header.GetCPUType() != flag_CPUType)
                     continue;


@@ -1045,6 +1219,8 @@ int main(int argc, const char *argv[]) {
                     load_command->cmd = mach_header.Swap(LC_LOAD_DYLIB);
                 else if (cmd == LC_CODE_SIGNATURE)
                     signature = reinterpret_cast<struct linkedit_data_command *>(load_command);
                     load_command->cmd = mach_header.Swap(LC_LOAD_DYLIB);
                 else if (cmd == LC_CODE_SIGNATURE)
                     signature = reinterpret_cast<struct linkedit_data_command *>(load_command);

+                else if (cmd == LC_ENCRYPTION_INFO)
+                    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));
 
                 else if (cmd == LC_UUID) {
                     volatile struct uuid_command *uuid_command(reinterpret_cast<struct uuid_command *>(load_command));
 


@@ -1074,18 +1250,20 @@ int main(int argc, const char *argv[]) {
 
                         dylib_command->dylib.timestamp = mach_header.Swap(timed);
                     }
 
                         dylib_command->dylib.timestamp = mach_header.Swap(timed);
                     }

-                } else if (cmd == LC_ENCRYPTION_INFO) {
-                    volatile struct encryption_info_command *encryption_info_command(reinterpret_cast<struct encryption_info_command *>(load_command));
+                }
+            }

 
 

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

 
 

-                    if (flag_d) {
-                        printf("cryptoff=0x%x\n", mach_header.Swap(encryption_info_command->cryptoff));
-                        printf("cryptsize=0x%x\n", mach_header.Swap(encryption_info_command->cryptsize));
-                        printf("cryptid=0x%x\n", mach_header.Swap(encryption_info_command->cryptid));
-                    }
-                }
+                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_e) {
             }
 
             if (flag_e) {


@@ -1162,8 +1340,8 @@ int main(int argc, const char *argv[]) {
                 directory->spare2 = Swap(uint32_t(0));
 
                 directory->identOffset = Swap(offset - begin);
                 directory->spare2 = Swap(uint32_t(0));
 
                 directory->identOffset = Swap(offset - begin);

-                strcpy(reinterpret_cast<char *>(blob + offset), base);
-                offset += strlen(base) + 1;
+                strcpy(reinterpret_cast<char *>(blob + offset), name);
+                offset += strlen(name) + 1;

 
                 uint32_t special = xmld == NULL ? CSSLOT_REQUIREMENTS : CSSLOT_ENTITLEMENTS;
                 directory->nSpecialSlots = Swap(special);
 
                 uint32_t special = xmld == NULL ? CSSLOT_REQUIREMENTS : CSSLOT_ENTITLEMENTS;
                 directory->nSpecialSlots = Swap(special);


@@ -1234,7 +1412,7 @@ int main(int argc, const char *argv[]) {
             size_t size = fat_header.GetSize();
 
             char *copy;
             size_t size = fat_header.GetSize();
 
             char *copy;

-            asprintf(&copy, "%s.%s.cp", dir, base);
+            asprintf(&copy, "%s.%s.cp", dir.c_str(), base);

             FILE *file = fopen(copy, "w+");
             size_t writ = fwrite(top, 1, size, file);
             _assert(writ == size);
             FILE *file = fopen(copy, "w+");
             size_t writ = fwrite(top, 1, size, file);
             _assert(writ == size);


@@ -1255,7 +1433,6 @@ int main(int argc, const char *argv[]) {
             free(temp);
         }
 
             free(temp);
         }
 

-        free(dir);

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