X-Git-Url: https://git.saurik.com/ldid.git/blobdiff_plain/b9652d6e8e113addbf4275ba9db0635bb23e05f0..a0c715e9c070b60702407b8713b3874593ff833d:/ldid.cpp diff --git a/ldid.cpp b/ldid.cpp index ecca2f4..9ed5792 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -45,6 +45,8 @@ #include +#include "ldid.hpp" + #define _assert___(line) \ #line #define _assert__(line) \ @@ -884,6 +886,10 @@ class Map { clear(); } + bool empty() const { + return data_ == NULL; + } + void open(const char *path, int oflag, int pflag, int mflag) { clear(); @@ -939,11 +945,6 @@ class FunctorImpl : const Value_ *value_; public: - FunctorImpl() : - value_(NULL) - { - } - FunctorImpl(const Value_ &value) : value_(&value) { @@ -959,7 +960,9 @@ FunctorImpl fun(const Function_ &value) { return value; } -static void resign(void *idata, size_t isize, std::streambuf &output, const Functor &allocate, const Functor &save) { +namespace ldid { + +static void Allocate(void *idata, size_t isize, std::streambuf &output, const Functor &allocate, const Functor &save) { FatHeader source(idata, isize); size_t offset(0); @@ -1133,6 +1136,8 @@ static void resign(void *idata, size_t isize, std::streambuf &output, const Func } } +} + typedef std::map Blobs; static void insert(Blobs &blobs, uint32_t slot, const std::stringbuf &buffer) { @@ -1290,8 +1295,10 @@ class Signature { } }; -void resign(void *idata, size_t isize, std::streambuf &output, const std::string &name, const std::string &entitlements, const std::string &key) { - resign(idata, isize, output, fun([&](size_t size) -> size_t { +namespace ldid { + +void Sign(void *idata, size_t isize, std::streambuf &output, const std::string &name, 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); @@ -1320,6 +1327,9 @@ void resign(void *idata, size_t isize, std::streambuf &output, const std::string 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; @@ -1347,6 +1357,8 @@ 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); + _foreach (slot, slots) + special = std::max(special, slot.first); uint32_t normal((limit + PageSize_ - 1) / PageSize_); CodeDirectory directory; @@ -1376,6 +1388,11 @@ 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_); @@ -1406,14 +1423,16 @@ void resign(void *idata, size_t isize, std::streambuf &output, const std::string })); } -static 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(); @@ -1447,6 +1466,7 @@ int main(int argc, char *argv[]) { Map entitlements; Map key; + ldid::Slots slots; std::vector files; @@ -1462,14 +1482,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; @@ -1484,11 +1523,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') { @@ -1521,7 +1562,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); @@ -1530,32 +1572,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, key); + const char *name(flag_I ?: base); + ldid::Sign(input.data(), input.size(), output, name, 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()) { @@ -1646,17 +1696,6 @@ int main(int argc, char *argv[]) { } } - 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;