X-Git-Url: https://git.cameronkatri.com/ldid.git/blobdiff_plain/8c4178429447dc130c0f1310514fa5643d08d79c..8f310b9112e5776ea16e795cb18bc8e02c9a96f7:/ldid.cpp diff --git a/ldid.cpp b/ldid.cpp index 38cc489..e0e38d1 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -1,37 +1,93 @@ /* ldid - (Mach-O) Link-Loader Identity Editor - * Copyright (C) 2007-2012 Jay Freeman (saurik) + * Copyright (C) 2007-2015 Jay Freeman (saurik) */ -/* GNU Lesser General Public License, Version 3 {{{ */ -/* This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by +/* GNU Affero General Public License, Version 3 {{{ */ +/* + * 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License + * 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" - -#include "sha1.h" - +#include +#include #include +#include +#include +#include #include #include -#include -#include +#include +#include +#include +#include +#include + +#include #include +#include + +#include + +#define _assert___(line) \ + #line +#define _assert__(line) \ + _assert___(line) +#define _assert_(e) \ + throw __FILE__ "(" _assert__(__LINE__) "): _assert(" e ")" + +#define _assert(expr) \ + do if (!(expr)) { \ + fprintf(stderr, "%s(%u): _assert(%s); errno=%u\n", __FILE__, __LINE__, #expr, errno); \ + _assert_(#expr); \ + } while (false) + +#define _syscall(expr) ({ \ + __typeof__(expr) _value; \ + do if ((long) (_value = (expr)) != -1) \ + break; \ + else switch (errno) { \ + case EINTR: \ + continue; \ + default: \ + _assert(false); \ + } while (true); \ + _value; \ +}) + +#define _trace() \ + fprintf(stderr, "_trace(%s:%u): %s\n", __FILE__, __LINE__, __FUNCTION__) + +#define _not(type) \ + ((type) ~ (type) 0) + +#define _packed \ + __attribute__((packed)) + +template +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) + struct fat_header { uint32_t magic; uint32_t nfat_arch; @@ -66,6 +122,7 @@ struct mach_header { #define MH_DYLDLINK 0x4 +#define MH_OBJECT 0x1 #define MH_EXECUTE 0x2 #define MH_DYLIB 0x6 #define MH_BUNDLE 0x8 @@ -91,6 +148,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_64 uint32_t(0x2c) struct dylib { uint32_t name; @@ -276,6 +334,44 @@ struct encryption_info_command { 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 + +inline void get(std::streambuf &stream, void *data, size_t size) { + _assert(stream.sgetn(static_cast(data), size) == size); +} + +inline void put(std::streambuf &stream, const void *data, size_t size) { + _assert(stream.sputn(static_cast(data), size) == size); +} + +inline void pad(std::streambuf &stream, size_t size) { + char padding[size]; + memset(padding, 0, size); + put(stream, padding, size); +} + +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) | @@ -290,6 +386,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)); } @@ -298,6 +401,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) { @@ -308,6 +415,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)); } @@ -316,39 +427,46 @@ 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; -class Data { - private: - void *base_; - size_t size_; - +class Swapped { protected: bool swapped_; - public: - Data(void *base, size_t size) : - base_(base), - size_(size), + Swapped() : swapped_(false) { } - uint16_t Swap(uint16_t value) const { - return swapped_ ? Swap_(value) : value; + public: + Swapped(bool swapped) : + swapped_(swapped) + { } - uint32_t Swap(uint32_t value) const { + template + Type_ Swap(Type_ value) const { return swapped_ ? Swap_(value) : value; } +}; - int16_t Swap(int16_t value) const { - return Swap(static_cast(value)); - } +class Data : + public Swapped +{ + private: + void *base_; + size_t size_; - int32_t Swap(int32_t value) const { - return Swap(static_cast(value)); + public: + Data(void *base, size_t size) : + base_(base), + size_(size) + { } void *GetBase() const { @@ -404,18 +522,30 @@ class MachHeader : ); } + bool Bits64() const { + return bits64_; + } + struct mach_header *operator ->() const { 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; @@ -442,7 +572,7 @@ class MachHeader : return segment_commands; } - std::vector GetSegments64(const char *segment_name) { + std::vector GetSegments64(const char *segment_name) const { std::vector segment_commands; _foreach (load_command, GetLoadCommands()) { @@ -571,13 +701,11 @@ class FatHeader : 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 class Pointer { @@ -611,13 +739,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_SIGNATURESLOT uint32_t(0x10000) -#define CSSLOT_CODEDIRECTORY uint32_t(0) -#define CSSLOT_REQUIREMENTS uint32_t(2) -#define CSSLOT_ENTITLEMENTS uint32_t(5) +#define CS_HASHTYPE_SHA1 1 struct BlobIndex { uint32_t type; @@ -636,7 +776,6 @@ struct SuperBlob { } _packed; struct CodeDirectory { - struct Blob blob; uint32_t version; uint32_t flags; uint32_t hashOffset; @@ -653,27 +792,485 @@ 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) { - SHA1Context context; - SHA1Reset(&context); - SHA1Input(&context, data, size); - SHA1Result(&context, hash); +void sha1(uint8_t *hash, const void *data, size_t size) { + SHA1(static_cast(data), size, hash); } struct CodesignAllocation { - uint32_t type_; - uint16_t subtype_; + FatMachHeader mach_header_; + uint32_t offset_; + uint32_t size_; + uint32_t limit_; + uint32_t alloc_; + uint32_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), + limit_(limit), + 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, int flags) { + _assert(file_ == -1); + _syscall(file_ = ::open(path, flags)); + } + + int file() const { + return file_; + } +}; + +class Map { + private: + File file_; + void *data_; 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, int oflag, int pflag, int mflag) : + Map() + { + open(path, oflag, pflag, mflag); + } + + Map(const char *path, bool edit) : + Map() + { + open(path, edit); + } + + ~Map() { + clear(); + } + + void open(const char *path, int oflag, int pflag, int mflag) { + clear(); + + file_.open(path, oflag); + int file(file_.file()); + + struct stat stat; + _syscall(fstat(file, &stat)); + size_ = stat.st_size; + + _syscall(data_ = mmap(NULL, size_, pflag, mflag, file, 0)); + } + + void open(const char *path, bool edit) { + if (edit) + open(path, O_RDWR, PROT_READ | PROT_WRITE, MAP_SHARED); + else + open(path, O_RDONLY, PROT_READ, MAP_PRIVATE); + } + + void *data() const { + return data_; + } + + size_t size() const { + return size_; + } + + operator std::string() const { + return std::string(static_cast(data_), size_); + } +}; + +// I wish Apple cared about providing quality toolchains :/ + +template +class Functor; + +template +class Functor { + public: + virtual Type_ operator ()(Args_... args) const = 0; +}; + +template +class FunctorImpl; + +template +class FunctorImpl : + public Functor +{ + private: + const Value_ *value_; + + public: + FunctorImpl() : + value_(NULL) { } + + FunctorImpl(const Value_ &value) : + value_(&value) + { + } + + virtual Type_ operator ()(Args_... args) const { + return (*value_)(args...); + } }; -int main(int argc, const char *argv[]) { +template +FunctorImpl fun(const Function_ &value) { + return value; +} + +void resign(void *idata, size_t isize, std::streambuf &output, const Functor &allocate, const Functor &save) { + FatHeader source(idata, isize); + + size_t offset(0); + if (source.IsFat()) + offset += sizeof(fat_header) + sizeof(fat_arch) * source.Swap(source->nfat_arch); + + std::vector allocations; + _foreach (mach_header, source.GetMachHeaders()) { + struct linkedit_data_command *signature(NULL); + struct symtab_command *symtab(NULL); + + _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(load_command); + else if (cmd == LC_SYMTAB) + symtab = reinterpret_cast(load_command); + } + + size_t size; + if (signature == NULL) + size = mach_header.GetSize(); + else { + size = mach_header.Swap(signature->dataoff); + _assert(size <= mach_header.GetSize()); + } + + if (symtab != NULL) { + auto end(mach_header.Swap(symtab->stroff) + mach_header.Swap(symtab->strsize)); + _assert(end <= size); + _assert(end >= size - 0x10); + size = end; + } + + size_t alloc(allocate(size)); + + auto *fat_arch(mach_header.GetFatArch()); + uint32_t align(fat_arch == NULL ? 0 : source.Swap(fat_arch->align)); + offset = Align(offset, 1 << align); + + uint32_t limit(size); + if (alloc != 0) + limit = Align(limit, 0x10); + + allocations.push_back(CodesignAllocation(mach_header, offset, size, limit, alloc, align)); + offset += size + alloc; + offset = Align(offset, 16); + } + + size_t position(0); + + if (source.IsFat()) { + fat_header fat_header; + fat_header.magic = Swap(FAT_MAGIC); + fat_header.nfat_arch = Swap(uint32_t(allocations.size())); + put(output, &fat_header, sizeof(fat_header)); + position += sizeof(fat_header); + + _foreach (allocation, allocations) { + auto &mach_header(allocation.mach_header_); + + fat_arch fat_arch; + fat_arch.cputype = Swap(mach_header->cputype); + fat_arch.cpusubtype = Swap(mach_header->cpusubtype); + fat_arch.offset = Swap(allocation.offset_); + fat_arch.size = Swap(allocation.limit_ + allocation.alloc_); + fat_arch.align = Swap(allocation.align_); + put(output, &fat_arch, sizeof(fat_arch)); + position += sizeof(fat_arch); + } + } + + _foreach (allocation, allocations) { + auto &mach_header(allocation.mach_header_); + + pad(output, allocation.offset_ - position); + position = allocation.offset_; + + std::vector commands; + + _foreach (load_command, mach_header.GetLoadCommands()) { + std::string copy(reinterpret_cast(load_command), load_command->cmdsize); + + switch (mach_header.Swap(load_command->cmd)) { + case LC_CODE_SIGNATURE: + continue; + break; + + case LC_SEGMENT: { + auto segment_command(reinterpret_cast(©[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, 0x1000); + } break; + + case LC_SEGMENT_64: { + auto segment_command(reinterpret_cast(©[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, 0x1000); + } break; + } + + commands.push_back(copy); + } + + 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(&signature), sizeof(signature))); + } + + size_t begin(position); + + uint32_t after(0); + _foreach(command, commands) + after += command.size(); + + std::stringbuf altern; + + struct mach_header header(*mach_header); + header.ncmds = mach_header.Swap(uint32_t(commands.size())); + header.sizeofcmds = mach_header.Swap(after); + put(output, &header, sizeof(header)); + put(altern, &header, sizeof(header)); + position += sizeof(header); + + if (mach_header.Bits64()) { + auto pad(mach_header.Swap(uint32_t(0))); + put(output, &pad, sizeof(pad)); + put(altern, &pad, sizeof(pad)); + position += sizeof(pad); + } + + _foreach(command, commands) { + put(output, command.data(), command.size()); + put(altern, command.data(), command.size()); + position += command.size(); + } + + uint32_t before(mach_header.Swap(mach_header->sizeofcmds)); + if (before > after) { + pad(output, before - after); + pad(altern, before - after); + position += before - after; + } + + auto top(reinterpret_cast(mach_header.GetBase())); + + std::string overlap(altern.str()); + overlap.append(top + overlap.size(), Align(overlap.size(), 0x1000) - overlap.size()); + + put(output, top + (position - begin), allocation.size_ - (position - begin)); + position = begin + allocation.size_; + + pad(output, allocation.limit_ - allocation.size_); + position += allocation.limit_ - allocation.size_; + + size_t saved(save(output, allocation.limit_, overlap, top)); + if (allocation.alloc_ > saved) + pad(output, allocation.alloc_ - saved); + position += allocation.alloc_; + } +} + +typedef std::map Blobs; + +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(&blob), sizeof(blob)); + std::swap(blobs[slot], value); +} + +static size_t put(std::streambuf &output, uint32_t magic, const Blobs &blobs) { + size_t total(0); + _foreach (blob, blobs) + total += blob.second.size(); + + struct SuperBlob super; + super.blob.magic = Swap(magic); + super.blob.length = Swap(uint32_t(sizeof(SuperBlob) + blobs.size() * sizeof(BlobIndex) + total)); + super.count = Swap(uint32_t(blobs.size())); + put(output, &super, sizeof(super)); + + size_t offset(sizeof(SuperBlob) + sizeof(BlobIndex) * blobs.size()); + + _foreach (blob, blobs) { + BlobIndex index; + index.type = Swap(blob.first); + index.offset = Swap(uint32_t(offset)); + put(output, &index, sizeof(index)); + offset += blob.second.size(); + } + + _foreach (blob, blobs) + put(output, blob.second.data(), blob.second.size()); + + return offset; +} + +void resign(void *idata, size_t isize, std::streambuf &output, const std::string &name, const std::string &entitlements) { + uint8_t pageshift(0x0c); + uint32_t pagesize(1 << pageshift); + + resign(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.size() != 0) { + 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 += name.size() + 1; + + 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; + + uint32_t requirements; + requirements = Swap(0); + put(data, &requirements, sizeof(requirements)); + + insert(blobs, CSSLOT_REQUIREMENTS, CSMAGIC_REQUIREMENTS, data); + } + + if (entitlements.size() != 0) { + 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); + 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) + name.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, name.c_str(), name.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(&blob.second[0])); + sha1((uint8_t *) (hashes - blob.first), local, Swap(local->length)); + } + + 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); + } + + return put(output, CSMAGIC_EMBEDDED_SIGNATURE, blobs); + })); +} + +void resign(void *idata, size_t isize, std::streambuf &output) { + resign(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; + })); +} + +int main(int argc, char *argv[]) { union { uint16_t word; uint8_t byte[2]; @@ -681,12 +1278,7 @@ int main(int argc, const char *argv[]) { little_ = endian.byte[0]; - bool flag_R(false); bool flag_r(false); - - bool flag_t(false); - bool flag_p(false); - bool flag_u(false); bool flag_e(false); bool flag_T(false); @@ -694,10 +1286,7 @@ 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); @@ -705,14 +1294,12 @@ int main(int argc, const char *argv[]) { 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); - const void *xmld(NULL); - size_t xmls(0); - - uintptr_t noffset(_not(uintptr_t)); - uintptr_t woffset(_not(uintptr_t)); + Map entitlements; std::vector files; @@ -728,17 +1315,10 @@ int main(int argc, const char *argv[]) { 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; case 'D': flag_D = true; break; - case 'd': flag_d = true; break; case 'a': flag_a = true; break; @@ -766,7 +1346,7 @@ int main(int argc, const char *argv[]) { flag_S = true; if (argv[argi][2] != '\0') { const char *xml = argv[argi] + 2; - xmld = map(xml, 0, _not(size_t), &xmls, true); + entitlements.open(xml, O_RDONLY, PROT_READ, MAP_PRIVATE); } break; @@ -781,16 +1361,8 @@ int main(int argc, const char *argv[]) { } } break; - case 'n': { - char *arge; - noffset = strtoul(argv[argi] + 2, &arge, 0); - _assert(arge == argv[argi] + strlen(argv[argi])); - } break; - - case 'w': { - char *arge; - woffset = strtoul(argv[argi] + 2, &arge, 0); - _assert(arge == argv[argi] + strlen(argv[argi])); + case 'I': { + flag_I = argv[argi] + 2; } break; default: @@ -798,6 +1370,8 @@ int main(int argc, const char *argv[]) { break; } + _assert(!flag_S || !flag_r); + if (files.empty()) usage: { exit(0); } @@ -806,180 +1380,37 @@ int main(int argc, const char *argv[]) { _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) - dir = strndup_(path, base++ - path + 1); - else { - dir = strdup(""); + dir.assign(path, base++ - path + 1); + else base = path; - } - - if (flag_r) { - uint32_t clip(0); { - FatHeader fat_header(Map(path)); - _foreach (mach_header, fat_header.GetMachHeaders()) { - 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(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 = 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 = mach_header.Swap(symtab->stroff) + mach_header.Swap(symtab->strsize); - } break; - } - } - } - _assert(size != _not(uint32_t)); + const char *name(flag_I ?: base); + std::string temp; - _foreach (segment, const_cast(mach_header).GetSegments("__LINKEDIT")) { - segment->filesize -= mach_header.GetSize() - size; + if (flag_S || flag_r) { + Map input(path, O_RDONLY, PROT_READ, MAP_PRIVATE); - 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, const_cast(mach_header).GetSegments64("__LINKEDIT")) { - segment->filesize -= mach_header.GetSize() - size; + temp = dir + "." + base + ".cs"; + std::filebuf output; + _assert(output.open(temp.c_str(), std::ios::out | std::ios::trunc | std::ios::binary) == &output); - 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 (flag_r) + resign(input.data(), input.size(), output); + else { + resign(input.data(), input.size(), output, name, entitlements); } - - _assert(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"; - - std::vector allocations; { - FatHeader fat_header(Map(path)); - _foreach (mach_header, fat_header.GetMachHeaders()) { - 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(load_command); - size = mach_header.Swap(signature->dataoff); - _assert(size < mach_header.GetSize()); - break; - } - } - - if (size == _not(size_t)) - 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); - - special = std::max(special, CSSLOT_CODEDIRECTORY); - alloc += sizeof(struct BlobIndex); - alloc += sizeof(struct CodeDirectory); - alloc += strlen(base) + 1; - - special = std::max(special, CSSLOT_REQUIREMENTS); - alloc += sizeof(struct BlobIndex); - alloc += 0xc; - - if (xmld != NULL) { - special = std::max(special, CSSLOT_ENTITLEMENTS); - alloc += sizeof(struct BlobIndex); - alloc += sizeof(struct Blob); - alloc += xmls; - } - - size_t normal((allocation.size_ + 0x1000 - 1) / 0x1000); - alloc += (special + normal) * 0x14; - - alloc += 15; - alloc /= 16; - alloc *= 16; - - asprintf(&arg, "%zu", alloc); - args.push_back(arg); - } - - args.push_back("-o"); - args.push_back(temp); - - args.push_back(NULL); - - if (false) { - printf("run:"); - _foreach (arg, args) - printf(" %s", arg); - printf("\n"); - } - - execvp(allocate, (char **) &args[0]); - _assert(false); - } - - int status; - _syscall(waitpid(pid, &status, 0)); - _assert(WIFEXITED(status)); - _assert(WEXITSTATUS(status) == 0); - } - - 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.empty() ? temp.c_str() : 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; @@ -990,59 +1421,17 @@ int main(int argc, const char *argv[]) { 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) - printf("(null) %p\n", reinterpret_cast(woffset)); - else - printf("0x%.08x\n", *wvalue); - } - - 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)); - if (flag_R && cmd == LC_REEXPORT_DYLIB) - load_command->cmd = mach_header.Swap(LC_LOAD_DYLIB); + if (false); else if (cmd == LC_CODE_SIGNATURE) signature = reinterpret_cast(load_command); - else if (cmd == LC_UUID) { - volatile struct uuid_command *uuid_command(reinterpret_cast(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_ENCRYPTION_INFO || cmd == LC_ENCRYPTION_INFO_64) + encryption = reinterpret_cast(load_command); + else if (cmd == LC_ID_DYLIB) { volatile struct dylib_command *dylib_command(reinterpret_cast(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; @@ -1055,19 +1444,14 @@ int main(int argc, const char *argv[]) { dylib_command->dylib.timestamp = mach_header.Swap(timed); } - } else if (cmd == LC_ENCRYPTION_INFO) { - volatile struct encryption_info_command *encryption_info_command(reinterpret_cast(load_command)); - - if (flag_D) - encryption_info_command->cryptid = mach_header.Swap(0); - - 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)); - } } } + if (flag_D) { + _assert(encryption != NULL); + encryption->cryptid = mach_header.Swap(0); + } + if (flag_e) { _assert(signature != NULL); @@ -1099,7 +1483,7 @@ int main(int argc, const char *argv[]) { uint32_t begin = Swap(super->index[index].offset); struct CodeDirectory *directory = reinterpret_cast(blob + begin); - uint8_t (*hashes)[20] = reinterpret_cast(blob + begin + Swap(directory->hashOffset)); + uint8_t (*hashes)[SHA_DIGEST_LENGTH] = reinterpret_cast(blob + begin + Swap(directory->hashOffset)); uint32_t pages = Swap(directory->nCodeSlots); if (pages != 1) @@ -1109,133 +1493,19 @@ int main(int argc, const char *argv[]) { 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(mach_header.GetBase()); - uint8_t *blob = top + data; - struct SuperBlob *super = reinterpret_cast(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(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(blob + offset), base); - offset += strlen(base) + 1; - - uint32_t special = xmld == NULL ? CSSLOT_REQUIREMENTS : CSSLOT_ENTITLEMENTS; - directory->nSpecialSlots = Swap(special); - - uint8_t (*hashes)[20] = reinterpret_cast(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(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)); - } - } - - 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(fat_header.GetBase()); - size_t size = fat_header.GetSize(); - - char *copy; - asprintf(©, "%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) { + if (!temp.empty()) { struct stat info; _syscall(stat(path, &info)); - _syscall(chown(temp, info.st_uid, info.st_gid)); - _syscall(chmod(temp, info.st_mode)); +#ifndef __WIN32__ + _syscall(chown(temp.c_str(), info.st_uid, info.st_gid)); +#endif + _syscall(chmod(temp.c_str(), info.st_mode)); _syscall(unlink(path)); - _syscall(rename(temp, path)); - free(temp); + _syscall(rename(temp.c_str(), path)); } - free(dir); ++filei; } catch (const char *) { ++filee;