X-Git-Url: https://git.saurik.com/ldid.git/blobdiff_plain/489c97b8a84399d4210a4d5a75a8e5257923c350..66f2305d57b04ba04018f98f91494cd4dabd1249:/ldid.cpp diff --git a/ldid.cpp b/ldid.cpp index 9619daf..2b755f4 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -51,20 +51,36 @@ #ifdef __APPLE__ #include + #define LDID_SHA1_DIGEST_LENGTH CC_SHA1_DIGEST_LENGTH #define LDID_SHA1 CC_SHA1 #define LDID_SHA1_CTX CC_SHA1_CTX #define LDID_SHA1_Init CC_SHA1_Init #define LDID_SHA1_Update CC_SHA1_Update #define LDID_SHA1_Final CC_SHA1_Final + +#define LDID_SHA256_DIGEST_LENGTH CC_SHA256_DIGEST_LENGTH +#define LDID_SHA256 CC_SHA256 +#define LDID_SHA256_CTX CC_SHA256_CTX +#define LDID_SHA256_Init CC_SHA256_Init +#define LDID_SHA256_Update CC_SHA256_Update +#define LDID_SHA256_Final CC_SHA256_Final #else #include + #define LDID_SHA1_DIGEST_LENGTH SHA_DIGEST_LENGTH #define LDID_SHA1 SHA1 #define LDID_SHA1_CTX SHA_CTX #define LDID_SHA1_Init SHA1_Init #define LDID_SHA1_Update SHA1_Update #define LDID_SHA1_Final SHA1_Final + +#define LDID_SHA256_DIGEST_LENGTH SHA256_DIGEST_LENGTH +#define LDID_SHA256 SHA256 +#define LDID_SHA256_CTX SHA256_CTX +#define LDID_SHA256_Init SHA256_Init +#define LDID_SHA256_Update SHA256_Update +#define LDID_SHA256_Final SHA256_Final #endif #ifndef LDID_NOPLIST @@ -165,6 +181,27 @@ Scope _scope(const Function_ &function) { #define _scope(function) \ _scope_(__COUNTER__, function) +#define CPU_ARCH_MASK uint32_t(0xff000000) +#define CPU_ARCH_ABI64 uint32_t(0x01000000) + +#define CPU_TYPE_ANY uint32_t(-1) +#define CPU_TYPE_VAX uint32_t( 1) +#define CPU_TYPE_MC680x0 uint32_t( 6) +#define CPU_TYPE_X86 uint32_t( 7) +#define CPU_TYPE_MC98000 uint32_t(10) +#define CPU_TYPE_HPPA uint32_t(11) +#define CPU_TYPE_ARM uint32_t(12) +#define CPU_TYPE_MC88000 uint32_t(13) +#define CPU_TYPE_SPARC uint32_t(14) +#define CPU_TYPE_I860 uint32_t(15) +#define CPU_TYPE_POWERPC uint32_t(18) + +#define CPU_TYPE_I386 CPU_TYPE_X86 + +#define CPU_TYPE_ARM64 (CPU_ARCH_ABI64 | CPU_TYPE_ARM) +#define CPU_TYPE_POWERPC64 (CPU_ARCH_ABI64 | CPU_TYPE_POWERPC) +#define CPU_TYPE_X86_64 (CPU_ARCH_ABI64 | CPU_TYPE_X86) + struct fat_header { uint32_t magic; uint32_t nfat_arch; @@ -227,6 +264,16 @@ struct load_command { #define LC_DYLD_INFO_ONLY uint32_t(0x22 | LC_REQ_DYLD) #define LC_ENCRYPTION_INFO_64 uint32_t(0x2c) +union Version { + struct { + uint8_t patch; + uint8_t minor; + uint16_t major; + } _packed; + + uint32_t value; +}; + struct dylib { uint32_t name; uint32_t timestamp; @@ -394,6 +441,7 @@ struct section_64 { uint32_t flags; uint32_t reserved1; uint32_t reserved2; + uint32_t reserved3; } _packed; struct linkedit_data_command { @@ -427,15 +475,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); @@ -511,9 +574,6 @@ static inline int64_t Swap(int64_t value) { return Swap(static_cast(value)); } -template -class Pointer; - class Swapped { protected: bool swapped_; @@ -638,85 +698,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); + 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; - uint32_t sect; - for (sect = 0; sect != Swap(segment->nsects); ++sect) { - if (strncmp(section->sectname, section_name, 16) == 0) - sections.push_back(section); - ++section; + 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; } - } - - return sections; } 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_)); - } - } - } - - 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_); } }; @@ -787,38 +792,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) @@ -868,6 +841,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 @@ -878,6 +855,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_; @@ -897,6 +879,7 @@ struct CodesignAllocation { } }; +#ifndef LDID_NOTOOLS class File { private: int file_; @@ -995,10 +978,39 @@ class Map { return std::string(static_cast(data_), size_); } }; +#endif namespace ldid { -static void Allocate(const void *idata, size_t isize, std::streambuf &output, const Functor &allocate, const Functor &save) { +std::string Analyze(const void *data, size_t size) { + std::string entitlements; + + FatHeader fat_header(const_cast(data), size); + _foreach (mach_header, fat_header.GetMachHeaders()) + _foreach (load_command, mach_header.GetLoadCommands()) + if (mach_header.Swap(load_command->cmd) == LC_CODE_SIGNATURE) { + auto signature(reinterpret_cast(load_command)); + auto offset(mach_header.Swap(signature->dataoff)); + auto pointer(reinterpret_cast(mach_header.GetBase()) + offset); + auto super(reinterpret_cast(pointer)); + + for (size_t index(0); index != Swap(super->count); ++index) + if (Swap(super->index[index].type) == CSSLOT_ENTITLEMENTS) { + auto begin(Swap(super->index[index].offset)); + auto blob(reinterpret_cast(pointer + begin)); + auto writ(Swap(blob->length) - sizeof(*blob)); + + if (entitlements.empty()) + entitlements.assign(reinterpret_cast(blob + 1), writ); + else + _assert(entitlements.compare(0, entitlements.size(), reinterpret_cast(blob + 1), writ) == 0); + } + } + + return entitlements; +} + +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); @@ -1034,10 +1046,29 @@ 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(fat_arch == NULL ? 0 : source.Swap(fat_arch->align)); + uint32_t align; + + if (fat_arch != NULL) + align = source.Swap(fat_arch->align); + else switch (mach_header.GetCPUType()) { + case CPU_TYPE_POWERPC: + case CPU_TYPE_POWERPC64: + case CPU_TYPE_X86: + case CPU_TYPE_X86_64: + align = 0xc; + break; + case CPU_TYPE_ARM: + case CPU_TYPE_ARM64: + align = 0xe; + break; + default: + align = 0x0; + break; + } + offset = Align(offset, 1 << align); uint32_t limit(size); @@ -1094,7 +1125,7 @@ static void Allocate(const void *idata, size_t isize, std::streambuf &output, co break; size_t size(mach_header.Swap(allocation.limit_ + allocation.alloc_ - mach_header.Swap(segment_command->fileoff))); segment_command->filesize = size; - segment_command->vmsize = Align(size, PageSize_); + segment_command->vmsize = Align(size, 1 << allocation.align_); } break; case LC_SEGMENT_64: { @@ -1103,7 +1134,7 @@ static void Allocate(const void *idata, size_t isize, std::streambuf &output, co break; size_t size(mach_header.Swap(allocation.limit_ + allocation.alloc_ - mach_header.Swap(segment_command->fileoff))); segment_command->filesize = size; - segment_command->vmsize = Align(size, PageSize_); + segment_command->vmsize = Align(size, 1 << allocation.align_); } break; } @@ -1165,9 +1196,11 @@ 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); + else + _assert(allocation.alloc_ == saved); position += allocation.alloc_; } } @@ -1181,13 +1214,15 @@ static void insert(Blobs &blobs, uint32_t slot, const std::stringbuf &buffer) { std::swap(blobs[slot], value); } -static void insert(Blobs &blobs, uint32_t slot, uint32_t magic, const std::stringbuf &buffer) { +static const std::string &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); + auto &save(blobs[slot]); + std::swap(save, value); + return save; } static size_t put(std::streambuf &output, uint32_t magic, const Blobs &blobs) { @@ -1346,27 +1381,46 @@ class NullBuffer : } }; +class Digest { + public: + uint8_t sha1_[LDID_SHA1_DIGEST_LENGTH]; +}; + +class Hash { + public: + char sha1_[LDID_SHA1_DIGEST_LENGTH]; + char sha256_[LDID_SHA256_DIGEST_LENGTH]; + + operator std::vector() const { + return {sha1_, sha1_ + sizeof(sha1_)}; + } +}; + class HashBuffer : public std::streambuf { private: - std::vector &hash_; - LDID_SHA1_CTX context_; + Hash &hash_; + + LDID_SHA1_CTX sha1_; + LDID_SHA256_CTX sha256_; public: - HashBuffer(std::vector &hash) : + HashBuffer(Hash &hash) : hash_(hash) { - LDID_SHA1_Init(&context_); + LDID_SHA1_Init(&sha1_); + LDID_SHA256_Init(&sha256_); } ~HashBuffer() { - hash_.resize(LDID_SHA1_DIGEST_LENGTH); - LDID_SHA1_Final(reinterpret_cast(hash_.data()), &context_); + LDID_SHA1_Final(reinterpret_cast(hash_.sha1_), &sha1_); + LDID_SHA256_Final(reinterpret_cast(hash_.sha256_), &sha256_); } virtual std::streamsize xsputn(const char_type *data, std::streamsize size) { - LDID_SHA1_Update(&context_, data, size); + LDID_SHA1_Update(&sha1_, data, size); + LDID_SHA256_Update(&sha256_, data, size); return size; } @@ -1386,7 +1440,7 @@ class HashProxy : std::streambuf &buffer_; public: - HashProxy(std::vector &hash, std::streambuf &buffer) : + HashProxy(Hash &hash, std::streambuf &buffer) : HashBuffer(hash), buffer_(buffer) { @@ -1398,6 +1452,7 @@ class HashProxy : } }; +#ifndef LDID_NOTOOLS static bool Starts(const std::string &lhs, const std::string &rhs) { return lhs.size() >= rhs.size() && lhs.compare(0, rhs.size(), rhs) == 0; } @@ -1452,18 +1507,46 @@ static void Commit(const std::string &path, const std::string &temp) { _syscall(rename(temp.c_str(), path.c_str())); } +#endif 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::vector Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, const std::string &requirement, const std::string &key, const Slots &slots) { + std::vector hash(LDID_SHA1_DIGEST_LENGTH); + + std::string team; + +#ifndef LDID_NOSMIME + if (!key.empty()) { + 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 + + // XXX: this is just a "sufficiently large number" + size_t certificate(0x3000); + + Allocate(idata, isize, output, fun([&](const MachHeader &mach_header, 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 (requirement.empty()) + alloc += 0xc; + else + alloc += requirement.size(); if (!entitlements.empty()) { special = std::max(special, CSSLOT_ENTITLEMENTS); @@ -1478,27 +1561,38 @@ 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); - // XXX: this is just a "sufficiently large number" - alloc += 0x3000; + alloc += certificate; } _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) { std::stringbuf data; - Blobs requirements; - put(data, CSMAGIC_REQUIREMENTS, requirements); + if (requirement.empty()) { + Blobs requirements; + put(data, CSMAGIC_REQUIREMENTS, requirements); + } else { + put(data, requirement.data(), requirement.size()); + } insert(blobs, CSSLOT_REQUIREMENTS, data); } @@ -1512,18 +1606,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); @@ -1532,34 +1631,57 @@ 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); + if (!team.empty()) + 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; + std::vector storage(special + normal); + auto *hashes(&storage[special]); - memset(storage, 0, sizeof(*storage) * special); + memset(storage.data(), 0, sizeof(Digest) * special); _foreach (blob, blobs) { auto local(reinterpret_cast(&blob.second[0])); - sha1((uint8_t *) (hashes - blob.first), local, Swap(local->length)); + sha1((hashes - blob.first)->sha1_, 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()); } 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_); + sha1(hashes[i].sha1_, (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); + sha1(hashes[normal - 1].sha1_, top + PageSize_ * (normal - 1), ((limit - 1) % PageSize_) + 1); - put(data, storage, sizeof(storage)); + put(data, storage.data(), sizeof(Digest) * storage.size()); - insert(blobs, CSSLOT_CODEDIRECTORY, CSMAGIC_CODEDIRECTORY, data); + const auto &save(insert(blobs, CSSLOT_CODEDIRECTORY, CSMAGIC_CODEDIRECTORY, data)); + sha1(hash, save.data(), save.size()); } #ifndef LDID_NOSMIME @@ -1575,23 +1697,27 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st std::string value(result); put(data, value.data(), value.size()); - insert(blobs, CSSLOT_SIGNATURESLOT, CSMAGIC_BLOBWRAPPER, data); + const auto &save(insert(blobs, CSSLOT_SIGNATURESLOT, CSMAGIC_BLOBWRAPPER, data)); + _assert(save.size() <= certificate); } #endif return put(output, CSMAGIC_EMBEDDED_SIGNATURE, blobs); })); + + return hash; } +#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; })); } -std::string DiskFolder::Path(const std::string &path) { +std::string DiskFolder::Path(const std::string &path) const { return path_ + "/" + path; } @@ -1606,7 +1732,23 @@ DiskFolder::~DiskFolder() { Commit(commit.first, commit.second); } -void DiskFolder::Find(const std::string &root, const std::string &base, const Functor &)> &)>&code) { +#ifndef __WIN32__ +std::string readlink(const std::string &path) { + for (size_t size(1024); ; size *= 2) { + std::string data; + data.resize(size); + + int writ(_syscall(::readlink(path.c_str(), &data[0], data.size()))); + if (size_t(writ) >= size) + continue; + + data.resize(writ); + return data; + } +} +#endif + +void DiskFolder::Find(const std::string &root, const std::string &base, const Functor &code, const Functor &)> &link) const { std::string path(Path(root) + base); DIR *dir(opendir(path.c_str())); @@ -1624,7 +1766,7 @@ void DiskFolder::Find(const std::string &root, const std::string &base, const Fu #ifdef __WIN32__ struct stat info; - _syscall(stat(path.c_str(), &info)); + _syscall(stat((path + name).c_str(), &info)); if (false); else if (S_ISDIR(info.st_mode)) directory = true; @@ -1640,44 +1782,49 @@ void DiskFolder::Find(const std::string &root, const std::string &base, const Fu case DT_REG: directory = false; break; + case DT_LNK: + link(base + name, fun([&]() { return readlink(path + name); })); + continue; default: _assert_(false, "d_type=%u", child->d_type); } #endif if (directory) - Find(root, base + name + "/", code); + Find(root, base + name + "/", code, link); else - code(base + name, fun([&](const Functor &code) { - std::string access(root + base + name); - _assert_(Open(access, fun([&](std::streambuf &data) { - NullBuffer save; - code(data, save); - })), "open(): %s", access.c_str()); - })); + code(base + name); + } +} + +void DiskFolder::Save(const std::string &path, bool edit, const void *flag, const Functor &code) { + if (!edit) { + // XXX: use nullbuf + std::stringbuf save; + code(save); + } else { + std::filebuf save; + auto from(Path(path)); + commit_[from] = Temporary(save, from); + code(save); } } -void DiskFolder::Save(const std::string &path, const Functor &code) { - std::filebuf save; - auto from(Path(path)); - commit_[from] = Temporary(save, from); - code(save); +bool DiskFolder::Look(const std::string &path) const { + return _syscall(access(Path(path).c_str(), R_OK), ENOENT) == 0; } -bool DiskFolder::Open(const std::string &path, const Functor &code) { +void DiskFolder::Open(const std::string &path, const Functor &code) const { std::filebuf data; auto result(data.open(Path(path).c_str(), std::ios::binary | std::ios::in)); - if (result == NULL) - return false; - _assert(result == &data); - code(data); - return true; + _assert_(result == &data, "DiskFolder::Open(%s)", path.c_str()); + code(data, NULL); } -void DiskFolder::Find(const std::string &path, const Functor &)> &)>&code) { - Find(path, "", code); +void DiskFolder::Find(const std::string &path, const Functor &code, const Functor &)> &link) const { + Find(path, "", code, link); } +#endif SubFolder::SubFolder(Folder &parent, const std::string &path) : parent_(parent), @@ -1685,16 +1832,32 @@ 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, bool edit, const void *flag, const Functor &code) { + return parent_.Save(path_ + path, edit, flag, code); } -bool SubFolder::Open(const std::string &path, const Functor &code) { +bool SubFolder::Look(const std::string &path) const { + return parent_.Look(path_ + path); +} + +void SubFolder::Open(const std::string &path, const Functor &code) const { return parent_.Open(path_ + path, code); } -void SubFolder::Find(const std::string &path, const Functor &)> &)> &code) { - return parent_.Find(path_ + path, code); +void SubFolder::Find(const std::string &path, const Functor &code, const Functor &)> &link) const { + return parent_.Find(path_ + path, code, link); +} + +std::string UnionFolder::Map(const std::string &path) const { + auto remap(remaps_.find(path)); + if (remap == remaps_.end()) + return path; + return remap->second; +} + +void UnionFolder::Map(const std::string &path, const Functor &code, const std::string &file, const Functor &)> &save) const { + if (file.size() >= path.size() && file.substr(0, path.size()) == path) + code(file.substr(path.size())); } UnionFolder::UnionFolder(Folder &parent) : @@ -1702,36 +1865,53 @@ UnionFolder::UnionFolder(Folder &parent) : { } -void UnionFolder::Save(const std::string &path, const Functor &code) { - return parent_.Save(path, code); +void UnionFolder::Save(const std::string &path, bool edit, const void *flag, const Functor &code) { + return parent_.Save(Map(path), edit, 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::Look(const std::string &path) const { + auto file(resets_.find(path)); + if (file != resets_.end()) + return true; + return parent_.Look(Map(path)); +} - auto &data(file->second); +void UnionFolder::Open(const std::string &path, const Functor &code) const { + auto file(resets_.find(path)); + if (file == resets_.end()) + return parent_.Open(Map(path), code); + auto &entry(file->second); + + auto &data(entry.first); data.pubseekpos(0, std::ios::in); - code(data); - return true; + code(data, entry.second); } -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()) - code(name, save); - })); +void UnionFolder::Find(const std::string &path, const Functor &code, const Functor &)> &link) const { + 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 &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 &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); })); })); + + parent_.Find(path, fun([&](const std::string &name) { + if (deletes_.find(path + name) == deletes_.end()) + code(name); + }), fun([&](const std::string &name, const Functor &read) { + if (deletes_.find(path + name) == deletes_.end()) + link(name, read); + })); } +#ifndef LDID_NOTOOLS static size_t copy(std::streambuf &source, std::streambuf &target) { size_t total(0); for (;;) { @@ -1786,23 +1966,32 @@ enum Mode { class Expression { private: regex_t regex_; + std::vector matches_; public: Expression(const std::string &code) { - _assert_(regcomp(®ex_, code.c_str(), REG_EXTENDED | REG_NOSUB) == 0, "regcomp()"); + _assert_(regcomp(®ex_, code.c_str(), REG_EXTENDED) == 0, "regcomp()"); + matches_.resize(regex_.re_nsub + 1); } ~Expression() { regfree(®ex_); } - bool operator ()(const std::string &data) const { - auto value(regexec(®ex_, data.c_str(), 0, NULL, 0)); + bool operator ()(const std::string &data) { + regmatch_t matches[matches_.size()]; + auto value(regexec(®ex_, data.c_str(), matches_.size(), matches, 0)); if (value == REG_NOMATCH) return false; _assert_(value == 0, "regexec()"); + for (size_t i(0); i != matches_.size(); ++i) + matches_[i].assign(data.data() + matches[i].rm_so, matches[i].rm_eo - matches[i].rm_so); return true; } + + const std::string &operator [](size_t index) const { + return matches_[index]; + } }; struct Rule { @@ -1851,84 +2040,173 @@ struct RuleCode { }; #ifndef LDID_NOPLIST -std::string Bundle(const std::string &root, Folder &folder, const std::string &key, std::map> &remote, const std::string &entitlements) { +static std::vector Sign(const uint8_t *prefix, size_t size, std::streambuf &buffer, Hash &hash, std::streambuf &save, const std::string &identifier, const std::string &entitlements, const std::string &requirement, const std::string &key, const Slots &slots) { + // XXX: this is a miserable fail + std::stringbuf temp; + put(temp, prefix, size); + size += copy(buffer, temp); + // XXX: this is a stupid hack + pad(temp, 0x10 - (size & 0xf)); + auto data(temp.str()); + + HashProxy proxy(hash, save); + return Sign(data.data(), data.size(), proxy, identifier, entitlements, requirement, key, slots); +} + +Bundle Sign(const std::string &root, Folder &folder, const std::string &key, std::map &remote, const std::string &requirement, const Functor &alter) { std::string executable; std::string identifier; - static const std::string info("Info.plist"); + bool mac(false); - _assert_(folder.Open(info, fun([&](std::streambuf &buffer) { + std::string info("Info.plist"); + if (!folder.Look(info) && folder.Look("Resources/" + info)) { + mac = true; + info = "Resources/" + info; + } + + 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"); + })); + + if (!mac && folder.Look("MacOS/" + executable)) { + executable = "MacOS/" + executable; + mac = true; + } + + std::string entitlements; + folder.Open(executable, fun([&](std::streambuf &buffer, const void *flag) { + // XXX: this is a miserable fail + std::stringbuf temp; + auto size(copy(buffer, temp)); + // XXX: this is a stupid hack + pad(temp, 0x10 - (size & 0xf)); + auto data(temp.str()); + entitlements = alter(root, Analyze(data.data(), data.size())); + })); + + 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) { - plist_d(buffer, fun([&](plist_t node) { - // XXX: maybe attempt to preserve existing rules - })); - })); + const std::string resources(mac ? "Resources/" : ""); if (true) { - rules1.insert(Rule{1, NoMode, "^"}); - rules1.insert(Rule{10000, OmitMode, "^(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/|())SC_Info/[^/]+\\.(sinf|supf|supp)$"}); - rules1.insert(Rule{1000, OptionalMode, "^.*\\.lproj/"}); - rules1.insert(Rule{1100, OmitMode, "^.*\\.lproj/locversion.plist$"}); - rules1.insert(Rule{10000, OmitMode, "^Watch/[^/]+\\.app/(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/)SC_Info/[^/]+\\.(sinf|supf|supp)$"}); + rules1.insert(Rule{1, NoMode, "^" + resources}); + if (!mac) rules1.insert(Rule{10000, OmitMode, "^(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/|())SC_Info/[^/]+\\.(sinf|supf|supp)$"}); + rules1.insert(Rule{1000, OptionalMode, "^" + resources + ".*\\.lproj/"}); + rules1.insert(Rule{1100, OmitMode, "^" + resources + ".*\\.lproj/locversion.plist$"}); + if (!mac) rules1.insert(Rule{10000, OmitMode, "^Watch/[^/]+\\.app/(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/)SC_Info/[^/]+\\.(sinf|supf|supp)$"}); rules1.insert(Rule{1, NoMode, "^version.plist$"}); } if (true) { rules2.insert(Rule{11, NoMode, ".*\\.dSYM($|/)"}); - rules2.insert(Rule{20, NoMode, "^"}); + rules2.insert(Rule{20, NoMode, "^" + resources}); rules2.insert(Rule{2000, OmitMode, "^(.*/)?\\.DS_Store$"}); - rules2.insert(Rule{10000, OmitMode, "^(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/|())SC_Info/[^/]+\\.(sinf|supf|supp)$"}); + if (!mac) rules2.insert(Rule{10000, OmitMode, "^(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/|())SC_Info/[^/]+\\.(sinf|supf|supp)$"}); rules2.insert(Rule{10, NestedMode, "^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/"}); rules2.insert(Rule{1, NoMode, "^.*"}); - rules2.insert(Rule{1000, OptionalMode, "^.*\\.lproj/"}); - rules2.insert(Rule{1100, OmitMode, "^.*\\.lproj/locversion.plist$"}); + rules2.insert(Rule{1000, OptionalMode, "^" + resources + ".*\\.lproj/"}); + rules2.insert(Rule{1100, OmitMode, "^" + resources + ".*\\.lproj/locversion.plist$"}); rules2.insert(Rule{20, OmitMode, "^Info\\.plist$"}); rules2.insert(Rule{20, OmitMode, "^PkgInfo$"}); - rules2.insert(Rule{10000, OmitMode, "^Watch/[^/]+\\.app/(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/)SC_Info/[^/]+\\.(sinf|supf|supp)$"}); + if (!mac) rules2.insert(Rule{10000, OmitMode, "^Watch/[^/]+\\.app/(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/)SC_Info/[^/]+\\.(sinf|supf|supp)$"}); rules2.insert(Rule{10, NestedMode, "^[^/]+$"}); rules2.insert(Rule{20, NoMode, "^embedded\\.provisionprofile$"}); rules2.insert(Rule{20, NoMode, "^version\\.plist$"}); } - std::map> local; + std::map local; - static Expression nested("^PlugIns/[^/]*\\.appex/Info\\.plist$"); + std::string failure(mac ? "Contents/|Versions/[^/]*/Resources/" : ""); + Expression nested("^(Frameworks/[^/]*\\.framework|PlugIns/[^/]*\\.appex(()|/[^/]*.app))/(" + failure + ")Info\\.plist$"); + std::map bundles; - folder.Find("", fun([&](const std::string &name, const Functor &)> &code) { + folder.Find("", fun([&](const std::string &name) { if (!nested(name)) return; auto bundle(root + Split(name).dir); + bundle.resize(bundle.size() - resources.size()); SubFolder subfolder(folder, bundle); - Bundle(bundle, subfolder, key, local, ""); + + bundles[nested[1]] = Sign(bundle, subfolder, key, local, "", Starts(name, "PlugIns/") ? alter : + static_cast &>(fun([&](const std::string &, const std::string &entitlements) -> std::string { return entitlements; }))); + }), fun([&](const std::string &name, const Functor &read) { })); - folder.Find("", fun([&](const std::string &name, const Functor &)> &code) { - if (name == executable || name == signature) + std::set excludes; + + auto exclude([&](const std::string &name) { + // BundleDiskRep::adjustResources -> builder.addExclusion + if (name == executable || Starts(name, directory) || Starts(name, "_MASReceipt/") || name == "CodeResources") + return true; + + for (const auto &bundle : bundles) + if (Starts(name, bundle.first + "/")) { + excludes.insert(name); + return true; + } + + return false; + }); + + std::map links; + + folder.Find("", fun([&](const std::string &name) { + if (exclude(name)) return; - auto &hash(local[name]); - if (!hash.empty()) + if (local.find(name) != local.end()) return; + auto &hash(local[name]); + + folder.Open(name, fun([&](std::streambuf &data, const void *flag) { + union { + struct { + uint32_t magic; + uint32_t count; + }; + + uint8_t bytes[8]; + } header; + + auto size(most(data, &header.bytes, sizeof(header.bytes))); + + if (name != "_WatchKitStub/WK" && 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: + folder.Save(name, true, flag, fun([&](std::streambuf &save) { + Slots slots; + Sign(header.bytes, size, data, hash, save, identifier, "", "", key, slots); + })); + return; + } - code(fun([&](std::streambuf &data, std::streambuf &save) { - HashProxy proxy(hash, save); - copy(data, proxy); + folder.Save(name, false, flag, fun([&](std::streambuf &save) { + HashProxy proxy(hash, save); + put(proxy, header.bytes, size); + copy(data, proxy); + })); })); + }), fun([&](const std::string &name, const Functor &read) { + if (exclude(name)) + return; - _assert(hash.size() == LDID_SHA1_DIGEST_LENGTH); + links[name] = read(); })); auto plist(plist_new_dict()); @@ -1941,20 +2219,48 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k for (const auto &rule : version.second) rule.Compile(); + bool old(&version.second == &rules1); + for (const auto &hash : local) for (const auto &rule : version.second) if (rule(hash.first)) { - if (rule.mode_ == NoMode) - plist_dict_set_item(files, hash.first.c_str(), plist_new_data(hash.second.data(), hash.second.size())); - else if (rule.mode_ == OptionalMode) { + if (!old && mac && excludes.find(hash.first) != excludes.end()); + else if (old && rule.mode_ == NoMode) + plist_dict_set_item(files, hash.first.c_str(), plist_new_data(hash.second.sha1_, sizeof(hash.second.sha1_))); + else if (rule.mode_ != OmitMode) { auto entry(plist_new_dict()); - plist_dict_set_item(entry, "hash", plist_new_data(hash.second.data(), hash.second.size())); - plist_dict_set_item(entry, "optional", plist_new_bool(true)); + plist_dict_set_item(entry, "hash", plist_new_data(hash.second.sha1_, sizeof(hash.second.sha1_))); + if (!old) + plist_dict_set_item(entry, "hash2", plist_new_data(hash.second.sha256_, sizeof(hash.second.sha256_))); + if (rule.mode_ == OptionalMode) + plist_dict_set_item(entry, "optional", plist_new_bool(true)); plist_dict_set_item(files, hash.first.c_str(), entry); } break; } + + for (const auto &link : links) + for (const auto &rule : version.second) + if (rule(link.first)) { + if (rule.mode_ != OmitMode) { + auto entry(plist_new_dict()); + plist_dict_set_item(entry, "symlink", plist_new_string(link.second.c_str())); + if (rule.mode_ == OptionalMode) + plist_dict_set_item(entry, "optional", plist_new_bool(true)); + plist_dict_set_item(files, link.first.c_str(), entry); + } + + break; + } + + if (!old && mac) + for (const auto &bundle : bundles) { + auto entry(plist_new_dict()); + plist_dict_set_item(entry, "cdhash", plist_new_data(bundle.second.hash.data(), bundle.second.hash.size())); + plist_dict_set_item(entry, "requirement", plist_new_string("anchor apple generic")); + plist_dict_set_item(files, bundle.first.c_str(), entry); + } } for (const auto &version : versions) { @@ -1996,7 +2302,7 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k } } - folder.Save(signature, fun([&](std::streambuf &save) { + folder.Save(signature, true, NULL, fun([&](std::streambuf &save) { HashProxy proxy(local[signature], save); char *xml(NULL); uint32_t size; @@ -2005,31 +2311,34 @@ 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()); + Bundle bundle; + bundle.path = executable; - folder.Save(executable, fun([&](std::streambuf &save) { + folder.Open(executable, fun([&](std::streambuf &buffer, const void *flag) { + folder.Save(executable, true, 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); + bundle.hash = Sign(NULL, 0, buffer, local[executable], save, identifier, entitlements, requirement, key, slots); })); })); - for (const auto &hash : local) - remote[root + hash.first] = hash.second; + for (const auto &entry : local) + remote[root + entry.first] = entry.second; + + return bundle; +} - return executable; +Bundle Sign(const std::string &root, Folder &folder, const std::string &key, const std::string &requirement, const Functor &alter) { + std::map local; + return Sign(root, folder, key, local, requirement, alter); } #endif +#endif } +#ifndef LDID_NOTOOLS int main(int argc, char *argv[]) { #ifndef LDID_NOSMIME OpenSSL_add_all_algorithms(); @@ -2044,6 +2353,7 @@ int main(int argc, char *argv[]) { bool flag_r(false); bool flag_e(false); + bool flag_q(false); #ifndef LDID_NOFLAGT bool flag_T(false); @@ -2057,6 +2367,8 @@ int main(int argc, char *argv[]) { bool flag_A(false); bool flag_a(false); + bool flag_u(false); + uint32_t flag_CPUType(_not(uint32_t)); uint32_t flag_CPUSubtype(_not(uint32_t)); @@ -2068,6 +2380,7 @@ int main(int argc, char *argv[]) { #endif Map entitlements; + Map requirement; Map key; ldid::Slots slots; @@ -2101,9 +2414,14 @@ 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 'q': flag_q = true; break; + + case 'Q': { + const char *xml = argv[argi] + 2; + requirement.open(xml, O_RDONLY, PROT_READ, MAP_PRIVATE); } break; case 'D': flag_D = true; break; @@ -2142,7 +2460,8 @@ int main(int argc, char *argv[]) { break; case 'K': - key.open(argv[argi] + 2, O_RDONLY, PROT_READ, MAP_PRIVATE); + if (argv[argi][2] != '\0') + key.open(argv[argi] + 2, O_RDONLY, PROT_READ, MAP_PRIVATE); break; #ifndef LDID_NOFLAGT @@ -2158,6 +2477,10 @@ int main(int argc, char *argv[]) { } break; #endif + case 'u': { + flag_u = true; + } break; + case 'I': { flag_I = argv[argi] + 2; } break; @@ -2185,8 +2508,7 @@ int main(int argc, char *argv[]) { #ifndef LDID_NOPLIST _assert(!flag_r); ldid::DiskFolder folder(path); - std::map> hashes; - path += "/" + Bundle("", folder, key, hashes, entitlements); + path += "/" + Sign("", folder, key, requirement, ldid::fun([&](const std::string &, const std::string &) -> std::string { return entitlements; })).path; #else _assert(false); #endif @@ -2201,7 +2523,7 @@ int main(int argc, char *argv[]) { ldid::Unsign(input.data(), input.size(), output); else { std::string identifier(flag_I ?: split.base.c_str()); - ldid::Sign(input.data(), input.size(), output, identifier, entitlements, key, slots); + ldid::Sign(input.data(), input.size(), output, identifier, entitlements, requirement, key, slots); } Commit(path, temp); @@ -2240,6 +2562,18 @@ int main(int argc, char *argv[]) { signature = reinterpret_cast(load_command); else if (cmd == LC_ENCRYPTION_INFO || cmd == LC_ENCRYPTION_INFO_64) encryption = reinterpret_cast(load_command); + else if (cmd == LC_LOAD_DYLIB) { + volatile struct dylib_command *dylib_command(reinterpret_cast(load_command)); + const char *name(reinterpret_cast(load_command) + mach_header.Swap(dylib_command->dylib.name)); + + if (strcmp(name, "/System/Library/Frameworks/UIKit.framework/UIKit") == 0) { + if (flag_u) { + Version version; + version.value = mach_header.Swap(dylib_command->dylib.current_version); + printf("uikit=%u.%u.%u\n", version.major, version.minor, version.patch); + } + } + } #ifndef LDID_NOFLAGT else if (cmd == LC_ID_DYLIB) { volatile struct dylib_command *dylib_command(reinterpret_cast(load_command)); @@ -2282,6 +2616,23 @@ int main(int argc, char *argv[]) { } } + if (flag_q) { + _assert(signature != NULL); + + uint32_t data = mach_header.Swap(signature->dataoff); + + uint8_t *top = reinterpret_cast(mach_header.GetBase()); + uint8_t *blob = top + data; + struct SuperBlob *super = reinterpret_cast(blob); + + for (size_t index(0); index != Swap(super->count); ++index) + if (Swap(super->index[index].type) == CSSLOT_REQUIREMENTS) { + uint32_t begin = Swap(super->index[index].offset); + struct Blob *requirement = reinterpret_cast(blob + begin); + fwrite(requirement, 1, Swap(requirement->length), stdout); + } + } + if (flag_s) { _assert(signature != NULL); @@ -2294,7 +2645,7 @@ int main(int argc, char *argv[]) { for (size_t index(0); index != Swap(super->count); ++index) if (Swap(super->index[index].type) == CSSLOT_CODEDIRECTORY) { uint32_t begin = Swap(super->index[index].offset); - struct CodeDirectory *directory = reinterpret_cast(blob + begin); + struct CodeDirectory *directory = reinterpret_cast(blob + begin + sizeof(Blob)); uint8_t (*hashes)[LDID_SHA1_DIGEST_LENGTH] = reinterpret_cast(blob + begin + Swap(directory->hashOffset)); uint32_t pages = Swap(directory->nCodeSlots); @@ -2316,3 +2667,4 @@ int main(int argc, char *argv[]) { return filee; } +#endif