X-Git-Url: https://git.saurik.com/ldid.git/blobdiff_plain/fac3d3e373c2dcbe20a73aea30d056b033f961bf..ffdd118300990943b913bf05912d83cce6d53a87:/ldid.cpp diff --git a/ldid.cpp b/ldid.cpp index a6b86d2..db0209a 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -45,19 +45,22 @@ #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) \ @@ -66,7 +69,7 @@ case EINTR: \ continue; \ default: \ - _assert(false); \ + _assert_(false, "errno=%u", errno); \ } while (true); \ _value; \ }) @@ -839,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 { @@ -898,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) { @@ -921,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 { -static 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()) @@ -1137,6 +1100,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) { @@ -1294,8 +1259,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(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); @@ -1315,7 +1282,7 @@ 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; if (!key.empty()) { alloc += sizeof(struct BlobIndex); @@ -1324,6 +1291,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; @@ -1351,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); + _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)); @@ -1368,7 +1340,7 @@ void resign(void *idata, size_t isize, std::streambuf &output, const std::string 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; @@ -1380,6 +1352,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_); @@ -1410,14 +1387,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(); @@ -1451,6 +1430,7 @@ int main(int argc, char *argv[]) { Map entitlements; Map key; + ldid::Slots slots; std::vector files; @@ -1474,6 +1454,19 @@ int main(int argc, char *argv[]) { 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; @@ -1543,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, key); + 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()) { @@ -1659,17 +1660,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;