X-Git-Url: https://git.saurik.com/ldid.git/blobdiff_plain/6b38c1732a783374afe0172548107ea7e95402b7..7b496abd3d9cbe500279e025860ed8a345d665b4:/ldid.cpp
diff --git a/ldid.cpp b/ldid.cpp
index 4982582..384b27c 100644
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -1,53 +1,37 @@
/* ldid - (Mach-O) Link-Loader Identity Editor
- * Copyright (C) 2007-2010 Jay Freeman (saurik)
+ * Copyright (C) 2007-2012 Jay Freeman (saurik)
*/
+/* GNU Affero General Public License, Version 3 {{{ */
/*
- * Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the
- * above copyright notice, this list of conditions
- * and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- * above copyright notice, this list of conditions
- * and the following disclaimer in the documentation
- * and/or other materials provided with the
- * distribution.
- * 3. The name of the author may not be used to endorse
- * or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+**/
+/* }}} */
#include "minimal/stdlib.h"
#include "minimal/string.h"
#include "minimal/mapping.h"
+extern "C" {
#include "sha1.h"
+}
#include
#include
#include
-#include
-#include
-#include
+#include
struct fat_header {
uint32_t magic;
@@ -83,6 +67,7 @@ struct mach_header {
#define MH_DYLDLINK 0x4
+#define MH_OBJECT 0x1
#define MH_EXECUTE 0x2
#define MH_DYLIB 0x6
#define MH_BUNDLE 0x8
@@ -100,10 +85,12 @@ struct load_command {
#define LC_DYSYMTAB uint32_t(0x0b)
#define LC_LOAD_DYLIB uint32_t(0x0c)
#define LC_ID_DYLIB uint32_t(0x0d)
+#define LC_SEGMENT_64 uint32_t(0x19)
#define LC_UUID uint32_t(0x1b)
#define LC_CODE_SIGNATURE uint32_t(0x1d)
#define LC_SEGMENT_SPLIT_INFO uint32_t(0x1e)
#define LC_REEXPORT_DYLIB uint32_t(0x1f | 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)
@@ -232,7 +219,21 @@ struct segment_command {
uint32_t initprot;
uint32_t nsects;
uint32_t flags;
-};
+} _packed;
+
+struct segment_command_64 {
+ uint32_t cmd;
+ uint32_t cmdsize;
+ char segname[16];
+ uint64_t vmaddr;
+ uint64_t vmsize;
+ uint64_t fileoff;
+ uint64_t filesize;
+ uint32_t maxprot;
+ uint32_t initprot;
+ uint32_t nsects;
+ uint32_t flags;
+} _packed;
struct section {
char sectname[16];
@@ -246,7 +247,21 @@ struct section {
uint32_t flags;
uint32_t reserved1;
uint32_t reserved2;
-};
+} _packed;
+
+struct section_64 {
+ char sectname[16];
+ char segname[16];
+ uint64_t addr;
+ uint64_t size;
+ uint32_t offset;
+ uint32_t align;
+ uint32_t reloff;
+ uint32_t nreloc;
+ uint32_t flags;
+ uint32_t reserved1;
+ uint32_t reserved2;
+} _packed;
struct linkedit_data_command {
uint32_t cmd;
@@ -255,6 +270,38 @@ struct linkedit_data_command {
uint32_t datasize;
} _packed;
+struct encryption_info_command {
+ uint32_t cmd;
+ uint32_t cmdsize;
+ uint32_t cryptoff;
+ uint32_t cryptsize;
+ 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
+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) |
@@ -269,6 +316,13 @@ uint32_t Swap_(uint32_t 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(value));
}
@@ -277,6 +331,10 @@ int32_t Swap_(int32_t value) {
return Swap_(static_cast(value));
}
+int64_t Swap_(int64_t value) {
+ return Swap_(static_cast(value));
+}
+
bool little_(true);
uint16_t Swap(uint16_t value) {
@@ -287,6 +345,10 @@ uint32_t Swap(uint32_t 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(value));
}
@@ -295,6 +357,10 @@ int32_t Swap(int32_t value) {
return Swap(static_cast(value));
}
+int64_t Swap(int64_t value) {
+ return Swap(static_cast(value));
+}
+
template
class Pointer;
@@ -322,6 +388,10 @@ class Data {
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(value));
}
@@ -330,6 +400,10 @@ class Data {
return Swap(static_cast(value));
}
+ int64_t Swap(int64_t value) const {
+ return Swap(static_cast(value));
+ }
+
void *GetBase() const {
return base_;
}
@@ -387,14 +461,22 @@ class MachHeader :
return mach_header_;
}
+ operator struct mach_header *() const {
+ return mach_header_;
+ }
+
uint32_t GetCPUType() const {
return Swap(mach_header_->cputype);
}
- uint16_t GetCPUSubtype() const {
+ uint32_t GetCPUSubtype() const {
return Swap(mach_header_->cpusubtype) & 0xff;
}
+ struct load_command *GetLoadCommand() const {
+ return load_command_;
+ }
+
std::vector GetLoadCommands() const {
std::vector load_commands;
@@ -407,20 +489,35 @@ class MachHeader :
return load_commands;
}
- std::vector GetSegments(const char *segment_name) {
+ std::vector GetSegments(const char *segment_name) const {
std::vector segment_commands;
- _foreach (load_command, GetLoadCommands())
+ _foreach (load_command, GetLoadCommands()) {
if (Swap(load_command->cmd) == LC_SEGMENT) {
segment_command *segment_command = reinterpret_cast(load_command);
if (strncmp(segment_command->segname, segment_name, 16) == 0)
segment_commands.push_back(segment_command);
}
+ }
return segment_commands;
}
- std::vector GetSections(const char *segment_name, const char *section_name) {
+ std::vector GetSegments64(const char *segment_name) const {
+ std::vector segment_commands;
+
+ _foreach (load_command, GetLoadCommands()) {
+ if (Swap(load_command->cmd) == LC_SEGMENT_64) {
+ segment_command_64 *segment_command = reinterpret_cast(load_command);
+ if (strncmp(segment_command->segname, segment_name, 16) == 0)
+ segment_commands.push_back(segment_command);
+ }
+ }
+
+ return segment_commands;
+ }
+
+ std::vector GetSections(const char *segment_name, const char *section_name) const {
std::vector sections;
_foreach (segment, GetSegments(segment_name)) {
@@ -474,12 +571,30 @@ class MachHeader :
}
};
+class FatMachHeader :
+ public MachHeader
+{
+ private:
+ fat_arch *fat_arch_;
+
+ public:
+ FatMachHeader(void *base, size_t size, fat_arch *fat_arch) :
+ MachHeader(base, size),
+ fat_arch_(fat_arch)
+ {
+ }
+
+ fat_arch *GetFatArch() const {
+ return fat_arch_;
+ }
+};
+
class FatHeader :
public Data
{
private:
fat_header *fat_header_;
- std::vector mach_headers_;
+ std::vector mach_headers_;
public:
FatHeader(void *base, size_t size) :
@@ -492,7 +607,7 @@ class FatHeader :
goto fat;
} else if (Swap(fat_header_->magic) != FAT_MAGIC) {
fat_header_ = NULL;
- mach_headers_.push_back(MachHeader(base, size));
+ mach_headers_.push_back(FatMachHeader(base, size, NULL));
} else fat: {
size_t fat_narch = Swap(fat_header_->nfat_arch);
fat_arch *fat_arch = reinterpret_cast(fat_header_ + 1);
@@ -500,13 +615,13 @@ class FatHeader :
for (arch = 0; arch != fat_narch; ++arch) {
uint32_t arch_offset = Swap(fat_arch->offset);
uint32_t arch_size = Swap(fat_arch->size);
- mach_headers_.push_back(MachHeader((uint8_t *) base + arch_offset, size));
+ mach_headers_.push_back(FatMachHeader((uint8_t *) base + arch_offset, arch_size, fat_arch));
++fat_arch;
}
}
}
- std::vector &GetMachHeaders() {
+ std::vector &GetMachHeaders() {
return mach_headers_;
}
@@ -517,11 +632,15 @@ class FatHeader :
struct fat_header *operator ->() const {
return fat_header_;
}
+
+ operator struct fat_header *() const {
+ return fat_header_;
+ }
};
-FatHeader Map(const char *path) {
+FatHeader Map(const char *path, bool ro = false) {
size_t size;
- void *base(map(path, 0, _not(size_t), &size, false));
+ void *base(map(path, 0, _not(size_t), &size, ro));
return FatHeader(base, size);
}
@@ -607,14 +726,18 @@ void sha1(uint8_t *hash, uint8_t *data, size_t size) {
}
struct CodesignAllocation {
- uint32_t type_;
- uint16_t subtype_;
- size_t size_;
-
- CodesignAllocation(uint32_t type, uint16_t subtype, size_t size) :
- type_(type),
- subtype_(subtype),
- size_(size)
+ 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)
{
}
};
@@ -640,6 +763,19 @@ int main(int argc, const char *argv[]) {
bool flag_S(false);
bool flag_s(false);
+ bool flag_O(false);
+
+ bool flag_D(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);
@@ -670,6 +806,26 @@ int main(int argc, const char *argv[]) {
case 'u': flag_u = true; break;
case 'p': flag_p = true; break;
case 'e': flag_e = true; break;
+ case 'O': flag_O = true; break;
+
+ case 'D': flag_D = true; break;
+ case 'd': flag_d = true; break;
+
+ case 'a': flag_a = true; break;
+
+ 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;
case 's':
_assert(!flag_S);
@@ -696,6 +852,10 @@ int main(int argc, const char *argv[]) {
}
} break;
+ case 'I': {
+ flag_I = argv[argi] + 2;
+ } break;
+
case 'n': {
char *arge;
noffset = strtoul(argv[argi] + 2, &arge, 0);
@@ -730,55 +890,86 @@ int main(int argc, const char *argv[]) {
base = path;
}
+ const char *name(flag_I ?: base);
+
if (flag_r) {
- size_t clip(_not(size_t)); {
+ 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;
+ }
+
mach_header->flags = mach_header.Swap(mach_header.Swap(mach_header->flags) | MH_DYLDLINK);
- size_t size(_not(size_t)); {
+ 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(load_command);
+ memset(reinterpret_cast(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 -= 1;
- mach_header->sizeofcmds -= 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(load_command);
- size = symtab->stroff + symtab->strsize;
+ size = mach_header.Swap(symtab->stroff) + mach_header.Swap(symtab->strsize);
} break;
}
}
+ }
- _foreach (segment, const_cast(mach_header).GetSegments("__LINKEDIT")) {
- segment->filesize -= mach_header.GetSize() - size;
+ _assert(size != _not(uint32_t));
- if (!fat_header.IsFat())
- clip = size;
- else
- _assert(false);
- }
+ _foreach (segment, mach_header.GetSegments("__LINKEDIT")) {
+ segment->filesize -= mach_header.GetSize() - size;
+
+ 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);
+ }
+
+ _foreach (segment, mach_header.GetSegments64("__LINKEDIT")) {
+ segment->filesize -= mach_header.GetSize() - size;
+
+ 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);
}
}
}
- if (clip != _not(size_t))
+ if (clip != 0)
_syscall(truncate(path, clip));
}
if (flag_S) {
- asprintf(&temp, "%s.%s.cs", dir, base);
- const char *allocate = getenv("CODESIGN_ALLOCATE");
- if (allocate == NULL)
- allocate = "codesign_allocate";
+ FatHeader source(Map(path));
+
+ size_t offset(0);
+
+ if (source.IsFat())
+ offset += sizeof(fat_header) + sizeof(fat_arch) * source.Swap(source->nfat_arch);
std::vector 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 (mach_header.GetCPUSubtype() != flag_CPUSubtype)
+ continue;
+ }
+
mach_header->flags = mach_header.Swap(mach_header.Swap(mach_header->flags) | MH_DYLDLINK);
size_t size(_not(size_t)); {
@@ -796,31 +987,6 @@ int main(int argc, const char *argv[]) {
size = mach_header.GetSize();
}
- allocations.push_back(CodesignAllocation(mach_header.GetCPUType(), mach_header.GetCPUSubtype(), size));
- }
- }
-
- pid_t pid = fork();
- _syscall(pid);
- if (pid == 0) {
- // XXX: this leaks memory, but it doesn't really matter
- std::vector 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);
@@ -828,7 +994,7 @@ int main(int argc, const char *argv[]) {
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);
@@ -841,46 +1007,115 @@ int main(int argc, const char *argv[]) {
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, "%u", 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, base);
+ fclose(fopen(temp, "w+"));
+ _syscall(truncate(temp, offset));
+
+ void *file(map(temp, 0, offset, NULL, false));
+ memset(file, 0, offset);
+
+ fat_arch *fat_arch;
+ if (!source.IsFat())
+ fat_arch = NULL;
+ else {
+ auto *fat_header(reinterpret_cast(file));
+ fat_header->magic = Swap(FAT_MAGIC);
+ fat_header->nfat_arch = Swap(source.Swap(source->nfat_arch));
+ fat_arch = reinterpret_cast(fat_header + 1);
+ }
- args.push_back(NULL);
+ _foreach (allocation, allocations) {
+ auto &source(allocation.mach_header_);
- if (false) {
- printf("run:");
- _foreach (arg, args)
- printf(" %s", arg);
- printf("\n");
+ uint32_t align(allocation.size_);
+ align = Align(align, 0x10);
+
+ if (fat_arch != NULL) {
+ fat_arch->cputype = Swap(source->cputype);
+ fat_arch->cpusubtype = Swap(source->cpusubtype);
+ fat_arch->offset = Swap(allocation.offset_);
+ fat_arch->size = Swap(align + allocation.alloc_);
+ fat_arch->align = Swap(allocation.align_);
+ ++fat_arch;
}
- execvp(allocate, (char **) &args[0]);
- _assert(false);
- }
+ void *target(reinterpret_cast(file) + allocation.offset_);
+ memcpy(target, source, allocation.size_);
+ MachHeader mach_header(target, align + allocation.alloc_);
+
+ 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(load_command);
+ break;
+ }
+
+ if (signature == NULL) {
+ mach_header->ncmds = mach_header.Swap(mach_header.Swap(mach_header->ncmds) + 1);
+ signature = reinterpret_cast(reinterpret_cast(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_);
- int status;
- _syscall(waitpid(pid, &status, 0));
- _assert(WIFEXITED(status));
- _assert(WEXITSTATUS(status) == 0);
+ _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());
- FatHeader fat_header(Map(temp == NULL ? path : temp));
+ 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);
_foreach (mach_header, fat_header.GetMachHeaders()) {
+ 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());
+
+ 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");
+ }
+
if (woffset != _not(uintptr_t)) {
Pointer wvalue(mach_header.GetPointer(woffset));
if (wvalue == NULL)
@@ -892,6 +1127,17 @@ int main(int argc, const char *argv[]) {
if (noffset != _not(uintptr_t))
printf("%s\n", &*mach_header.GetPointer(noffset));
+ 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));
+ }
+
+ if (flag_O) {
+ _foreach(section, mach_header.GetSections("__TEXT", "__text"))
+ section->addr = mach_header.Swap(0);
+ }
+
_foreach (load_command, mach_header.GetLoadCommands()) {
uint32_t cmd(mach_header.Swap(load_command->cmd));
@@ -899,6 +1145,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(load_command);
+ else if (cmd == LC_ENCRYPTION_INFO)
+ encryption = reinterpret_cast(load_command);
else if (cmd == LC_UUID) {
volatile struct uuid_command *uuid_command(reinterpret_cast(load_command));
@@ -931,11 +1179,23 @@ 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_e) {
_assert(signature != NULL);
uint32_t data = mach_header.Swap(signature->dataoff);
- uint32_t size = mach_header.Swap(signature->datasize);
uint8_t *top = reinterpret_cast(mach_header.GetBase());
uint8_t *blob = top + data;
@@ -953,7 +1213,6 @@ int main(int argc, const char *argv[]) {
_assert(signature != NULL);
uint32_t data = mach_header.Swap(signature->dataoff);
- uint32_t size = mach_header.Swap(signature->datasize);
uint8_t *top = reinterpret_cast(mach_header.GetBase());
uint8_t *blob = top + data;
@@ -1007,8 +1266,8 @@ int main(int argc, const char *argv[]) {
directory->spare2 = Swap(uint32_t(0));
directory->identOffset = Swap(offset - begin);
- strcpy(reinterpret_cast(blob + offset), base);
- offset += strlen(base) + 1;
+ strcpy(reinterpret_cast(blob + offset), name);
+ offset += strlen(name) + 1;
uint32_t special = xmld == NULL ? CSSLOT_REQUIREMENTS : CSSLOT_ENTITLEMENTS;
directory->nSpecialSlots = Swap(special);