X-Git-Url: https://git.saurik.com/ldid.git/blobdiff_plain/23fff9c86513730660d22f5eba0c85873e8bef09..f5db0fc2c3ba3137c5e8b76d577ccd58ae342a63:/ldid.cpp?ds=sidebyside diff --git a/ldid.cpp b/ldid.cpp index d95be4e..9619daf 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -23,27 +23,53 @@ #include #include #include -#include +#include +#include +#include #include #include #include +#include #include #include +#include #include #include #include #include #include +#include +#ifndef LDID_NOSMIME #include #include #include #include +#endif + +#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 +#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 +#endif -#include +#ifndef LDID_NOPLIST +#include +#endif #include "ldid.hpp" @@ -52,27 +78,37 @@ #define _assert__(line) \ _assert___(line) +#ifdef __EXCEPTIONS #define _assert_(expr, format, ...) \ do if (!(expr)) { \ fprintf(stderr, "%s(%u): _assert(): " format "\n", __FILE__, __LINE__, ## __VA_ARGS__); \ throw __FILE__ "(" _assert__(__LINE__) "): _assert(" #expr ")"; \ } while (false) +#else +// XXX: this is not acceptable +#define _assert_(expr, format, ...) \ + do if (!(expr)) { \ + fprintf(stderr, "%s(%u): _assert(): " format "\n", __FILE__, __LINE__, ## __VA_ARGS__); \ + exit(-1); \ + } while (false) +#endif #define _assert(expr) \ _assert_(expr, "%s", #expr) -#define _syscall(expr) ({ \ - __typeof__(expr) _value; \ - do if ((long) (_value = (expr)) != -1) \ - break; \ - else switch (errno) { \ - case EINTR: \ - continue; \ - default: \ - _assert_(false, "errno=%u", errno); \ - } while (true); \ - _value; \ -}) +#define _syscall(expr, ...) [&] { for (;;) { \ + auto _value(expr); \ + if ((long) _value != -1) \ + return _value; \ + int error(errno); \ + if (error == EINTR) \ + continue; \ + /* XXX: EINTR is included in this list to fix g++ */ \ + for (auto success : (long[]) {EINTR, __VA_ARGS__}) \ + if (error == success) \ + return (decltype(expr)) -success; \ + _assert_(false, "errno=%u", error); \ +} }() #define _trace() \ fprintf(stderr, "_trace(%s:%u): %s\n", __FILE__, __LINE__, __FUNCTION__) @@ -95,6 +131,40 @@ struct Iterator_ { for (bool _suck(true); _suck; _suck = false) \ for (const __typeof__(*_item) &item = *_item; _suck; _suck = false) +class _Scope { +}; + +template +class Scope : + public _Scope +{ + private: + Function_ function_; + + public: + Scope(const Function_ &function) : + function_(function) + { + } + + ~Scope() { + function_(); + } +}; + +template +Scope _scope(const Function_ &function) { + return Scope(function); +} + +#define _scope__(counter, function) \ + __attribute__((__unused__)) \ + const _Scope &_scope ## counter(_scope([&]function)) +#define _scope_(counter, function) \ + _scope__(counter, function) +#define _scope(function) \ + _scope_(__COUNTER__, function) + struct fat_header { uint32_t magic; uint32_t nfat_arch; @@ -800,10 +870,12 @@ struct CodeDirectory { uint32_t spare2; } _packed; +#ifndef LDID_NOFLAGT extern "C" uint32_t hash(uint8_t *k, uint32_t length, uint32_t initval); +#endif static void sha1(uint8_t *hash, const void *data, size_t size) { - SHA1(static_cast(data), size, hash); + LDID_SHA1(static_cast(data), size, hash); } struct CodesignAllocation { @@ -1145,6 +1217,7 @@ static size_t put(std::streambuf &output, uint32_t magic, const Blobs &blobs) { return offset; } +#ifndef LDID_NOSMIME class Buffer { private: BIO *bio_; @@ -1258,15 +1331,125 @@ class Signature { return value_; } }; +#endif + +class NullBuffer : + public std::streambuf +{ + public: + virtual std::streamsize xsputn(const char_type *data, std::streamsize size) { + return size; + } + + virtual int_type overflow(int_type next) { + return next; + } +}; + +class HashBuffer : + public std::streambuf +{ + private: + std::vector &hash_; + LDID_SHA1_CTX context_; + + public: + HashBuffer(std::vector &hash) : + hash_(hash) + { + LDID_SHA1_Init(&context_); + } + + ~HashBuffer() { + hash_.resize(LDID_SHA1_DIGEST_LENGTH); + LDID_SHA1_Final(reinterpret_cast(hash_.data()), &context_); + } + + virtual std::streamsize xsputn(const char_type *data, std::streamsize size) { + LDID_SHA1_Update(&context_, data, size); + return size; + } + + virtual int_type overflow(int_type next) { + if (next == traits_type::eof()) + return sync(); + char value(next); + xsputn(&value, 1); + return next; + } +}; + +class HashProxy : + public HashBuffer +{ + private: + std::streambuf &buffer_; + + public: + HashProxy(std::vector &hash, std::streambuf &buffer) : + HashBuffer(hash), + buffer_(buffer) + { + } + + virtual std::streamsize xsputn(const char_type *data, std::streamsize size) { + _assert(HashBuffer::xsputn(data, size) == size); + return buffer_.sputn(data, size); + } +}; + +static bool Starts(const std::string &lhs, const std::string &rhs) { + return lhs.size() >= rhs.size() && lhs.compare(0, rhs.size(), rhs) == 0; +} + +class Split { + public: + std::string dir; + std::string base; + + Split(const std::string &path) { + size_t slash(path.rfind('/')); + if (slash == std::string::npos) + base = path; + else { + dir = path.substr(0, slash + 1); + base = path.substr(slash + 1); + } + } +}; + +static void mkdir_p(const std::string &path) { + if (path.empty()) + return; +#ifdef __WIN32__ + if (_syscall(mkdir(path.c_str()), EEXIST) == -EEXIST) + return; +#else + if (_syscall(mkdir(path.c_str(), 0755), EEXIST) == -EEXIST) + return; +#endif + auto slash(path.rfind('/', path.size() - 1)); + if (slash == std::string::npos) + return; + mkdir_p(path.substr(0, slash)); +} + +static std::string Temporary(std::filebuf &file, const Split &split) { + std::string temp(split.dir + ".ldid." + split.base); + mkdir_p(split.dir); + _assert_(file.open(temp.c_str(), std::ios::out | std::ios::trunc | std::ios::binary) == &file, "open(): %s", temp.c_str()); + return temp; +} static void Commit(const std::string &path, const std::string &temp) { struct stat info; - _syscall(stat(path.c_str(), &info)); + if (_syscall(stat(path.c_str(), &info), ENOENT) == 0) { #ifndef __WIN32__ - _syscall(chown(temp.c_str(), info.st_uid, info.st_gid)); + _syscall(chown(temp.c_str(), info.st_uid, info.st_gid)); #endif - _syscall(chmod(temp.c_str(), info.st_mode)); - _syscall(unlink(path.c_str())); + _syscall(chmod(temp.c_str(), info.st_mode)); + } + _syscall(rename(temp.c_str(), path.c_str())); } @@ -1306,7 +1489,7 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st special = std::max(special, slot.first); uint32_t normal((size + PageSize_ - 1) / PageSize_); - alloc = Align(alloc + (special + normal) * SHA_DIGEST_LENGTH, 16); + 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 { Blobs blobs; @@ -1339,12 +1522,12 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st CodeDirectory directory; directory.version = Swap(uint32_t(0x00020001)); directory.flags = Swap(uint32_t(0)); - directory.hashOffset = Swap(uint32_t(sizeof(Blob) + sizeof(CodeDirectory) + identifier.size() + 1 + SHA_DIGEST_LENGTH * special)); + 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); - directory.hashSize = SHA_DIGEST_LENGTH; + directory.hashSize = LDID_SHA1_DIGEST_LENGTH; directory.hashType = CS_HASHTYPE_SHA1; directory.spare1 = 0x00; directory.pageSize = PageShift_; @@ -1353,8 +1536,8 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st put(data, identifier.c_str(), identifier.size() + 1); - uint8_t storage[special + normal][SHA_DIGEST_LENGTH]; - uint8_t (*hashes)[SHA_DIGEST_LENGTH] = storage + special; + uint8_t storage[special + normal][LDID_SHA1_DIGEST_LENGTH]; + uint8_t (*hashes)[LDID_SHA1_DIGEST_LENGTH] = storage + special; memset(storage, 0, sizeof(*storage) * special); @@ -1379,6 +1562,7 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st insert(blobs, CSSLOT_CODEDIRECTORY, CSMAGIC_CODEDIRECTORY, data); } +#ifndef LDID_NOSMIME if (!key.empty()) { std::stringbuf data; const std::string &sign(blobs[CSSLOT_CODEDIRECTORY]); @@ -1393,6 +1577,7 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st insert(blobs, CSSLOT_SIGNATURESLOT, CSMAGIC_BLOBWRAPPER, data); } +#endif return put(output, CSMAGIC_EMBEDDED_SIGNATURE, blobs); })); @@ -1406,10 +1591,449 @@ static void Unsign(void *idata, size_t isize, std::streambuf &output) { })); } +std::string DiskFolder::Path(const std::string &path) { + return path_ + "/" + path; +} + +DiskFolder::DiskFolder(const std::string &path) : + path_(path) +{ +} + +DiskFolder::~DiskFolder() { + if (!std::uncaught_exception()) + for (const auto &commit : commit_) + Commit(commit.first, commit.second); +} + +void DiskFolder::Find(const std::string &root, const std::string &base, const Functor &)> &)>&code) { + std::string path(Path(root) + base); + + DIR *dir(opendir(path.c_str())); + _assert(dir != NULL); + _scope({ _syscall(closedir(dir)); }); + + while (auto child = readdir(dir)) { + std::string name(child->d_name); + if (name == "." || name == "..") + continue; + if (Starts(name, ".ldid.")) + continue; + + bool directory; + +#ifdef __WIN32__ + struct stat info; + _syscall(stat(path.c_str(), &info)); + if (false); + else if (S_ISDIR(info.st_mode)) + directory = true; + else if (S_ISREG(info.st_mode)) + directory = false; + else + _assert_(false, "st_mode=%x", info.st_mode); +#else + switch (child->d_type) { + case DT_DIR: + directory = true; + break; + case DT_REG: + directory = false; + break; + default: + _assert_(false, "d_type=%u", child->d_type); + } +#endif + + if (directory) + Find(root, base + name + "/", code); + 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()); + })); + } +} + +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::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); + return true; +} + +void DiskFolder::Find(const std::string &path, const Functor &)> &)>&code) { + Find(path, "", code); +} + +SubFolder::SubFolder(Folder &parent, const std::string &path) : + parent_(parent), + path_(path) +{ +} + +void SubFolder::Save(const std::string &path, const Functor &code) { + return parent_.Save(path_ + path, code); +} + +bool SubFolder::Open(const std::string &path, const Functor &code) { + return parent_.Open(path_ + path, code); +} + +void SubFolder::Find(const std::string &path, const Functor &)> &)> &code) { + return parent_.Find(path_ + path, code); +} + +UnionFolder::UnionFolder(Folder &parent) : + parent_(parent) +{ +} + +void UnionFolder::Save(const std::string &path, const Functor &code) { + return parent_.Save(path, 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); + + auto &data(file->second); + data.pubseekpos(0, std::ios::in); + code(data); + 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()) + 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); + })); + })); +} + +static size_t copy(std::streambuf &source, std::streambuf &target) { + size_t total(0); + for (;;) { + char data[4096]; + size_t writ(source.sgetn(data, sizeof(data))); + if (writ == 0) + break; + _assert(target.sputn(data, writ) == writ); + total += writ; + } + return total; +} + +#ifndef LDID_NOPLIST +static plist_t plist(const std::string &data) { + plist_t plist(NULL); + if (Starts(data, "bplist00")) + plist_from_bin(data.data(), data.size(), &plist); + else + plist_from_xml(data.data(), data.size(), &plist); + _assert(plist != NULL); + return plist; +} + +static void plist_d(std::streambuf &buffer, const Functor &code) { + std::stringbuf data; + copy(buffer, data); + auto node(plist(data.str())); + _scope({ plist_free(node); }); + _assert(plist_get_node_type(node) == PLIST_DICT); + code(node); +} + +static std::string plist_s(plist_t node) { + _assert(node != NULL); + _assert(plist_get_node_type(node) == PLIST_STRING); + char *data; + plist_get_string_val(node, &data); + _scope({ free(data); }); + return data; +} +#endif + +enum Mode { + NoMode, + OptionalMode, + OmitMode, + NestedMode, + TopMode, +}; + +class Expression { + private: + regex_t regex_; + + public: + Expression(const std::string &code) { + _assert_(regcomp(®ex_, code.c_str(), REG_EXTENDED | REG_NOSUB) == 0, "regcomp()"); + } + + ~Expression() { + regfree(®ex_); + } + + bool operator ()(const std::string &data) const { + auto value(regexec(®ex_, data.c_str(), 0, NULL, 0)); + if (value == REG_NOMATCH) + return false; + _assert_(value == 0, "regexec()"); + return true; + } +}; + +struct Rule { + unsigned weight_; + Mode mode_; + std::string code_; + + mutable std::auto_ptr regex_; + + Rule(unsigned weight, Mode mode, const std::string &code) : + weight_(weight), + mode_(mode), + code_(code) + { + } + + Rule(const Rule &rhs) : + weight_(rhs.weight_), + mode_(rhs.mode_), + code_(rhs.code_) + { + } + + void Compile() const { + regex_.reset(new Expression(code_)); + } + + bool operator ()(const std::string &data) const { + _assert(regex_.get() != NULL); + return (*regex_)(data); + } + + bool operator <(const Rule &rhs) const { + if (weight_ > rhs.weight_) + return true; + if (weight_ < rhs.weight_) + return false; + return mode_ > rhs.mode_; + } +}; + +struct RuleCode { + bool operator ()(const Rule *lhs, const Rule *rhs) const { + return lhs->code_ < rhs->code_; + } +}; + +#ifndef LDID_NOPLIST +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) { + 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"); + + 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 + })); + })); + + 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, "^version.plist$"}); + } + + if (true) { + rules2.insert(Rule{11, NoMode, ".*\\.dSYM($|/)"}); + rules2.insert(Rule{20, NoMode, "^"}); + 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)$"}); + 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{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)$"}); + rules2.insert(Rule{10, NestedMode, "^[^/]+$"}); + rules2.insert(Rule{20, NoMode, "^embedded\\.provisionprofile$"}); + rules2.insert(Rule{20, NoMode, "^version\\.plist$"}); + } + + std::map> local; + + static Expression nested("^PlugIns/[^/]*\\.appex/Info\\.plist$"); + + folder.Find("", fun([&](const std::string &name, const Functor &)> &code) { + if (!nested(name)) + return; + auto bundle(root + Split(name).dir); + SubFolder subfolder(folder, bundle); + Bundle(bundle, subfolder, key, local, ""); + })); + + folder.Find("", fun([&](const std::string &name, const Functor &)> &code) { + if (name == executable || name == signature) + return; + + auto &hash(local[name]); + if (!hash.empty()) + return; + + code(fun([&](std::streambuf &data, std::streambuf &save) { + HashProxy proxy(hash, save); + copy(data, proxy); + })); + + _assert(hash.size() == LDID_SHA1_DIGEST_LENGTH); + })); + + auto plist(plist_new_dict()); + _scope({ plist_free(plist); }); + + for (const auto &version : versions) { + auto files(plist_new_dict()); + plist_dict_set_item(plist, ("files" + version.first).c_str(), files); + + for (const auto &rule : version.second) + rule.Compile(); + + 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) { + 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(files, hash.first.c_str(), entry); + } + + break; + } + } + + for (const auto &version : versions) { + auto rules(plist_new_dict()); + plist_dict_set_item(plist, ("rules" + version.first).c_str(), rules); + + std::multiset ordered; + for (const auto &rule : version.second) + ordered.insert(&rule); + + for (const auto &rule : ordered) + if (rule->weight_ == 1 && rule->mode_ == NoMode) + plist_dict_set_item(rules, rule->code_.c_str(), plist_new_bool(true)); + else { + auto entry(plist_new_dict()); + plist_dict_set_item(rules, rule->code_.c_str(), entry); + + switch (rule->mode_) { + case NoMode: + break; + case OmitMode: + plist_dict_set_item(entry, "omit", plist_new_bool(true)); + break; + case OptionalMode: + plist_dict_set_item(entry, "optional", plist_new_bool(true)); + break; + case NestedMode: + plist_dict_set_item(entry, "nested", plist_new_bool(true)); + break; + case TopMode: + plist_dict_set_item(entry, "top", plist_new_bool(true)); + break; + } + + if (rule->weight_ >= 10000) + plist_dict_set_item(entry, "weight", plist_new_uint(rule->weight_)); + else if (rule->weight_ != 1) + plist_dict_set_item(entry, "weight", plist_new_real(rule->weight_)); + } + } + + folder.Save(signature, fun([&](std::streambuf &save) { + HashProxy proxy(local[signature], save); + char *xml(NULL); + uint32_t size; + plist_to_xml(plist, &xml, &size); + _scope({ free(xml); }); + 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) { + 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); + })); + })); + + for (const auto &hash : local) + remote[root + hash.first] = hash.second; + + return executable; +} +#endif + } int main(int argc, char *argv[]) { +#ifndef LDID_NOSMIME OpenSSL_add_all_algorithms(); +#endif union { uint16_t word; @@ -1421,7 +2045,9 @@ int main(int argc, char *argv[]) { bool flag_r(false); bool flag_e(false); +#ifndef LDID_NOFLAGT bool flag_T(false); +#endif bool flag_S(false); bool flag_s(false); @@ -1436,8 +2062,10 @@ int main(int argc, char *argv[]) { const char *flag_I(NULL); +#ifndef LDID_NOFLAGT bool timeh(false); uint32_t timev(0); +#endif Map entitlements; Map key; @@ -1473,9 +2101,9 @@ int main(int argc, char *argv[]) { 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()); + std::vector &hash(slots[number]); + hash.resize(LDID_SHA1_DIGEST_LENGTH); + sha1(reinterpret_cast(hash.data()), file.data(), file.size()); } break; case 'D': flag_D = true; break; @@ -1517,6 +2145,7 @@ int main(int argc, char *argv[]) { key.open(argv[argi] + 2, O_RDONLY, PROT_READ, MAP_PRIVATE); break; +#ifndef LDID_NOFLAGT case 'T': { flag_T = true; if (argv[argi][2] == '-') @@ -1527,6 +2156,7 @@ int main(int argc, char *argv[]) { _assert(arge == argv[argi] + strlen(argv[argi])); } } break; +#endif case 'I': { flag_I = argv[argi] + 2; @@ -1548,35 +2178,44 @@ int main(int argc, char *argv[]) { _foreach (file, files) try { std::string path(file); - if (flag_S || flag_r) { + struct stat info; + _syscall(stat(path.c_str(), &info)); + + if (S_ISDIR(info.st_mode)) { +#ifndef LDID_NOPLIST + _assert(!flag_r); + ldid::DiskFolder folder(path); + std::map> hashes; + path += "/" + Bundle("", folder, key, hashes, entitlements); +#else + _assert(false); +#endif + } else if (flag_S || flag_r) { Map input(path, O_RDONLY, PROT_READ, MAP_PRIVATE); - std::string dir; - std::string base; - - size_t slash(path.rfind('/')); - if (slash == std::string::npos) - base = path; - else { - dir = path.substr(0, slash + 1); - base = path.substr(slash + 1); - } - - 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); + Split split(path); + auto temp(Temporary(output, split)); if (flag_r) ldid::Unsign(input.data(), input.size(), output); else { - std::string identifier(flag_I ?: base.c_str()); + std::string identifier(flag_I ?: split.base.c_str()); ldid::Sign(input.data(), input.size(), output, identifier, entitlements, key, slots); } Commit(path, temp); } - Map mapping(path, flag_T || flag_s); + bool modify(false); +#ifndef LDID_NOFLAGT + if (flag_T) + modify = true; +#endif + if (flag_s) + modify = true; + + Map mapping(path, modify); FatHeader fat_header(mapping.data(), mapping.size()); _foreach (mach_header, fat_header.GetMachHeaders()) { @@ -1601,6 +2240,7 @@ 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); +#ifndef LDID_NOFLAGT else if (cmd == LC_ID_DYLIB) { volatile struct dylib_command *dylib_command(reinterpret_cast(load_command)); @@ -1617,6 +2257,7 @@ int main(int argc, char *argv[]) { dylib_command->dylib.timestamp = mach_header.Swap(timed); } } +#endif } if (flag_D) { @@ -1655,7 +2296,7 @@ int main(int argc, char *argv[]) { uint32_t begin = Swap(super->index[index].offset); struct CodeDirectory *directory = reinterpret_cast(blob + begin); - uint8_t (*hashes)[SHA_DIGEST_LENGTH] = reinterpret_cast(blob + begin + Swap(directory->hashOffset)); + uint8_t (*hashes)[LDID_SHA1_DIGEST_LENGTH] = reinterpret_cast(blob + begin + Swap(directory->hashOffset)); uint32_t pages = Swap(directory->nCodeSlots); if (pages != 1)