#define MH_OBJECT 0x1
#define MH_EXECUTE 0x2
#define MH_DYLIB 0x6
+#define MH_DYLINKER 0x7
#define MH_BUNDLE 0x8
#define MH_DYLIB_STUB 0x9
_assert(
Swap(mach_header_->filetype) == MH_EXECUTE ||
Swap(mach_header_->filetype) == MH_DYLIB ||
+ Swap(mach_header_->filetype) == MH_DYLINKER ||
Swap(mach_header_->filetype) == MH_BUNDLE
);
}
#define CS_HASHTYPE_SHA256_160 3
#define CS_HASHTYPE_SHA386_386 4
+#if 0
+#define CS_EXECSEG_MAIN_BINARY 0x001 /* executable segment denotes main binary */
+#define CS_EXECSEG_ALLOW_UNSIGNED 0x010 /* allow unsigned pages (for debugging) */
+#define CS_EXECSEG_DEBUGGER 0x020 /* main binary is debugger */
+#define CS_EXECSEG_JIT 0x040 /* JIT enabled */
+#define CS_EXECSEG_SKIP_LV 0x080 /* skip library validation */
+#define CS_EXECSEG_CAN_LOAD_CDHASH 0x100 /* can bless cdhash for execution */
+#define CS_EXECSEG_CAN_EXEC_CDHASH 0x200 /* can execute blessed cdhash */
+#else
+enum SecCodeExecSegFlags {
+ kSecCodeExecSegMainBinary = 0x001,
+ kSecCodeExecSegAllowUnsigned = 0x010,
+ kSecCodeExecSegDebugger = 0x020,
+ kSecCodeExecSegJit = 0x040,
+ kSecCodeExecSegSkipLibraryVal = 0x080,
+ kSecCodeExecSegCanLoadCdHash = 0x100,
+ kSecCodeExecSegCanExecCdHash = 0x100,
+};
+#endif
+
struct BlobIndex {
uint32_t type;
uint32_t offset;
uint32_t spare2;
uint32_t scatterOffset;
uint32_t teamIDOffset;
- //uint32_t spare3;
- //uint64_t codeLimit64;
+ uint32_t spare3;
+ uint64_t codeLimit64;
+ uint64_t execSegBase;
+ uint64_t execSegLimit;
+ uint64_t execSegFlags;
+#if 0 // version = 0x20500
+ uint32_t runtime;
+ uint32_t preEncryptOffset;
+#endif
+#if 0 // version = 0x20600
+ uint8_t linkageHashType;
+ uint8_t linkageTruncated;
+ uint16_t spare4;
+ uint32_t linkageOffset;
+ uint32_t linkageSize;
+#endif
} _packed;
enum CodeSignatureFlags {
kSecCodeSignatureRestrict = 0x0800,
kSecCodeSignatureEnforcement = 0x1000,
kSecCodeSignatureLibraryValidation = 0x2000,
+ kSecCodeSignatureRuntime = 0x10000,
};
enum Kind : uint32_t {
}
};
+static bool do_sha1(true);
+static bool do_sha256(true);
+
static const std::vector<Algorithm *> &GetAlgorithms() {
static AlgorithmSHA1 sha1;
static AlgorithmSHA256 sha256;
- static Algorithm *array[] = {
- &sha1,
- &sha256,
- };
+ static std::vector<Algorithm *> algorithms;
+ if (algorithms.empty()) {
+ if (do_sha1)
+ algorithms.push_back(&sha1);
+ if (do_sha256)
+ algorithms.push_back(&sha256);
+ }
- static std::vector<Algorithm *> algorithms(array, array + sizeof(array) / sizeof(array[0]));
return algorithms;
}
+struct Baton {
+ std::string entitlements_;
+};
+
struct CodesignAllocation {
FatMachHeader mach_header_;
- uint32_t offset_;
+ uint64_t offset_;
uint32_t size_;
- uint32_t limit_;
+ uint64_t limit_;
uint32_t alloc_;
uint32_t align_;
const char *arch_;
+ Baton baton_;
- CodesignAllocation(FatMachHeader mach_header, size_t offset, size_t size, size_t limit, size_t alloc, size_t align, const char *arch) :
+ CodesignAllocation(FatMachHeader mach_header, size_t offset, size_t size, size_t limit, size_t alloc, size_t align, const char *arch, const Baton &baton) :
mach_header_(mach_header),
offset_(offset),
size_(size),
limit_(limit),
alloc_(alloc),
align_(align),
- arch_(arch)
+ arch_(arch),
+ baton_(baton)
{
}
};
namespace ldid {
+#ifndef LDID_NOPLIST
+static plist_t plist(const std::string &data);
+#endif
+
+void Analyze(const MachHeader &mach_header, const Functor<void (const char *data, size_t size)> &entitle) {
+ _foreach (load_command, mach_header.GetLoadCommands())
+ if (mach_header.Swap(load_command->cmd) == LC_CODE_SIGNATURE) {
+ auto signature(reinterpret_cast<struct linkedit_data_command *>(load_command));
+ auto offset(mach_header.Swap(signature->dataoff));
+ auto pointer(reinterpret_cast<uint8_t *>(mach_header.GetBase()) + offset);
+ auto super(reinterpret_cast<struct SuperBlob *>(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<struct Blob *>(pointer + begin));
+ auto writ(Swap(blob->length) - sizeof(*blob));
+ entitle(reinterpret_cast<char *>(blob + 1), writ);
+ }
+ }
+}
+
std::string Analyze(const void *data, size_t size) {
std::string entitlements;
FatHeader fat_header(const_cast<void *>(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<struct linkedit_data_command *>(load_command));
- auto offset(mach_header.Swap(signature->dataoff));
- auto pointer(reinterpret_cast<uint8_t *>(mach_header.GetBase()) + offset);
- auto super(reinterpret_cast<struct SuperBlob *>(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<struct Blob *>(pointer + begin));
- auto writ(Swap(blob->length) - sizeof(*blob));
-
- if (entitlements.empty())
- entitlements.assign(reinterpret_cast<char *>(blob + 1), writ);
- else
- _assert(entitlements.compare(0, entitlements.size(), reinterpret_cast<char *>(blob + 1), writ) == 0);
- }
- }
+ Analyze(mach_header, fun([&](const char *data, size_t size) {
+ if (entitlements.empty())
+ entitlements.assign(data, size);
+ else
+ _assert(entitlements.compare(0, entitlements.size(), data, size) == 0);
+ }));
return entitlements;
}
-static void Allocate(const void *idata, size_t isize, std::streambuf &output, const Functor<size_t (const MachHeader &, size_t)> &allocate, const Functor<size_t (const MachHeader &, std::streambuf &output, size_t, const std::string &, const char *, const Progress &)> &save, const Progress &progress) {
+static void Allocate(const void *idata, size_t isize, std::streambuf &output, const Functor<size_t (const MachHeader &, Baton &, size_t)> &allocate, const Functor<size_t (const MachHeader &, const Baton &, std::streambuf &output, size_t, size_t, size_t, const std::string &, const char *, const Progress &)> &save, const Progress &progress) {
FatHeader source(const_cast<void *>(idata), isize);
size_t offset(0);
}
}
- size_t alloc(allocate(mach_header, size));
+ Baton baton;
+ size_t alloc(allocate(mach_header, baton, size));
auto *fat_arch(mach_header.GetFatArch());
uint32_t align;
if (alloc != 0)
limit = Align(limit, 0x10);
- allocations.push_back(CodesignAllocation(mach_header, offset, size, limit, alloc, align, arch));
+ allocations.push_back(CodesignAllocation(mach_header, offset, size, limit, alloc, align, arch, baton));
offset += size + alloc;
offset = Align(offset, 0x10);
}
put(output, &fat_header, sizeof(fat_header));
position += sizeof(fat_header);
+ // XXX: support fat_arch_64 (not in my toolchain)
+ // probably use C++14 generic lambda (not in my toolchain)
+
+ _assert_(![&]() {
+ _foreach (allocation, allocations) {
+ const auto offset(allocation.offset_);
+ const auto size(allocation.limit_ + allocation.alloc_);
+ if (uint32_t(offset) != offset || uint32_t(size) != size)
+ return true;
+ }
+ return false;
+ }(), "FAT slice >=4GiB not currently supported");
+
_foreach (allocation, allocations) {
auto &mach_header(allocation.mach_header_);
fat_arch fat_arch;
fat_arch.cputype = Swap(mach_header->cputype);
fat_arch.cpusubtype = Swap(mach_header->cpusubtype);
- fat_arch.offset = Swap(allocation.offset_);
- fat_arch.size = Swap(allocation.limit_ + allocation.alloc_);
+ fat_arch.offset = Swap(uint32_t(allocation.offset_));
+ fat_arch.size = Swap(uint32_t(allocation.limit_ + allocation.alloc_));
fat_arch.align = Swap(allocation.align_);
put(output, &fat_arch, sizeof(fat_arch));
position += sizeof(fat_arch);
pad(output, allocation.offset_ - position);
position = allocation.offset_;
+ size_t left(-1);
+ size_t right(0);
+
std::vector<std::string> commands;
_foreach (load_command, mach_header.GetLoadCommands()) {
continue;
break;
+ // XXX: this is getting ridiculous: provide a better abstraction
+
case LC_SEGMENT: {
auto segment_command(reinterpret_cast<struct segment_command *>(©[0]));
- if (strncmp(segment_command->segname, "__LINKEDIT", 16) != 0)
- 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, 1 << allocation.align_);
+
+ if ((segment_command->initprot & 04) != 0) {
+ auto begin(mach_header.Swap(segment_command->fileoff));
+ auto end(begin + mach_header.Swap(segment_command->filesize));
+ if (left > begin)
+ left = begin;
+ if (right < end)
+ right = end;
+ }
+
+ if (strncmp(segment_command->segname, "__LINKEDIT", 16) == 0) {
+ 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, 1 << allocation.align_);
+ }
} break;
case LC_SEGMENT_64: {
auto segment_command(reinterpret_cast<struct segment_command_64 *>(©[0]));
- if (strncmp(segment_command->segname, "__LINKEDIT", 16) != 0)
- 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, 1 << allocation.align_);
+
+ if ((segment_command->initprot & 04) != 0) {
+ auto begin(mach_header.Swap(segment_command->fileoff));
+ auto end(begin + mach_header.Swap(segment_command->filesize));
+ if (left > begin)
+ left = begin;
+ if (right < end)
+ right = end;
+ }
+
+ if (strncmp(segment_command->segname, "__LINKEDIT", 16) == 0) {
+ 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, 1 << allocation.align_);
+ }
} break;
}
pad(output, allocation.limit_ - allocation.size_);
position += allocation.limit_ - allocation.size_;
- size_t saved(save(mach_header, output, allocation.limit_, overlap, top, progress));
+ size_t saved(save(mach_header, allocation.baton_, output, allocation.limit_, left, right, overlap, top, progress));
if (allocation.alloc_ > saved)
pad(output, allocation.alloc_ - saved);
else
for (unsigned i(0), e(sk_X509_num(certs)); i != e; i++)
_assert(PKCS7_add_certificate(value_, sk_X509_value(certs, e - i - 1)));
- auto info(PKCS7_sign_add_signer(value_, stuff, stuff, NULL, PKCS7_NOSMIMECAP));
+ // XXX: this is the same as PKCS7_sign_add_signer(value_, stuff, stuff, NULL, PKCS7_NOSMIMECAP)
+ _assert(X509_check_private_key(stuff, stuff));
+ auto info(PKCS7_add_signature(value_, stuff, stuff, EVP_sha1()));
_assert(info != NULL);
+ _assert(PKCS7_add_certificate(value_, stuff));
+ _assert(PKCS7_add_signed_attribute(info, NID_pkcs9_contentType, V_ASN1_OBJECT, OBJ_nid2obj(NID_pkcs7_data)));
PKCS7_set_detached(value_, 1);
throw;
}
- _assert(PKCS7_final(value_, data, PKCS7_BINARY));
+ // XXX: this is the same as PKCS7_final(value_, data, PKCS7_BINARY)
+ BIO *bio(PKCS7_dataInit(value_, NULL));
+ _assert(bio != NULL);
+ _scope({ BIO_free_all(bio); });
+ SMIME_crlf_copy(data, bio, PKCS7_BINARY);
+ BIO_flush(bio);
+ _assert(PKCS7_dataFinal(value_, bio));
}
~Signature() {
}
};
-class Digest {
- public:
- uint8_t sha1_[LDID_SHA1_DIGEST_LENGTH];
-};
-
class HashBuffer :
public std::streambuf
{
put(buffer, zeros, 3 - (Size_ + 3) % 4);
}
-Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, const std::string &requirements, const std::string &key, const Slots &slots, uint32_t flags, bool platform, const Progress &progress) {
+Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, bool merge, const std::string &requirements, const std::string &key, const Slots &slots, uint32_t flags, bool platform, const Progress &progress) {
Hash hash;
// 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 {
+ Allocate(idata, isize, output, fun([&](const MachHeader &mach_header, Baton &baton, size_t size) -> size_t {
size_t alloc(sizeof(struct SuperBlob));
uint32_t normal((size + PageSize_ - 1) / PageSize_);
alloc += sizeof(struct BlobIndex);
alloc += backing.str().size();
- if (!entitlements.empty()) {
+ if (!merge)
+ baton.entitlements_ = entitlements;
+ else {
+#ifndef LDID_NOPLIST
+ Analyze(mach_header, fun([&](const char *data, size_t size) {
+ baton.entitlements_.assign(data, size);
+ }));
+
+ if (baton.entitlements_.empty())
+ baton.entitlements_ = entitlements;
+ else if (!entitlements.empty()) {
+ auto combined(plist(baton.entitlements_));
+ _scope({ plist_free(combined); });
+ _assert(plist_get_node_type(combined) == PLIST_DICT);
+
+ auto merging(plist(entitlements));
+ _scope({ plist_free(merging); });
+ _assert(plist_get_node_type(merging) == PLIST_DICT);
+
+ plist_dict_iter iterator(NULL);
+ plist_dict_new_iter(merging, &iterator);
+ _scope({ free(iterator); });
+
+ for (;;) {
+ char *key(NULL);
+ plist_t value(NULL);
+ plist_dict_next_item(merging, iterator, &key, &value);
+ if (key == NULL)
+ break;
+ _scope({ free(key); });
+ plist_dict_set_item(combined, key, plist_copy(value));
+ }
+
+ char *xml(NULL);
+ uint32_t size;
+ plist_to_xml(combined, &xml, &size);
+ _scope({ free(xml); });
+
+ baton.entitlements_.assign(xml, size);
+ }
+#else
+ _assert(false);
+#endif
+ }
+
+ if (!baton.entitlements_.empty()) {
special = std::max(special, CSSLOT_ENTITLEMENTS);
alloc += sizeof(struct BlobIndex);
alloc += sizeof(struct Blob);
- alloc += entitlements.size();
+ alloc += baton.entitlements_.size();
}
size_t directory(0);
#endif
return alloc;
- }), fun([&](const MachHeader &mach_header, std::streambuf &output, size_t limit, const std::string &overlap, const char *top, const Progress &progress) -> size_t {
+ }), fun([&](const MachHeader &mach_header, const Baton &baton, std::streambuf &output, size_t limit, size_t left, size_t right, const std::string &overlap, const char *top, const Progress &progress) -> size_t {
Blobs blobs;
if (true) {
insert(blobs, CSSLOT_REQUIREMENTS, backing);
}
- if (!entitlements.empty()) {
+ uint64_t execs(0);
+ if (mach_header.Swap(mach_header->filetype) == MH_EXECUTE)
+ execs |= kSecCodeExecSegMainBinary;
+
+ if (!baton.entitlements_.empty()) {
std::stringbuf data;
- put(data, entitlements.data(), entitlements.size());
+ put(data, baton.entitlements_.data(), baton.entitlements_.size());
insert(blobs, CSSLOT_ENTITLEMENTS, CSMAGIC_EMBEDDED_ENTITLEMENTS, data);
+
+#ifndef LDID_NOPLIST
+ auto entitlements(plist(baton.entitlements_));
+ _scope({ plist_free(entitlements); });
+ _assert(plist_get_node_type(entitlements) == PLIST_DICT);
+
+ const auto entitled([&](const char *key) {
+ auto item(plist_dict_get_item(entitlements, key));
+ if (plist_get_node_type(item) != PLIST_BOOLEAN)
+ return false;
+ uint8_t value(0);
+ plist_get_bool_val(item, &value);
+ return value != 0;
+ });
+
+ if (entitled("get-task-allow"))
+ execs |= kSecCodeExecSegAllowUnsigned;
+ if (entitled("run-unsigned-code"))
+ execs |= kSecCodeExecSegAllowUnsigned;
+ if (entitled("com.apple.private.cs.debugger"))
+ execs |= kSecCodeExecSegDebugger;
+ if (entitled("dynamic-codesigning"))
+ execs |= kSecCodeExecSegJit;
+ if (entitled("com.apple.private.skip-library-validation"))
+ execs |= kSecCodeExecSegSkipLibraryVal;
+ if (entitled("com.apple.private.amfi.can-load-cdhash"))
+ execs |= kSecCodeExecSegCanLoadCdHash;
+ if (entitled("com.apple.private.amfi.can-execute-cdhash"))
+ execs |= kSecCodeExecSegCanExecCdHash;
+#endif
}
Slots posts(slots);
uint32_t normal((limit + PageSize_ - 1) / PageSize_);
CodeDirectory directory;
- directory.version = Swap(uint32_t(0x00020200));
+ directory.version = Swap(uint32_t(0x00020400));
directory.flags = Swap(uint32_t(flags));
directory.nSpecialSlots = Swap(special);
- directory.codeLimit = Swap(uint32_t(limit));
+ directory.codeLimit = Swap(uint32_t(limit > UINT32_MAX ? UINT32_MAX : limit));
directory.nCodeSlots = Swap(normal);
directory.hashSize = algorithm.size_;
directory.hashType = algorithm.type_;
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));
+ directory.spare3 = Swap(uint32_t(0));
+ directory.codeLimit64 = Swap(uint64_t(limit > UINT32_MAX ? limit : 0));
+ directory.execSegBase = Swap(uint64_t(left));
+ directory.execSegLimit = Swap(uint64_t(right - left));
+ directory.execSegFlags = Swap(execs);
uint32_t offset(sizeof(Blob) + sizeof(CodeDirectory));
#ifndef LDID_NOTOOLS
static void Unsign(void *idata, size_t isize, std::streambuf &output, const Progress &progress) {
- Allocate(idata, isize, output, fun([](const MachHeader &mach_header, size_t size) -> size_t {
+ Allocate(idata, isize, output, fun([](const MachHeader &mach_header, Baton &baton, size_t size) -> size_t {
return 0;
- }), fun([](const MachHeader &mach_header, std::streambuf &output, size_t limit, const std::string &overlap, const char *top, const Progress &progress) -> size_t {
+ }), fun([](const MachHeader &mach_header, const Baton &baton, std::streambuf &output, size_t limit, size_t left, size_t right, const std::string &overlap, const char *top, const Progress &progress) -> size_t {
return 0;
}), progress);
}
std::string DiskFolder::Path(const std::string &path) const {
- return path_ + "/" + path;
+ return path_ + path;
}
DiskFolder::DiskFolder(const std::string &path) :
path_(path)
{
+ _assert_(path_.size() != 0 && path_[path_.size() - 1] == '/', "missing / on %s", path_.c_str());
}
DiskFolder::~DiskFolder() {
void DiskFolder::Open(const std::string &path, const Functor<void (std::streambuf &, size_t, const void *)> &code) const {
std::filebuf data;
auto result(data.open(Path(path).c_str(), std::ios::binary | std::ios::in));
- _assert_(result == &data, "DiskFolder::Open(%s)", path.c_str());
+ _assert_(result == &data, "DiskFolder::Open(%s)", Path(path).c_str());
auto length(data.pubseekoff(0, std::ios::end, std::ios::in));
data.pubseekpos(0, std::ios::in);
parent_(parent),
path_(path)
{
+ _assert_(path_.size() == 0 || path_[path_.size() - 1] == '/', "missing / on %s", path_.c_str());
+}
+
+std::string SubFolder::Path(const std::string &path) const {
+ return path_ + path;
}
void SubFolder::Save(const std::string &path, bool edit, const void *flag, const Functor<void (std::streambuf &)> &code) {
- return parent_.Save(path_ + path, edit, flag, code);
+ return parent_.Save(Path(path), edit, flag, code);
}
bool SubFolder::Look(const std::string &path) const {
- return parent_.Look(path_ + path);
+ return parent_.Look(Path(path));
}
void SubFolder::Open(const std::string &path, const Functor<void (std::streambuf &, size_t, const void *)> &code) const {
- return parent_.Open(path_ + path, code);
+ return parent_.Open(Path(path), code);
}
void SubFolder::Find(const std::string &path, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const {
- return parent_.Find(path_ + path, code, link);
+ return parent_.Find(Path(path), code, link);
}
std::string UnionFolder::Map(const std::string &path) const {
};
#ifndef LDID_NOPLIST
-static Hash 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 &requirements, const std::string &key, const Slots &slots, size_t length, uint32_t flags, bool platform, const Progress &progress) {
+static Hash Sign(const uint8_t *prefix, size_t size, std::streambuf &buffer, Hash &hash, std::streambuf &save, const std::string &identifier, const std::string &entitlements, bool merge, const std::string &requirements, const std::string &key, const Slots &slots, size_t length, uint32_t flags, bool platform, const Progress &progress) {
// XXX: this is a miserable fail
std::stringbuf temp;
put(temp, prefix, size);
auto data(temp.str());
HashProxy proxy(hash, save);
- return Sign(data.data(), data.size(), proxy, identifier, entitlements, requirements, key, slots, flags, platform, percent);
+ return Sign(data.data(), data.size(), proxy, identifier, entitlements, merge, requirements, key, slots, flags, platform, progress);
}
-Bundle Sign(const std::string &root, Folder &folder, const std::string &key, std::map<std::string, Hash> &remote, const std::string &requirements, const Functor<std::string (const std::string &, const std::string &)> &alter, const Progress &progress) {
+struct State {
+ std::map<std::string, Hash> files;
+ std::map<std::string, std::string> links;
+
+ void Merge(const std::string &root, const State &state) {
+ for (const auto &entry : state.files)
+ files[root + entry.first] = entry.second;
+ for (const auto &entry : state.links)
+ links[root + entry.first] = entry.second;
+ }
+};
+
+Bundle Sign(const std::string &root, Folder &parent, const std::string &key, State &remote, const std::string &requirements, const Functor<std::string (const std::string &, const std::string &)> &alter, const Progress &progress) {
std::string executable;
std::string identifier;
bool mac(false);
std::string info("Info.plist");
- if (!folder.Look(info) && folder.Look("Resources/" + info)) {
+
+ SubFolder folder(parent, [&]() {
+ if (parent.Look(info))
+ return "";
mac = true;
- info = "Resources/" + info;
- }
+ if (false);
+ else if (parent.Look("Contents/" + info))
+ return "Contents/";
+ else if (parent.Look("Resources/" + info)) {
+ info = "Resources/" + info;
+ return "";
+ } else _assert_(false, "cannot find Info.plist");
+ }());
folder.Open(info, fun([&](std::streambuf &buffer, size_t length, const void *flag) {
plist_d(buffer, length, fun([&](plist_t node) {
}));
}));
- if (!mac && folder.Look("MacOS/" + executable)) {
+ if (mac && info == "Info.plist")
executable = "MacOS/" + executable;
- mac = true;
- }
progress(root + "*");
const std::string resources(mac ? "Resources/" : "");
if (true) {
- rules1.insert(Rule{1, NoMode, "^" + resources});
+ rules1.insert(Rule{1, NoMode, "^" + (resources == "" ? ".*" : resources)});
rules1.insert(Rule{1000, OptionalMode, "^" + resources + ".*\\.lproj/"});
rules1.insert(Rule{1100, OmitMode, "^" + resources + ".*\\.lproj/locversion.plist$"});
- rules1.insert(Rule{1010, NoMode, "^Base\\.lproj/"});
+ rules1.insert(Rule{1010, NoMode, "^" + resources + "Base\\.lproj/"});
rules1.insert(Rule{1, NoMode, "^version.plist$"});
}
if (true) {
rules2.insert(Rule{11, NoMode, ".*\\.dSYM($|/)"});
- rules2.insert(Rule{20, NoMode, "^" + resources});
+ if (mac) rules2.insert(Rule{20, NoMode, "^" + resources});
rules2.insert(Rule{2000, OmitMode, "^(.*/)?\\.DS_Store$"});
- rules2.insert(Rule{10, NestedMode, "^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/"});
+ if (mac) 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, "^" + resources + ".*\\.lproj/"});
rules2.insert(Rule{1100, OmitMode, "^" + resources + ".*\\.lproj/locversion.plist$"});
- rules2.insert(Rule{1010, NoMode, "^Base\\.lproj/"});
+ if (!mac) rules2.insert(Rule{1010, NoMode, "^Base\\.lproj/"});
rules2.insert(Rule{20, OmitMode, "^Info\\.plist$"});
rules2.insert(Rule{20, OmitMode, "^PkgInfo$"});
- rules2.insert(Rule{10, NestedMode, "^[^/]+$"});
+ if (mac) rules2.insert(Rule{10, NestedMode, "^[^/]+$"});
rules2.insert(Rule{20, NoMode, "^embedded\\.provisionprofile$"});
+ if (mac) rules2.insert(Rule{1010, NoMode, "^" + resources + "Base\\.lproj/"});
rules2.insert(Rule{20, NoMode, "^version\\.plist$"});
}
- std::map<std::string, Hash> local;
+ State local;
std::string failure(mac ? "Contents/|Versions/[^/]*/Resources/" : "");
Expression nested("^(Frameworks/[^/]*\\.framework|PlugIns/[^/]*\\.appex(()|/[^/]*.app))/(" + failure + ")Info\\.plist$");
if (!nested(name))
return;
auto bundle(root + Split(name).dir);
- bundle.resize(bundle.size() - resources.size());
+ if (mac) {
+ _assert(!bundle.empty());
+ bundle = Split(bundle.substr(0, bundle.size() - 1)).dir;
+ }
SubFolder subfolder(folder, bundle);
bundles[nested[1]] = Sign(bundle, subfolder, key, local, "", Starts(name, "PlugIns/") ? alter :
return false;
});
- std::map<std::string, std::string> links;
-
folder.Find("", fun([&](const std::string &name) {
if (exclude(name))
return;
- if (local.find(name) != local.end())
+ if (local.files.find(name) != local.files.end())
return;
- auto &hash(local[name]);
+ auto &hash(local.files[name]);
folder.Open(name, fun([&](std::streambuf &data, size_t length, const void *flag) {
progress(root + name);
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, length, 0, false, Progression(progress, root + name));
+ Sign(header.bytes, size, data, hash, save, identifier, "", false, "", key, slots, length, 0, false, Progression(progress, root + name));
}));
return;
}
if (exclude(name))
return;
- links[name] = read();
+ local.links[name] = read();
}));
auto plist(plist_new_dict());
bool old(&version.second == &rules1);
- for (const auto &hash : local)
+ for (const auto &hash : local.files)
for (const auto &rule : version.second)
if (rule(hash.first)) {
if (!old && mac && excludes.find(hash.first) != excludes.end());
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);
- }
+ if (!old)
+ for (const auto &link : local.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;
- }
+ break;
+ }
if (!old && mac)
for (const auto &bundle : bundles) {
}
folder.Save(signature, true, NULL, fun([&](std::streambuf &save) {
- HashProxy proxy(local[signature], save);
+ HashProxy proxy(local.files[signature], save);
char *xml(NULL);
uint32_t size;
plist_to_xml(plist, &xml, &size);
}));
Bundle bundle;
- bundle.path = executable;
+ bundle.path = folder.Path(executable);
folder.Open(executable, fun([&](std::streambuf &buffer, size_t length, const void *flag) {
progress(root + executable);
folder.Save(executable, true, flag, fun([&](std::streambuf &save) {
Slots slots;
- slots[1] = local.at(info);
- slots[3] = local.at(signature);
- bundle.hash = Sign(NULL, 0, buffer, local[executable], save, identifier, entitlements, requirements, key, slots, length, 0, false, Progression(progress, root + executable));
+ slots[1] = local.files.at(info);
+ slots[3] = local.files.at(signature);
+ bundle.hash = Sign(NULL, 0, buffer, local.files[executable], save, identifier, entitlements, false, requirements, key, slots, length, 0, false, Progression(progress, root + executable));
}));
}));
- for (const auto &entry : local)
- remote[root + entry.first] = entry.second;
-
+ remote.Merge(root, local);
return bundle;
}
Bundle Sign(const std::string &root, Folder &folder, const std::string &key, const std::string &requirements, const Functor<std::string (const std::string &, const std::string &)> &alter, const Progress &progress) {
- std::map<std::string, Hash> local;
+ State local;
return Sign(root, folder, key, local, requirements, alter, progress);
}
#endif
#endif
}
+std::string Hex(const uint8_t *data, size_t size) {
+ std::string hex;
+ hex.reserve(size * 2);
+ for (size_t i(0); i != size; ++i) {
+ hex += "0123456789abcdef"[data[i] >> 4];
+ hex += "0123456789abcdef"[data[i] & 0xf];
+ }
+ return hex;
+}
+
+static void usage(const char *argv0) {
+ fprintf(stderr, "usage: %s -S[entitlements.xml] <binary>\n", argv0);
+ fprintf(stderr, " %s -e MobileSafari\n", argv0);
+ fprintf(stderr, " %s -S cat\n", argv0);
+ fprintf(stderr, " %s -Stfp.xml gdb\n", argv0);
+}
+
#ifndef LDID_NOTOOLS
int main(int argc, char *argv[]) {
#ifndef LDID_NOSMIME
bool flag_e(false);
bool flag_q(false);
+ bool flag_H(false);
+ bool flag_h(false);
+
#ifndef LDID_NOFLAGT
bool flag_T(false);
#endif
bool flag_s(false);
bool flag_D(false);
+ bool flag_d(false);
bool flag_A(false);
bool flag_a(false);
bool flag_u(false);
+ bool flag_M(false);
+
uint32_t flags(0);
bool platform(false);
std::vector<std::string> files;
if (argc == 1) {
- fprintf(stderr, "usage: %s -S[entitlements.xml] <binary>\n", argv[0]);
- fprintf(stderr, " %s -e MobileSafari\n", argv[0]);
- fprintf(stderr, " %s -S cat\n", argv[0]);
- fprintf(stderr, " %s -Stfp.xml gdb\n", argv[0]);
- exit(0);
+ usage(argv[0]);
+ return 0;
}
for (int argi(1); argi != argc; ++argi)
case 'q': flag_q = true; break;
+ case 'H': {
+ const char *hash = argv[argi] + 2;
+
+ if (!flag_H) {
+ flag_H = true;
+
+ do_sha1 = false;
+ do_sha256 = false;
+
+ fprintf(stderr, "WARNING: -H is only present for compatibility with a fork of ldid\n");
+ fprintf(stderr, " you should NOT be manually specifying the hash algorithm\n");
+ }
+
+ if (false);
+ else if (strcmp(hash, "sha1") == 0)
+ do_sha1 = true;
+ else if (strcmp(hash, "sha256") == 0)
+ do_sha256 = true;
+ else _assert(false);
+ } break;
+
+ case 'h': flag_h = true; break;
+
case 'Q': {
const char *xml = argv[argi] + 2;
requirements.open(xml, O_RDONLY, PROT_READ, MAP_PRIVATE);
} break;
case 'D': flag_D = true; break;
+ case 'd': flag_d = true; break;
case 'a': flag_a = true; break;
flags |= kSecCodeSignatureEnforcement;
else if (strcmp(name, "library-validation") == 0)
flags |= kSecCodeSignatureLibraryValidation;
+ else if (strcmp(name, "runtime") == 0)
+ flags |= kSecCodeSignatureRuntime;
else _assert(false);
} break;
}
break;
+ case 'M':
+ flag_M = true;
+ break;
+
case 'K':
if (argv[argi][2] != '\0')
key.open(argv[argi] + 2, O_RDONLY, PROT_READ, MAP_PRIVATE);
} break;
default:
- goto usage;
+ usage(argv[0]);
+ return 1;
break;
}
_assert(flag_S || key.empty());
_assert(flag_S || flag_I == NULL);
- if (files.empty()) usage: {
- exit(0);
+ if (flag_d && !flag_h) {
+ flag_h = true;
+ fprintf(stderr, "WARNING: -d also (temporarily) does the behavior of -h for compatibility with a fork of ldid\n");
}
+ if (files.empty())
+ return 0;
+
size_t filei(0), filee(0);
_foreach (file, files) try {
std::string path(file);
_syscall(stat(path.c_str(), &info));
if (S_ISDIR(info.st_mode)) {
+ _assert(flag_S);
#ifndef LDID_NOPLIST
- _assert(!flag_r);
- ldid::DiskFolder folder(path);
+ ldid::DiskFolder folder(path + "/");
path += "/" + Sign("", folder, key, requirements, ldid::fun([&](const std::string &, const std::string &) -> std::string { return entitlements; }), dummy_).path;
#else
_assert(false);
ldid::Unsign(input.data(), input.size(), output, dummy_);
else {
std::string identifier(flag_I ?: split.base.c_str());
- ldid::Sign(input.data(), input.size(), output, identifier, entitlements, requirements, key, slots, flags, platform, dummy_);
+ ldid::Sign(input.data(), input.size(), output, identifier, entitlements, flag_M, requirements, key, slots, flags, platform, dummy_);
}
Commit(path, temp);
#endif
}
+ if (flag_d && encryption != NULL) {
+ printf("cryptid=%d\n", mach_header.Swap(encryption->cryptid));
+ }
+
if (flag_D) {
_assert(encryption != NULL);
encryption->cryptid = mach_header.Swap(0);
LDID_SHA1(top + PageSize_ * (pages - 1), ((data - 1) % PageSize_) + 1, hashes[pages - 1]);
}
}
+
+ if (flag_h) {
+ _assert(signature != NULL);
+
+ auto algorithms(GetAlgorithms());
+
+ uint32_t data = mach_header.Swap(signature->dataoff);
+
+ uint8_t *top = reinterpret_cast<uint8_t *>(mach_header.GetBase());
+ uint8_t *blob = top + data;
+ struct SuperBlob *super = reinterpret_cast<struct SuperBlob *>(blob);
+
+ struct Candidate {
+ CodeDirectory *directory_;
+ size_t size_;
+ Algorithm &algorithm_;
+ std::string hash_;
+ };
+
+ std::map<uint8_t, Candidate> candidates;
+
+ for (size_t index(0); index != Swap(super->count); ++index) {
+ auto type(Swap(super->index[index].type));
+ if ((type == CSSLOT_CODEDIRECTORY || type >= CSSLOT_ALTERNATE) && type != CSSLOT_SIGNATURESLOT) {
+ uint32_t begin = Swap(super->index[index].offset);
+ uint32_t end = index + 1 == Swap(super->count) ? Swap(super->blob.length) : Swap(super->index[index + 1].offset);
+ struct CodeDirectory *directory = reinterpret_cast<struct CodeDirectory *>(blob + begin + sizeof(Blob));
+ auto type(directory->hashType);
+ _assert(type > 0 && type <= algorithms.size());
+ auto &algorithm(*algorithms[type - 1]);
+ uint8_t hash[algorithm.size_];
+ algorithm(hash, blob + begin, end - begin);
+ candidates.insert({type, {directory, end - begin, algorithm, Hex(hash, 20)}});
+ }
+ }
+
+ _assert(!candidates.empty());
+ auto best(candidates.end());
+ --best;
+
+ const auto directory(best->second.directory_);
+ const auto flags(Swap(directory->flags));
+
+ std::string names;
+ if (flags & kSecCodeSignatureHost)
+ names += ",host";
+ if (flags & kSecCodeSignatureAdhoc)
+ names += ",adhoc";
+ if (flags & kSecCodeSignatureForceHard)
+ names += ",hard";
+ if (flags & kSecCodeSignatureForceKill)
+ names += ",kill";
+ if (flags & kSecCodeSignatureForceExpiration)
+ names += ",expires";
+ if (flags & kSecCodeSignatureRestrict)
+ names += ",restrict";
+ if (flags & kSecCodeSignatureEnforcement)
+ names += ",enforcement";
+ if (flags & kSecCodeSignatureLibraryValidation)
+ names += ",library-validation";
+ if (flags & kSecCodeSignatureRuntime)
+ names += ",runtime";
+
+ printf("CodeDirectory v=%x size=%zd flags=0x%x(%s) hashes=%d+%d location=embedded\n",
+ Swap(directory->version), best->second.size_, flags, names.empty() ? "none" : names.c_str() + 1, Swap(directory->nCodeSlots), Swap(directory->nSpecialSlots));
+ printf("Hash type=%s size=%d\n", best->second.algorithm_.name(), directory->hashSize);
+
+ std::string choices;
+ for (const auto &candidate : candidates) {
+ auto choice(candidate.second.algorithm_.name());
+ choices += ',';
+ choices += choice;
+ printf("CandidateCDHash %s=%s\n", choice, candidate.second.hash_.c_str());
+ }
+ printf("Hash choices=%s\n", choices.c_str() + 1);
+
+ printf("CDHash=%s\n", best->second.hash_.c_str());
+ }
}
++filei;
git.ckatri.com / ldid.git / blobdiff