X-Git-Url: https://git.saurik.com/ldid.git/blobdiff_plain/d73a3d58d0aefb576efc29af4d4eb3c13c3b0503..f9cd1d1c8805aced89d06f3c0a3cd3ce58e5b2f7:/ldid.cpp diff --git a/ldid.cpp b/ldid.cpp index 461433f..ce9dec1 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -425,6 +425,7 @@ struct section_64 { uint32_t flags; uint32_t reserved1; uint32_t reserved2; + uint32_t reserved3; } _packed; struct linkedit_data_command { @@ -458,15 +459,30 @@ struct encryption_info_command { #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); +static std::streamsize read(std::streambuf &stream, void *data, size_t size) { + auto writ(stream.sgetn(static_cast(data), size)); + _assert(writ >= 0); + return writ; } -inline void put(std::streambuf &stream, const void *data, size_t size) { +static inline void get(std::streambuf &stream, void *data, size_t size) { + _assert(read(stream, data, size) == size); +} + +static inline void put(std::streambuf &stream, const void *data, size_t size) { _assert(stream.sputn(static_cast(data), size) == size); } -inline void pad(std::streambuf &stream, size_t size) { +static size_t most(std::streambuf &stream, void *data, size_t size) { + size_t total(size); + while (size > 0) + if (auto writ = read(stream, data, size)) + size -= writ; + else break; + return total - size; +} + +static inline void pad(std::streambuf &stream, size_t size) { char padding[size]; memset(padding, 0, size); put(stream, padding, size); @@ -542,9 +558,6 @@ static inline int64_t Swap(int64_t value) { return Swap(static_cast(value)); } -template -class Pointer; - class Swapped { protected: bool swapped_; @@ -669,85 +682,30 @@ class MachHeader : return load_commands; } - std::vector GetSegments(const char *segment_name) const { - std::vector segment_commands; - - _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 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)) { - section *section = (struct section *) (segment + 1); - - uint32_t sect; - for (sect = 0; sect != Swap(segment->nsects); ++sect) { - if (strncmp(section->sectname, section_name, 16) == 0) - sections.push_back(section); - ++section; - } - } - - return sections; - } + void ForSection(const ldid::Functor &code) const { + _foreach (load_command, GetLoadCommands()) + switch (Swap(load_command->cmd)) { + case LC_SEGMENT: { + auto segment(reinterpret_cast(load_command)); + code(segment->segname, NULL, GetOffset(segment->fileoff), segment->filesize); + auto section(reinterpret_cast(segment + 1)); + for (uint32_t i(0), e(Swap(segment->nsects)); i != e; ++i, ++section) + code(segment->segname, section->sectname, GetOffset(segment->fileoff + section->offset), section->size); + } break; - template - Pointer GetPointer(uint32_t address, const char *segment_name = NULL) const { - load_command *load_command = (struct load_command *) (mach_header_ + 1); - uint32_t cmd; - - for (cmd = 0; cmd != Swap(mach_header_->ncmds); ++cmd) { - if (Swap(load_command->cmd) == LC_SEGMENT) { - segment_command *segment_command = (struct segment_command *) load_command; - if (segment_name != NULL && strncmp(segment_command->segname, segment_name, 16) != 0) - goto next_command; - - section *sections = (struct section *) (segment_command + 1); - - uint32_t sect; - for (sect = 0; sect != Swap(segment_command->nsects); ++sect) { - section *section = §ions[sect]; - //printf("%s %u %p %p %u\n", segment_command->segname, sect, address, section->addr, section->size); - if (address >= Swap(section->addr) && address < Swap(section->addr) + Swap(section->size)) { - //printf("0x%.8x %s\n", address, segment_command->segname); - return Pointer(this, reinterpret_cast(address - Swap(section->addr) + Swap(section->offset) + (char *) mach_header_)); - } - } + case LC_SEGMENT_64: { + auto segment(reinterpret_cast(load_command)); + code(segment->segname, NULL, GetOffset(segment->fileoff), segment->filesize); + auto section(reinterpret_cast(segment + 1)); + for (uint32_t i(0), e(Swap(segment->nsects)); i != e; ++i, ++section) + code(segment->segname, section->sectname, GetOffset(segment->fileoff + section->offset), section->size); + } break; } - - next_command: - load_command = (struct load_command *) ((char *) load_command + Swap(load_command->cmdsize)); - } - - return Pointer(this); } template - Pointer GetOffset(uint32_t offset) { - return Pointer(this, reinterpret_cast(offset + (uint8_t *) mach_header_)); + Target_ *GetOffset(uint32_t offset) const { + return reinterpret_cast(offset + (uint8_t *) mach_header_); } }; @@ -818,38 +776,6 @@ class FatHeader : } }; -template -class Pointer { - private: - const MachHeader *framework_; - const Target_ *pointer_; - - public: - Pointer(const MachHeader *framework = NULL, const Target_ *pointer = NULL) : - framework_(framework), - pointer_(pointer) - { - } - - operator const Target_ *() const { - return pointer_; - } - - const Target_ *operator ->() const { - return pointer_; - } - - Pointer &operator ++() { - ++pointer_; - return *this; - } - - template - Value_ Swap(Value_ value) { - return framework_->Swap(value); - } -}; - #define CSMAGIC_REQUIREMENT uint32_t(0xfade0c00) #define CSMAGIC_REQUIREMENTS uint32_t(0xfade0c01) #define CSMAGIC_CODEDIRECTORY uint32_t(0xfade0c02) @@ -899,6 +825,10 @@ struct CodeDirectory { uint8_t spare1; uint8_t pageSize; uint32_t spare2; + uint32_t scatterOffset; + uint32_t teamIDOffset; + uint32_t spare3; + uint64_t codeLimit64; } _packed; #ifndef LDID_NOFLAGT @@ -909,6 +839,11 @@ static void sha1(uint8_t *hash, const void *data, size_t size) { LDID_SHA1(static_cast(data), size, hash); } +static void sha1(std::vector &hash, const void *data, size_t size) { + hash.resize(LDID_SHA1_DIGEST_LENGTH); + sha1(reinterpret_cast(hash.data()), data, size); +} + struct CodesignAllocation { FatMachHeader mach_header_; uint32_t offset_; @@ -1031,7 +966,7 @@ class Map { namespace ldid { -static void Allocate(const void *idata, size_t isize, std::streambuf &output, const Functor &allocate, const Functor &save) { +static void Allocate(const void *idata, size_t isize, std::streambuf &output, const Functor &allocate, const Functor &save) { FatHeader source(const_cast(idata), isize); size_t offset(0); @@ -1067,7 +1002,7 @@ static void Allocate(const void *idata, size_t isize, std::streambuf &output, co size = end; } - size_t alloc(allocate(size)); + size_t alloc(allocate(mach_header, size)); auto *fat_arch(mach_header.GetFatArch()); uint32_t align; @@ -1217,7 +1152,7 @@ static void Allocate(const void *idata, size_t isize, std::streambuf &output, co pad(output, allocation.limit_ - allocation.size_); position += allocation.limit_ - allocation.size_; - size_t saved(save(output, allocation.limit_, overlap, top)); + size_t saved(save(mach_header, output, allocation.limit_, overlap, top)); if (allocation.alloc_ > saved) pad(output, allocation.alloc_ - saved); position += allocation.alloc_; @@ -1510,7 +1445,27 @@ static void Commit(const std::string &path, const std::string &temp) { 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 { + std::string team; + +#ifndef LDID_NOSMIME + if (!key.empty()) { + std::stringbuf data; + Stuff stuff(key); + auto name(X509_get_subject_name(stuff)); + _assert(name != NULL); + auto index(X509_NAME_get_index_by_NID(name, NID_organizationalUnitName, -1)); + _assert(index >= 0); + auto next(X509_NAME_get_index_by_NID(name, NID_organizationalUnitName, index)); + _assert(next == -1); + auto entry(X509_NAME_get_entry(name, index)); + _assert(entry != NULL); + auto asn(X509_NAME_ENTRY_get_data(entry)); + _assert(asn != NULL); + team.assign(reinterpret_cast(ASN1_STRING_data(asn)), ASN1_STRING_length(asn)); + } +#endif + + Allocate(idata, isize, output, fun([&](const MachHeader &mach_header, size_t size) -> size_t { size_t alloc(sizeof(struct SuperBlob)); uint32_t special(0); @@ -1532,6 +1487,9 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st alloc += sizeof(struct CodeDirectory); alloc += identifier.size() + 1; + if (!team.empty()) + alloc += team.size() + 1; + if (!key.empty()) { alloc += sizeof(struct BlobIndex); alloc += sizeof(struct Blob); @@ -1542,10 +1500,15 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st _foreach (slot, slots) special = std::max(special, slot.first); + mach_header.ForSection(fun([&](const char *segment, const char *section, void *data, size_t size) { + if (strcmp(segment, "__TEXT") == 0 && section != NULL && strcmp(section, "__info_plist") == 0) + special = std::max(special, CSSLOT_INFOSLOT); + })); + uint32_t normal((size + PageSize_ - 1) / PageSize_); alloc = Align(alloc + (special + normal) * LDID_SHA1_DIGEST_LENGTH, 16); return alloc; - }), fun([&](std::streambuf &output, size_t limit, const std::string &overlap, const char *top) -> size_t { + }), fun([&](const MachHeader &mach_header, std::streambuf &output, size_t limit, const std::string &overlap, const char *top) -> size_t { Blobs blobs; if (true) { @@ -1566,18 +1529,23 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st if (true) { std::stringbuf data; + Slots posts(slots); + + mach_header.ForSection(fun([&](const char *segment, const char *section, void *data, size_t size) { + if (strcmp(segment, "__TEXT") == 0 && section != NULL && strcmp(section, "__info_plist") == 0) + sha1(posts[CSSLOT_INFOSLOT], data, size); + })); + uint32_t special(0); _foreach (blob, blobs) special = std::max(special, blob.first); - _foreach (slot, slots) + _foreach (slot, posts) special = std::max(special, slot.first); uint32_t normal((limit + PageSize_ - 1) / PageSize_); CodeDirectory directory; - directory.version = Swap(uint32_t(0x00020001)); + directory.version = Swap(uint32_t(0x00020200)); directory.flags = Swap(uint32_t(0)); - directory.hashOffset = Swap(uint32_t(sizeof(Blob) + sizeof(CodeDirectory) + identifier.size() + 1 + LDID_SHA1_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); @@ -1586,9 +1554,30 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st directory.spare1 = 0x00; directory.pageSize = PageShift_; directory.spare2 = Swap(uint32_t(0)); + directory.scatterOffset = Swap(uint32_t(0)); + directory.spare3 = Swap(uint32_t(0)); + directory.codeLimit64 = Swap(uint64_t(0)); + + uint32_t offset(sizeof(Blob) + sizeof(CodeDirectory)); + + directory.identOffset = Swap(uint32_t(offset)); + offset += identifier.size() + 1; + + if (team.empty()) + directory.teamIDOffset = Swap(uint32_t(0)); + else { + directory.teamIDOffset = Swap(uint32_t(offset)); + offset += team.size() + 1; + } + + offset += LDID_SHA1_DIGEST_LENGTH * special; + directory.hashOffset = Swap(uint32_t(offset)); + offset += LDID_SHA1_DIGEST_LENGTH * normal; + put(data, &directory, sizeof(directory)); put(data, identifier.c_str(), identifier.size() + 1); + put(data, team.c_str(), team.size() + 1); uint8_t storage[special + normal][LDID_SHA1_DIGEST_LENGTH]; uint8_t (*hashes)[LDID_SHA1_DIGEST_LENGTH] = storage + special; @@ -1600,7 +1589,7 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st sha1((uint8_t *) (hashes - blob.first), local, Swap(local->length)); } - _foreach (slot, slots) { + _foreach (slot, posts) { _assert(sizeof(*hashes) == slot.second.size()); memcpy(hashes - slot.first, slot.second.data(), slot.second.size()); } @@ -1639,9 +1628,9 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st #ifndef LDID_NOTOOLS static void Unsign(void *idata, size_t isize, std::streambuf &output) { - Allocate(idata, isize, output, fun([](size_t size) -> size_t { + Allocate(idata, isize, output, fun([](const MachHeader &mach_header, size_t size) -> size_t { return 0; - }), fun([](std::streambuf &output, size_t limit, const std::string &overlap, const char *top) -> size_t { + }), fun([](const MachHeader &mach_header, std::streambuf &output, size_t limit, const std::string &overlap, const char *top) -> size_t { return 0; })); } @@ -1705,7 +1694,7 @@ void DiskFolder::Find(const std::string &root, const std::string &base, const Fu else code(base + name, fun([&](const Functor &code) { std::string access(root + base + name); - _assert_(Open(access, fun([&](std::streambuf &data) { + _assert_(Open(access, fun([&](std::streambuf &data, const void *flag) { NullBuffer save; code(data, save); })), "open(): %s", access.c_str()); @@ -1713,20 +1702,20 @@ void DiskFolder::Find(const std::string &root, const std::string &base, const Fu } } -void DiskFolder::Save(const std::string &path, const Functor &code) { +void DiskFolder::Save(const std::string &path, const void *flag, const Functor &code) { std::filebuf save; auto from(Path(path)); commit_[from] = Temporary(save, from); code(save); } -bool DiskFolder::Open(const std::string &path, const Functor &code) { +bool DiskFolder::Open(const std::string &path, const Functor &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); + code(data, NULL); return true; } @@ -1741,11 +1730,11 @@ SubFolder::SubFolder(Folder &parent, const std::string &path) : { } -void SubFolder::Save(const std::string &path, const Functor &code) { - return parent_.Save(path_ + path, code); +void SubFolder::Save(const std::string &path, const void *flag, const Functor &code) { + return parent_.Save(path_ + path, flag, code); } -bool SubFolder::Open(const std::string &path, const Functor &code) { +bool SubFolder::Open(const std::string &path, const Functor &code) { return parent_.Open(path_ + path, code); } @@ -1753,37 +1742,62 @@ void SubFolder::Find(const std::string &path, const Functorsecond; +} + +void UnionFolder::Map(const std::string &path, const Functor &)> &)> &code, const std::string &file, const Functor &)> &save) { + if (file.size() >= path.size() && file.substr(0, path.size()) == path) + code(file.substr(path.size()), fun([&](const Functor &code) { + save(fun([&](std::streambuf &data, const void *flag) { + parent_.Save(file, flag, fun([&](std::streambuf &save) { + code(data, save); + })); + })); + })); +} + UnionFolder::UnionFolder(Folder &parent) : parent_(parent) { } -void UnionFolder::Save(const std::string &path, const Functor &code) { - return parent_.Save(path, code); +void UnionFolder::Save(const std::string &path, const void *flag, const Functor &code) { + return parent_.Save(Map(path), flag, code); } -bool UnionFolder::Open(const std::string &path, const Functor &code) { - auto file(files_.find(path)); - if (file == files_.end()) - return parent_.Open(path, code); +bool UnionFolder::Open(const std::string &path, const Functor &code) { + auto file(resets_.find(path)); + if (file == resets_.end()) + return parent_.Open(Map(path), code); + auto &entry(file->second); - auto &data(file->second); + auto &data(entry.first); data.pubseekpos(0, std::ios::in); - code(data); + code(data, entry.second); return true; } void UnionFolder::Find(const std::string &path, const Functor &)> &)> &code) { parent_.Find(path, fun([&](const std::string &name, const Functor &)> &save) { - if (files_.find(name) == files_.end()) + if (deletes_.find(path + name) == deletes_.end()) code(name, save); })); - for (auto &file : files_) - code(file.first, fun([&](const Functor &code) { - parent_.Save(file.first, fun([&](std::streambuf &save) { - file.second.pubseekpos(0, std::ios::in); - code(file.second, save); + for (auto &reset : resets_) + Map(path, code, reset.first, fun([&](const Functor &code) { + auto &entry(reset.second); + entry.first.pubseekpos(0, std::ios::in); + code(entry.first, entry.second); + })); + + for (auto &remap : remaps_) + Map(path, code, remap.first, fun([&](const Functor &code) { + parent_.Open(remap.second, fun([&](std::streambuf &data, const void *flag) { + code(data, flag); })); })); } @@ -1908,27 +1922,39 @@ struct RuleCode { }; #ifndef LDID_NOPLIST +static void Sign(const uint8_t *prefix, size_t size, std::streambuf &buffer, std::vector &hash, std::streambuf &save, const std::string &identifier, const std::string &entitlements, const std::string &key, const Slots &slots) { + // XXX: this is a miserable fail + std::stringbuf temp; + put(temp, prefix, size); + copy(buffer, temp); + auto data(temp.str()); + + HashProxy proxy(hash, save); + Sign(data.data(), data.size(), proxy, identifier, entitlements, key, slots); +} + std::string Bundle(const std::string &root, Folder &folder, const std::string &key, std::map> &remote, const std::string &entitlements) { std::string executable; std::string identifier; static const std::string info("Info.plist"); - _assert_(folder.Open(info, fun([&](std::streambuf &buffer) { + _assert_(folder.Open(info, fun([&](std::streambuf &buffer, const void *flag) { plist_d(buffer, fun([&](plist_t node) { executable = plist_s(plist_dict_get_item(node, "CFBundleExecutable")); identifier = plist_s(plist_dict_get_item(node, "CFBundleIdentifier")); })); })), "open(): Info.plist"); + static const std::string directory("_CodeSignature/"); + static const std::string signature(directory + "CodeResources"); + std::map> versions; auto &rules1(versions[""]); auto &rules2(versions["2"]); - static const std::string signature("_CodeSignature/CodeResources"); - - folder.Open(signature, fun([&](std::streambuf &buffer) { + folder.Open(signature, fun([&](std::streambuf &buffer, const void *) { plist_d(buffer, fun([&](plist_t node) { // XXX: maybe attempt to preserve existing rules })); @@ -1973,7 +1999,8 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k })); folder.Find("", fun([&](const std::string &name, const Functor &)> &code) { - if (name == executable || name == signature) + // BundleDiskRep::adjustResources -> builder.addExclusion + if (name == executable || Starts(name, directory) || Starts(name, "_MASReceipt/") || name == "CodeResources") return; auto &hash(local[name]); @@ -1981,7 +2008,32 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k return; code(fun([&](std::streambuf &data, std::streambuf &save) { + union { + struct { + uint32_t magic; + uint32_t count; + }; + + uint8_t bytes[8]; + } header; + + auto size(most(data, &header.bytes, sizeof(header.bytes))); + if (size == sizeof(header.bytes)) + switch (Swap(header.magic)) { + case FAT_MAGIC: + // Java class file format + if (Swap(header.count) >= 40) + break; + case FAT_CIGAM: + case MH_MAGIC: case MH_MAGIC_64: + case MH_CIGAM: case MH_CIGAM_64: + Slots slots; + Sign(header.bytes, size, data, hash, save, identifier, "", key, slots); + return; + } + HashProxy proxy(hash, save); + put(proxy, header.bytes, size); copy(data, proxy); })); @@ -2053,7 +2105,7 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k } } - folder.Save(signature, fun([&](std::streambuf &save) { + folder.Save(signature, NULL, fun([&](std::streambuf &save) { HashProxy proxy(local[signature], save); char *xml(NULL); uint32_t size; @@ -2062,19 +2114,12 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k put(proxy, 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) { + folder.Open(executable, fun([&](std::streambuf &buffer, const void *flag) { + folder.Save(executable, flag, 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, entitlements, key, slots); + Sign(NULL, 0, buffer, local[executable], save, identifier, entitlements, key, slots); })); })); @@ -2162,9 +2207,7 @@ int main(int argc, char *argv[]) { char *arge; unsigned number(strtoul(slot, &arge, 0)); _assert(arge == colon); - std::vector &hash(slots[number]); - hash.resize(LDID_SHA1_DIGEST_LENGTH); - sha1(reinterpret_cast(hash.data()), file.data(), file.size()); + sha1(slots[number], file.data(), file.size()); } break; case 'D': flag_D = true; break;