X-Git-Url: https://git.saurik.com/ldid.git/blobdiff_plain/faa1b1f87d4d161cc7fcdc9f32d8abd6fd72316a..ffdd118300990943b913bf05912d83cce6d53a87:/ldid.cpp diff --git a/ldid.cpp b/ldid.cpp index 57737ea..db0209a 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -37,23 +37,30 @@ #include #include +#include +#include +#include +#include #include #include +#include "ldid.hpp" + #define _assert___(line) \ #line #define _assert__(line) \ _assert___(line) -#define _assert_(e) \ - throw __FILE__ "(" _assert__(__LINE__) "): _assert(" e ")" -#define _assert(expr) \ +#define _assert_(expr, format, ...) \ do if (!(expr)) { \ - fprintf(stderr, "%s(%u): _assert(%s); errno=%u\n", __FILE__, __LINE__, #expr, errno); \ - _assert_(#expr); \ + fprintf(stderr, "%s(%u): _assert(): " format "\n", __FILE__, __LINE__, ## __VA_ARGS__); \ + throw __FILE__ "(" _assert__(__LINE__) "): _assert(" #expr ")"; \ } while (false) +#define _assert(expr) \ + _assert_(expr, "%s", #expr) + #define _syscall(expr) ({ \ __typeof__(expr) _value; \ do if ((long) (_value = (expr)) != -1) \ @@ -62,7 +69,7 @@ case EINTR: \ continue; \ default: \ - _assert(false); \ + _assert_(false, "errno=%u", errno); \ } while (true); \ _value; \ }) @@ -372,13 +379,16 @@ Type_ Align(Type_ value, size_t align) { return value; } -uint16_t Swap_(uint16_t value) { +static const uint8_t PageShift_(0x0c); +static const uint32_t PageSize_(1 << PageShift_); + +static inline uint16_t Swap_(uint16_t value) { return ((value >> 8) & 0x00ff) | ((value << 8) & 0xff00); } -uint32_t Swap_(uint32_t value) { +static inline uint32_t Swap_(uint32_t value) { value = ((value >> 8) & 0x00ff00ff) | ((value << 8) & 0xff00ff00); value = ((value >> 16) & 0x0000ffff) | @@ -386,48 +396,48 @@ uint32_t Swap_(uint32_t value) { return value; } -uint64_t Swap_(uint64_t value) { +static inline 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) { +static inline int16_t Swap_(int16_t value) { return Swap_(static_cast(value)); } -int32_t Swap_(int32_t value) { +static inline int32_t Swap_(int32_t value) { return Swap_(static_cast(value)); } -int64_t Swap_(int64_t value) { +static inline int64_t Swap_(int64_t value) { return Swap_(static_cast(value)); } -bool little_(true); +static bool little_(true); -uint16_t Swap(uint16_t value) { +static inline uint16_t Swap(uint16_t value) { return little_ ? Swap_(value) : value; } -uint32_t Swap(uint32_t value) { +static inline uint32_t Swap(uint32_t value) { return little_ ? Swap_(value) : value; } -uint64_t Swap(uint64_t value) { +static inline uint64_t Swap(uint64_t value) { return little_ ? Swap_(value) : value; } -int16_t Swap(int16_t value) { +static inline int16_t Swap(int16_t value) { return Swap(static_cast(value)); } -int32_t Swap(int32_t value) { +static inline int32_t Swap(int32_t value) { return Swap(static_cast(value)); } -int64_t Swap(int64_t value) { +static inline int64_t Swap(int64_t value) { return Swap(static_cast(value)); } @@ -792,7 +802,7 @@ struct CodeDirectory { extern "C" uint32_t hash(uint8_t *k, uint32_t length, uint32_t initval); -void sha1(uint8_t *hash, const void *data, size_t size) { +static void sha1(uint8_t *hash, const void *data, size_t size) { SHA1(static_cast(data), size, hash); } @@ -832,7 +842,7 @@ class File { void open(const char *path, int flags) { _assert(file_ == -1); - _syscall(file_ = ::open(path, flags)); + file_ = _syscall(::open(path, flags)); } int file() const { @@ -877,6 +887,10 @@ class Map { clear(); } + bool empty() const { + return data_ == NULL; + } + void open(const char *path, int oflag, int pflag, int mflag) { clear(); @@ -887,7 +901,7 @@ class Map { _syscall(fstat(file, &stat)); size_ = stat.st_size; - _syscall(data_ = mmap(NULL, size_, pflag, mflag, file, 0)); + data_ = _syscall(mmap(NULL, size_, pflag, mflag, file, 0)); } void open(const char *path, bool edit) { @@ -910,50 +924,10 @@ class Map { } }; -// 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...); - } -}; - -template -FunctorImpl fun(const Function_ &value) { - return value; -} +namespace ldid { -void resign(void *idata, size_t isize, std::streambuf &output, const Functor &allocate, const Functor &save) { - FatHeader source(idata, isize); +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); if (source.IsFat()) @@ -1000,7 +974,7 @@ void resign(void *idata, size_t isize, std::streambuf &output, const Functorfileoff))); segment_command->filesize = size; - segment_command->vmsize = Align(size, 0x1000); + segment_command->vmsize = Align(size, PageSize_); } break; case LC_SEGMENT_64: { @@ -1057,7 +1031,7 @@ void resign(void *idata, size_t isize, std::streambuf &output, const Functorfileoff))); segment_command->filesize = size; - segment_command->vmsize = Align(size, 0x1000); + segment_command->vmsize = Align(size, PageSize_); } break; } @@ -1126,6 +1100,8 @@ void resign(void *idata, size_t isize, std::streambuf &output, const Functor Blobs; static void insert(Blobs &blobs, uint32_t slot, const std::stringbuf &buffer) { @@ -1169,11 +1145,124 @@ static size_t put(std::streambuf &output, uint32_t magic, const Blobs &blobs) { 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); +class Buffer { + private: + BIO *bio_; + + public: + Buffer(BIO *bio) : + bio_(bio) + { + _assert(bio_ != NULL); + } + + Buffer() : + bio_(BIO_new(BIO_s_mem())) + { + } + + Buffer(const char *data, size_t size) : + Buffer(BIO_new_mem_buf(const_cast(data), size)) + { + } + + Buffer(const std::string &data) : + Buffer(data.data(), data.size()) + { + } + + Buffer(PKCS7 *pkcs) : + Buffer() + { + _assert(i2d_PKCS7_bio(bio_, pkcs) != 0); + } + + ~Buffer() { + BIO_free_all(bio_); + } + + operator BIO *() const { + return bio_; + } + + explicit operator std::string() const { + char *data; + auto size(BIO_get_mem_data(bio_, &data)); + return std::string(data, size); + } +}; + +class Stuff { + private: + PKCS12 *value_; + EVP_PKEY *key_; + X509 *cert_; + STACK_OF(X509) *ca_; + + public: + Stuff(BIO *bio) : + value_(d2i_PKCS12_bio(bio, NULL)), + ca_(NULL) + { + _assert(value_ != NULL); + _assert(PKCS12_parse(value_, "", &key_, &cert_, &ca_) != 0); + _assert(key_ != NULL); + _assert(cert_ != NULL); + } + + Stuff(const std::string &data) : + Stuff(Buffer(data)) + { + } + + ~Stuff() { + sk_X509_pop_free(ca_, X509_free); + X509_free(cert_); + EVP_PKEY_free(key_); + PKCS12_free(value_); + } + + operator PKCS12 *() const { + return value_; + } + + operator EVP_PKEY *() const { + return key_; + } + + operator X509 *() const { + return cert_; + } + + operator STACK_OF(X509) *() const { + return ca_; + } +}; + +class Signature { + private: + PKCS7 *value_; + + public: + Signature(const Stuff &stuff, const Buffer &data) : + value_(PKCS7_sign(stuff, stuff, stuff, data, PKCS7_BINARY | PKCS7_DETACHED)) + { + _assert(value_ != NULL); + } + + ~Signature() { + PKCS7_free(value_); + } + + operator PKCS7 *() const { + return value_; + } +}; + +namespace ldid { - resign(idata, isize, output, fun([&](size_t size) -> size_t { +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 { size_t alloc(sizeof(struct SuperBlob)); uint32_t special(0); @@ -1193,9 +1282,19 @@ void resign(void *idata, size_t isize, std::streambuf &output, const std::string alloc += sizeof(struct BlobIndex); alloc += sizeof(struct Blob); alloc += sizeof(struct CodeDirectory); - alloc += name.size() + 1; + alloc += identifier.size() + 1; - uint32_t normal((size + pagesize - 1) / pagesize); + if (!key.empty()) { + alloc += sizeof(struct BlobIndex); + alloc += sizeof(struct Blob); + // XXX: this is just a "sufficiently large number" + alloc += 0x3000; + } + + _foreach (slot, slots) + special = std::max(special, slot.first); + + 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 { @@ -1222,12 +1321,14 @@ void resign(void *idata, size_t isize, std::streambuf &output, const std::string uint32_t special(0); _foreach (blob, blobs) special = std::max(special, blob.first); - uint32_t normal((limit + pagesize - 1) / pagesize); + _foreach (slot, slots) + special = std::max(special, slot.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.hashOffset = Swap(uint32_t(sizeof(Blob) + sizeof(CodeDirectory) + identifier.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)); @@ -1235,11 +1336,11 @@ void resign(void *idata, size_t isize, std::streambuf &output, const std::string directory.hashSize = SHA_DIGEST_LENGTH; directory.hashType = CS_HASHTYPE_SHA1; directory.spare1 = 0x00; - directory.pageSize = pageshift; + directory.pageSize = PageShift_; directory.spare2 = Swap(uint32_t(0)); put(data, &directory, sizeof(directory)); - put(data, name.c_str(), name.size() + 1); + put(data, identifier.c_str(), identifier.size() + 1); uint8_t storage[special + normal][SHA_DIGEST_LENGTH]; uint8_t (*hashes)[SHA_DIGEST_LENGTH] = storage + special; @@ -1251,30 +1352,54 @@ void resign(void *idata, size_t isize, std::streambuf &output, const std::string sha1((uint8_t *) (hashes - blob.first), local, Swap(local->length)); } + _foreach (slot, slots) { + _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], (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], top + PageSize_ * (normal - 1), ((limit - 1) % PageSize_) + 1); put(data, storage, sizeof(storage)); insert(blobs, CSSLOT_CODEDIRECTORY, CSMAGIC_CODEDIRECTORY, data); } + if (!key.empty()) { + std::stringbuf data; + const std::string &sign(blobs[CSSLOT_CODEDIRECTORY]); + + Stuff stuff(key); + Buffer bio(sign); + + Signature signature(stuff, sign); + Buffer result(signature); + std::string value(result); + put(data, value.data(), value.size()); + + insert(blobs, CSSLOT_SIGNATURESLOT, CSMAGIC_BLOBWRAPPER, 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 { +static void Unsign(void *idata, size_t isize, std::streambuf &output) { + Allocate(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[]) { + OpenSSL_add_all_algorithms(); + union { uint16_t word; uint8_t byte[2]; @@ -1304,6 +1429,8 @@ int main(int argc, char *argv[]) { uint32_t timev(0); Map entitlements; + Map key; + ldid::Slots slots; std::vector files; @@ -1319,14 +1446,33 @@ int main(int argc, char *argv[]) { if (argv[argi][0] != '-') files.push_back(argv[argi]); else switch (argv[argi][1]) { - case 'r': flag_r = true; break; + case 'r': + _assert(!flag_s); + _assert(!flag_S); + flag_r = true; + break; + case 'e': flag_e = true; break; + case 'E': { + const char *slot = argv[argi] + 2; + const char *colon = strchr(slot, ':'); + _assert(colon != NULL); + Map file(colon + 1, O_RDONLY, PROT_READ, MAP_PRIVATE); + char *arge; + unsigned number(strtoul(slot, &arge, 0)); + _assert(arge == colon); + std::string &hash(slots[number]); + hash.resize(SHA_DIGEST_LENGTH); + sha1(reinterpret_cast(&hash[0]), file.data(), file.size()); + } break; + case 'D': flag_D = true; break; case 'a': flag_a = true; break; case 'A': + _assert(!flag_A); flag_A = true; if (argv[argi][2] != '\0') { const char *cpu = argv[argi] + 2; @@ -1341,11 +1487,13 @@ int main(int argc, char *argv[]) { break; case 's': + _assert(!flag_r); _assert(!flag_S); flag_s = true; break; case 'S': + _assert(!flag_r); _assert(!flag_s); flag_S = true; if (argv[argi][2] != '\0') { @@ -1354,6 +1502,10 @@ int main(int argc, char *argv[]) { } break; + case 'K': + key.open(argv[argi] + 2, O_RDONLY, PROT_READ, MAP_PRIVATE); + break; + case 'T': { flag_T = true; if (argv[argi][2] == '-') @@ -1374,7 +1526,8 @@ int main(int argc, char *argv[]) { break; } - _assert(!flag_S || !flag_r); + _assert(flag_S || key.empty()); + _assert(flag_S || flag_I == NULL); if (files.empty()) usage: { exit(0); @@ -1383,32 +1536,40 @@ int main(int argc, char *argv[]) { size_t filei(0), filee(0); _foreach (file, files) try { const char *path(file.c_str()); - const char *base = strrchr(path, '/'); - - std::string dir; - if (base != NULL) - dir.assign(path, base++ - path + 1); - else - base = path; - - const char *name(flag_I ?: base); - std::string temp; if (flag_S || flag_r) { Map input(path, O_RDONLY, PROT_READ, MAP_PRIVATE); - temp = dir + "." + base + ".cs"; + std::string dir; + const char *base = strrchr(path, '/'); + + if (base != NULL) + dir.assign(path, base++ - path + 1); + else + base = path; + + std::string temp(dir + "." + base + ".cs"); std::filebuf output; _assert(output.open(temp.c_str(), std::ios::out | std::ios::trunc | std::ios::binary) == &output); if (flag_r) - resign(input.data(), input.size(), output); + ldid::Unsign(input.data(), input.size(), output); else { - resign(input.data(), input.size(), output, name, entitlements); + std::string identifier(flag_I ?: base); + ldid::Sign(input.data(), input.size(), output, identifier, entitlements, key, slots); } + + struct stat info; + _syscall(stat(path, &info)); +#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.c_str(), path)); } - Map mapping(!temp.empty() ? temp.c_str() : path, flag_T || flag_s); + Map mapping(path, flag_T || flag_s); FatHeader fat_header(mapping.data(), mapping.size()); _foreach (mach_header, fat_header.GetMachHeaders()) { @@ -1469,7 +1630,7 @@ int main(int argc, char *argv[]) { if (Swap(super->index[index].type) == CSSLOT_ENTITLEMENTS) { uint32_t begin = Swap(super->index[index].offset); struct Blob *entitlements = reinterpret_cast(blob + begin); - fwrite(entitlements + 1, 1, Swap(entitlements->length) - sizeof(struct Blob), stdout); + fwrite(entitlements + 1, 1, Swap(entitlements->length) - sizeof(*entitlements), stdout); } } @@ -1492,24 +1653,13 @@ int main(int argc, char *argv[]) { if (pages != 1) for (size_t i = 0; i != pages - 1; ++i) - sha1(hashes[i], top + 0x1000 * i, 0x1000); + sha1(hashes[i], top + PageSize_ * i, PageSize_); if (pages != 0) - sha1(hashes[pages - 1], top + 0x1000 * (pages - 1), ((data - 1) % 0x1000) + 1); + sha1(hashes[pages - 1], top + PageSize_ * (pages - 1), ((data - 1) % PageSize_) + 1); } } } - if (!temp.empty()) { - struct stat info; - _syscall(stat(path, &info)); -#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.c_str(), path)); - } - ++filei; } catch (const char *) { ++filee;