#ifndef LDID_NOPLIST
#include <plist/plist.h>
+#elif __APPLE__
+#include <CoreFoundation/CoreFoundation.h>
#endif
#include "ldid.hpp"
#define _assert__(line) \
_assert___(line)
+#ifndef $
+#define $(value) value
+#endif
+
#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 ")"; \
+ 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__); \
+ fprintf(stderr, $("%s(%u): _assert(): " format "\n"), __FILE__, __LINE__, ## __VA_ARGS__); \
exit(-1); \
} while (false)
#endif
#define _assert(expr) \
- _assert_(expr, "%s", #expr)
+ _assert_(expr, "%s", $(#expr))
#define _syscall(expr, ...) [&] { for (;;) { \
auto _value(expr); \
} }()
#define _trace() \
- fprintf(stderr, "_trace(%s:%u): %s\n", __FILE__, __LINE__, __FUNCTION__)
+ fprintf(stderr, $("_trace(%s:%u): %s\n"), __FILE__, __LINE__, $(__FUNCTION__))
#define _not(type) \
((type) ~ (type) 0)
#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
#define BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED 0xb0
#define BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB 0xc0
-static auto dummy([](double) {});
+struct : ldid::Progress {
+ virtual void operator()(const std::string &value) const {
+ }
+
+ virtual void operator()(double value) const {
+ }
+} dummy_;
+
+struct Progression : ldid::Progress {
+ const ldid::Progress &progress_;
+ std::string name_;
+
+ Progression(const ldid::Progress &progress, const std::string &name) :
+ progress_(progress),
+ name_(name)
+ {
+ }
+
+ virtual void operator()(const std::string &value) const {
+ return progress_(name_ + " (" + value + ")");
+ }
+
+ virtual void operator()(double value) const {
+ return progress_(value);
+ }
+};
static std::streamsize read(std::streambuf &stream, void *data, size_t size) {
auto writ(stream.sgetn(static_cast<char *>(data), size));
_assert(stream.sputn(static_cast<const char *>(data), size) == size);
}
-static inline void put(std::streambuf &stream, const void *data, size_t size, const ldid::Functor<void (double)> &percent) {
- percent(0);
+static inline void put(std::streambuf &stream, const void *data, size_t size, const ldid::Progress &progress) {
+ progress(0);
for (size_t total(0); total != size;) {
auto writ(std::min(size - total, size_t(4096 * 4)));
_assert(stream.sputn(static_cast<const char *>(data) + total, writ) == writ);
total += writ;
- percent(double(total) / size);
+ progress(double(total) / size);
}
}
_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
);
}
uint32_t codeLimit;
uint8_t hashSize;
uint8_t hashType;
- uint8_t spare1;
+ uint8_t platform;
uint8_t pageSize;
uint32_t spare2;
uint32_t scatterOffset;
//uint64_t codeLimit64;
} _packed;
+enum CodeSignatureFlags {
+ kSecCodeSignatureHost = 0x0001,
+ kSecCodeSignatureAdhoc = 0x0002,
+ kSecCodeSignatureForceHard = 0x0100,
+ kSecCodeSignatureForceKill = 0x0200,
+ kSecCodeSignatureForceExpiration = 0x0400,
+ kSecCodeSignatureRestrict = 0x0800,
+ kSecCodeSignatureEnforcement = 0x1000,
+ kSecCodeSignatureLibraryValidation = 0x2000,
+};
+
+enum Kind : uint32_t {
+ exprForm = 1, // prefix expr form
+};
+
+enum ExprOp : uint32_t {
+ opFalse, // unconditionally false
+ opTrue, // unconditionally true
+ opIdent, // match canonical code [string]
+ opAppleAnchor, // signed by Apple as Apple's product
+ opAnchorHash, // match anchor [cert hash]
+ opInfoKeyValue, // *legacy* - use opInfoKeyField [key; value]
+ opAnd, // binary prefix expr AND expr [expr; expr]
+ opOr, // binary prefix expr OR expr [expr; expr]
+ opCDHash, // match hash of CodeDirectory directly [cd hash]
+ opNot, // logical inverse [expr]
+ opInfoKeyField, // Info.plist key field [string; match suffix]
+ opCertField, // Certificate field [cert index; field name; match suffix]
+ opTrustedCert, // require trust settings to approve one particular cert [cert index]
+ opTrustedCerts, // require trust settings to approve the cert chain
+ opCertGeneric, // Certificate component by OID [cert index; oid; match suffix]
+ opAppleGenericAnchor, // signed by Apple in any capacity
+ opEntitlementField, // entitlement dictionary field [string; match suffix]
+ opCertPolicy, // Certificate policy by OID [cert index; oid; match suffix]
+ opNamedAnchor, // named anchor type
+ opNamedCode, // named subroutine
+ opPlatform, // platform constraint [integer]
+ exprOpCount // (total opcode count in use)
+};
+
+enum MatchOperation {
+ matchExists, // anything but explicit "false" - no value stored
+ matchEqual, // equal (CFEqual)
+ matchContains, // partial match (substring)
+ matchBeginsWith, // partial match (initial substring)
+ matchEndsWith, // partial match (terminal substring)
+ matchLessThan, // less than (string with numeric comparison)
+ matchGreaterThan, // greater than (string with numeric comparison)
+ matchLessEqual, // less or equal (string with numeric comparison)
+ matchGreaterEqual, // greater or equal (string with numeric comparison)
+};
+
+#define OID_ISO_MEMBER 42
+#define OID_US OID_ISO_MEMBER, 134, 72
+#define APPLE_OID OID_US, 0x86, 0xf7, 0x63
+#define APPLE_ADS_OID APPLE_OID, 0x64
+#define APPLE_EXTENSION_OID APPLE_ADS_OID, 6
+
#ifndef LDID_NOFLAGT
extern "C" uint32_t hash(uint8_t *k, uint32_t length, uint32_t initval);
#endif
virtual void operator ()(uint8_t *hash, const void *data, size_t size) const = 0;
virtual void operator ()(ldid::Hash &hash, const void *data, size_t size) const = 0;
virtual void operator ()(std::vector<char> &hash, const void *data, size_t size) const = 0;
+
+ virtual const char *name() = 0;
};
struct AlgorithmSHA1 :
hash.resize(LDID_SHA1_DIGEST_LENGTH);
return operator ()(reinterpret_cast<uint8_t *>(hash.data()), data, size);
}
+
+ virtual const char *name() {
+ return "sha1";
+ }
};
struct AlgorithmSHA256 :
hash.resize(LDID_SHA256_DIGEST_LENGTH);
return operator ()(reinterpret_cast<uint8_t *>(hash.data()), data, size);
}
+
+ virtual const char *name() {
+ return "sha256";
+ }
};
+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_;
uint32_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) :
+ 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)
+ align_(align),
+ 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 Functor<void (double)> &)> &save, const Functor<void (double)> &percent) {
+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, const std::string &, const char *, const Progress &)> &save, const Progress &progress) {
FatHeader source(const_cast<void *>(idata), isize);
size_t offset(0);
if (symtab != NULL) {
auto end(mach_header.Swap(symtab->stroff) + mach_header.Swap(symtab->strsize));
- _assert(end <= size);
- _assert(end >= size - 0x10);
- size = end;
+ if (symtab->stroff != 0 || symtab->strsize != 0) {
+ _assert(end <= size);
+ _assert(end >= size - 0x10);
+ size = end;
+ }
}
- 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;
break;
}
+ const char *arch(NULL);
+ switch (mach_header.GetCPUType()) {
+ case CPU_TYPE_POWERPC:
+ arch = "ppc";
+ break;
+ case CPU_TYPE_POWERPC64:
+ arch = "ppc64";
+ break;
+ case CPU_TYPE_X86:
+ arch = "i386";
+ break;
+ case CPU_TYPE_X86_64:
+ arch = "x86_64";
+ break;
+ case CPU_TYPE_ARM:
+ arch = "arm";
+ break;
+ case CPU_TYPE_ARM64:
+ arch = "arm64";
+ break;
+ }
+
offset = Align(offset, 1 << align);
uint32_t limit(size);
if (alloc != 0)
limit = Align(limit, 0x10);
- allocations.push_back(CodesignAllocation(mach_header, offset, size, limit, alloc, align));
+ allocations.push_back(CodesignAllocation(mach_header, offset, size, limit, alloc, align, arch, baton));
offset += size + alloc;
offset = Align(offset, 0x10);
}
}
_foreach (allocation, allocations) {
+ progress(allocation.arch_);
auto &mach_header(allocation.mach_header_);
pad(output, allocation.offset_ - position);
std::string overlap(altern.str());
overlap.append(top + overlap.size(), Align(overlap.size(), 0x1000) - overlap.size());
- put(output, top + (position - begin), allocation.size_ - (position - begin), percent);
+ put(output, top + (position - begin), allocation.size_ - (position - begin), progress);
position = begin + allocation.size_;
pad(output, allocation.limit_ - allocation.size_);
position += allocation.limit_ - allocation.size_;
- size_t saved(save(mach_header, output, allocation.limit_, overlap, top, percent));
+ size_t saved(save(mach_header, allocation.baton_, output, allocation.limit_, overlap, top, progress));
if (allocation.alloc_ > saved)
pad(output, allocation.alloc_ - saved);
else
{
_assert(value_ != NULL);
_assert(PKCS12_parse(value_, "", &key_, &cert_, &ca_) != 0);
+
_assert(key_ != NULL);
_assert(cert_ != NULL);
+
+ if (ca_ == NULL)
+ ca_ = sk_X509_new_null();
+ _assert(ca_ != NULL);
}
Stuff(const std::string &data) :
PKCS7 *value_;
public:
- Signature(const Stuff &stuff, const Buffer &data) :
- value_(PKCS7_sign(stuff, stuff, stuff, data, PKCS7_BINARY | PKCS7_DETACHED))
- {
+ Signature(const Stuff &stuff, const Buffer &data, const std::string &xml) {
+ value_ = PKCS7_new();
_assert(value_ != NULL);
+
+ _assert(PKCS7_set_type(value_, NID_pkcs7_signed));
+ _assert(PKCS7_content_new(value_, NID_pkcs7_data));
+
+ STACK_OF(X509) *certs(stuff);
+ for (unsigned i(0), e(sk_X509_num(certs)); i != e; i++)
+ _assert(PKCS7_add_certificate(value_, sk_X509_value(certs, e - i - 1)));
+
+ // 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);
+
+ ASN1_OCTET_STRING *string(ASN1_OCTET_STRING_new());
+ _assert(string != NULL);
+ try {
+ _assert(ASN1_STRING_set(string, xml.data(), xml.size()));
+
+ static auto nid(OBJ_create("1.2.840.113635.100.9.1", "", ""));
+ _assert(PKCS7_add_signed_attribute(info, nid, V_ASN1_OCTET_STRING, string));
+ } catch (...) {
+ ASN1_OCTET_STRING_free(string);
+ throw;
+ }
+
+ // 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
{
namespace ldid {
-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, const Functor<void (double)> &percent) {
+#ifndef LDID_NOSMIME
+static void get(std::string &value, X509_NAME *name, int nid) {
+ auto index(X509_NAME_get_index_by_NID(name, nid, -1));
+ _assert(index >= 0);
+ auto next(X509_NAME_get_index_by_NID(name, nid, index));
+ _assert(next == -1);
+ auto entry(X509_NAME_get_entry(name, index));
+ _assert(entry != NULL);
+ auto asn(X509_NAME_ENTRY_get_data(entry));
+ _assert(asn != NULL);
+ value.assign(reinterpret_cast<char *>(ASN1_STRING_data(asn)), ASN1_STRING_length(asn));
+}
+#endif
+
+static void req(std::streambuf &buffer, uint32_t value) {
+ value = Swap(value);
+ put(buffer, &value, sizeof(value));
+}
+
+static void req(std::streambuf &buffer, const std::string &value) {
+ req(buffer, value.size());
+ put(buffer, value.data(), value.size());
+ static uint8_t zeros[] = {0,0,0,0};
+ put(buffer, zeros, 3 - (value.size() + 3) % 4);
+}
+
+template <size_t Size_>
+static void req(std::streambuf &buffer, uint8_t (&&data)[Size_]) {
+ req(buffer, Size_);
+ put(buffer, data, Size_);
+ static uint8_t zeros[] = {0,0,0,0};
+ 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, bool merge, const std::string &requirements, const std::string &key, const Slots &slots, uint32_t flags, bool platform, const Progress &progress) {
Hash hash;
+
std::string team;
+ std::string common;
#ifndef LDID_NOSMIME
if (!key.empty()) {
Stuff stuff(key);
auto name(X509_get_subject_name(stuff));
_assert(name != NULL);
- auto index(X509_NAME_get_index_by_NID(name, NID_organizationalUnitName, -1));
- _assert(index >= 0);
- auto next(X509_NAME_get_index_by_NID(name, NID_organizationalUnitName, index));
- _assert(next == -1);
- auto entry(X509_NAME_get_entry(name, index));
- _assert(entry != NULL);
- auto asn(X509_NAME_ENTRY_get_data(entry));
- _assert(asn != NULL);
- team.assign(reinterpret_cast<char *>(ASN1_STRING_data(asn)), ASN1_STRING_length(asn));
+ get(team, name, NID_organizationalUnitName);
+ get(common, name, NID_commonName);
}
#endif
+
+ std::stringbuf backing;
+
+ if (!requirements.empty()) {
+ put(backing, requirements.data(), requirements.size());
+ } else {
+ Blobs blobs;
+
+ std::stringbuf requirement;
+ req(requirement, exprForm);
+ req(requirement, opAnd);
+ req(requirement, opIdent);
+ req(requirement, identifier);
+ req(requirement, opAnd);
+ req(requirement, opAppleGenericAnchor);
+ req(requirement, opAnd);
+ req(requirement, opCertField);
+ req(requirement, 0);
+ req(requirement, "subject.CN");
+ req(requirement, matchEqual);
+ req(requirement, common);
+ req(requirement, opCertGeneric);
+ req(requirement, 1);
+ req(requirement, (uint8_t []) {APPLE_EXTENSION_OID, 2, 1});
+ req(requirement, matchExists);
+ insert(blobs, 3, CSMAGIC_REQUIREMENT, requirement);
+
+ put(backing, CSMAGIC_REQUIREMENTS, blobs);
+ }
+
+
// 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_);
special = std::max(special, CSSLOT_REQUIREMENTS);
alloc += sizeof(struct BlobIndex);
- if (requirements.empty())
- alloc += 0xc;
- else
- alloc += requirements.size();
+ alloc += backing.str().size();
+
+ 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));
+ }
- if (!entitlements.empty()) {
+ 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 Functor<void (double)> &percent) -> size_t {
+ }), fun([&](const MachHeader &mach_header, const Baton &baton, std::streambuf &output, size_t limit, const std::string &overlap, const char *top, const Progress &progress) -> size_t {
Blobs blobs;
if (true) {
- std::stringbuf data;
-
- if (requirements.empty()) {
- Blobs requirements;
- put(data, CSMAGIC_REQUIREMENTS, requirements);
- } else {
- put(data, requirements.data(), requirements.size());
- }
-
- insert(blobs, CSSLOT_REQUIREMENTS, data);
+ insert(blobs, CSSLOT_REQUIREMENTS, backing);
}
- if (!entitlements.empty()) {
+ 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);
}
CodeDirectory directory;
directory.version = Swap(uint32_t(0x00020200));
- directory.flags = Swap(uint32_t(0));
+ directory.flags = Swap(uint32_t(flags));
directory.nSpecialSlots = Swap(special);
directory.codeLimit = Swap(uint32_t(limit));
directory.nCodeSlots = Swap(normal);
directory.hashSize = algorithm.size_;
directory.hashType = algorithm.type_;
- directory.spare1 = 0x00;
+ directory.platform = platform ? 0x01 : 0x00;
directory.pageSize = PageShift_;
directory.spare2 = Swap(uint32_t(0));
directory.scatterOffset = Swap(uint32_t(0));
_foreach (slot, posts)
memcpy(hashes - slot.first * algorithm.size_, algorithm[slot.second], algorithm.size_);
- percent(0);
+ progress(0);
if (normal != 1)
for (size_t i = 0; i != normal - 1; ++i) {
algorithm(hashes + i * algorithm.size_, (PageSize_ * i < overlap.size() ? overlap.data() : top) + PageSize_ * i, PageSize_);
- percent(double(i) / normal);
+ progress(double(i) / normal);
}
if (normal != 0)
algorithm(hashes + (normal - 1) * algorithm.size_, top + PageSize_ * (normal - 1), ((limit - 1) % PageSize_) + 1);
- percent(1);
+ progress(1);
put(data, storage.data(), storage.size());
#ifndef LDID_NOSMIME
if (!key.empty()) {
+#ifdef LDID_NOPLIST
+ auto plist(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+ _scope({ CFRelease(plist); });
+
+ auto cdhashes(CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks));
+ _scope({ CFRelease(cdhashes); });
+
+ CFDictionarySetValue(plist, CFSTR("cdhashes"), cdhashes);
+#else
+ auto plist(plist_new_dict());
+ _scope({ plist_free(plist); });
+
+ auto cdhashes(plist_new_array());
+ plist_dict_set_item(plist, "cdhashes", cdhashes);
+#endif
+
+ unsigned total(0);
+ for (Algorithm *pointer : GetAlgorithms()) {
+ Algorithm &algorithm(*pointer);
+ (void) algorithm;
+
+ const auto &blob(blobs[total == 0 ? CSSLOT_CODEDIRECTORY : CSSLOT_ALTERNATE + total - 1]);
+ ++total;
+
+ std::vector<char> hash;
+ algorithm(hash, blob.data(), blob.size());
+ hash.resize(20);
+
+#ifdef LDID_NOPLIST
+ auto value(CFDataCreate(kCFAllocatorDefault, reinterpret_cast<const UInt8 *>(hash.data()), hash.size()));
+ _scope({ CFRelease(value); });
+ CFArrayAppendValue(cdhashes, value);
+#else
+ plist_array_append_item(cdhashes, plist_new_data(hash.data(), hash.size()));
+#endif
+ }
+
+#ifdef LDID_NOPLIST
+ auto created(CFPropertyListCreateXMLData(kCFAllocatorDefault, plist));
+ _scope({ CFRelease(created); });
+ auto xml(reinterpret_cast<const char *>(CFDataGetBytePtr(created)));
+ auto size(CFDataGetLength(created));
+#else
+ char *xml(NULL);
+ uint32_t size;
+ plist_to_xml(plist, &xml, &size);
+ _scope({ free(xml); });
+#endif
+
std::stringbuf data;
const std::string &sign(blobs[CSSLOT_CODEDIRECTORY]);
Stuff stuff(key);
Buffer bio(sign);
- Signature signature(stuff, sign);
+ Signature signature(stuff, sign, std::string(xml, size));
Buffer result(signature);
std::string value(result);
put(data, value.data(), value.size());
#endif
return put(output, CSMAGIC_EMBEDDED_SIGNATURE, blobs);
- }), percent);
+ }), progress);
return hash;
}
#ifndef LDID_NOTOOLS
-static void Unsign(void *idata, size_t isize, std::streambuf &output, const Functor<void (double)> &percent) {
- Allocate(idata, isize, output, fun([](const MachHeader &mach_header, size_t size) -> size_t {
+static void Unsign(void *idata, size_t isize, std::streambuf &output, const Progress &progress) {
+ 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 Functor<void (double)> &percent) -> size_t {
+ }), fun([](const MachHeader &mach_header, const Baton &baton, std::streambuf &output, size_t limit, const std::string &overlap, const char *top, const Progress &progress) -> size_t {
return 0;
- }), percent);
+ }), 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_NOTOOLS
-static void copy(std::streambuf &source, std::streambuf &target, size_t length, const ldid::Functor<void (double)> &percent) {
- percent(0);
+static void copy(std::streambuf &source, std::streambuf &target, size_t length, const Progress &progress) {
+ progress(0);
size_t total(0);
for (;;) {
char data[4096 * 4];
break;
_assert(target.sputn(data, writ) == writ);
total += writ;
- percent(double(total) / length);
+ progress(double(total) / length);
}
}
static void plist_d(std::streambuf &buffer, size_t length, const Functor<void (plist_t)> &code) {
std::stringbuf data;
- copy(buffer, data, length, ldid::fun(dummy));
+ copy(buffer, data, length, dummy_);
auto node(plist(data.str()));
_scope({ plist_free(node); });
_assert(plist_get_node_type(node) == PLIST_DICT);
};
#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, const Functor<void (double)> &percent) {
+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);
- copy(buffer, temp, length - size, percent);
+ copy(buffer, temp, length - size, progress);
// XXX: this is a stupid hack
pad(temp, 0x10 - (length & 0xf));
auto data(temp.str());
HashProxy proxy(hash, save);
- return Sign(data.data(), data.size(), proxy, identifier, entitlements, requirements, key, slots, 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 Functor<void (const std::string &)> &progress, const Functor<void (double)> &percent) {
+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 + "*");
std::string entitlements;
folder.Open(executable, fun([&](std::streambuf &buffer, size_t length, const void *flag) {
// XXX: this is a miserable fail
std::stringbuf temp;
- copy(buffer, temp, length, percent);
+ copy(buffer, temp, length, progress);
// XXX: this is a stupid hack
pad(temp, 0x10 - (length & 0xf));
auto data(temp.str());
const std::string resources(mac ? "Resources/" : "");
if (true) {
- rules1.insert(Rule{1, NoMode, "^" + resources});
- if (!mac) rules1.insert(Rule{10000, OmitMode, "^(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/|())SC_Info/[^/]+\\.(sinf|supf|supp)$"});
+ rules1.insert(Rule{1, NoMode, "^" + (resources == "" ? ".*" : resources)});
rules1.insert(Rule{1000, OptionalMode, "^" + resources + ".*\\.lproj/"});
rules1.insert(Rule{1100, OmitMode, "^" + resources + ".*\\.lproj/locversion.plist$"});
- if (!mac) rules1.insert(Rule{10000, OmitMode, "^Watch/[^/]+\\.app/(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/)SC_Info/[^/]+\\.(sinf|supf|supp)$"});
+ 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$"});
- if (!mac) 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))/"});
+ 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$"});
+ if (!mac) rules2.insert(Rule{1010, NoMode, "^Base\\.lproj/"});
rules2.insert(Rule{20, OmitMode, "^Info\\.plist$"});
rules2.insert(Rule{20, OmitMode, "^PkgInfo$"});
- if (!mac) 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, "^[^/]+$"});
+ 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 :
- static_cast<const Functor<std::string (const std::string &, const std::string &)> &>(fun([&](const std::string &, const std::string &entitlements) -> std::string { return entitlements; }))
- , progress, percent);
+ static_cast<const Functor<std::string (const std::string &, const std::string &)> &>(fun([&](const std::string &, const std::string &) -> std::string { return entitlements; }))
+ , progress);
}), fun([&](const std::string &name, const Functor<std::string ()> &read) {
}));
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, percent);
+ Sign(header.bytes, size, data, hash, save, identifier, "", false, "", key, slots, length, 0, false, Progression(progress, root + name));
}));
return;
}
folder.Save(name, false, flag, fun([&](std::streambuf &save) {
HashProxy proxy(hash, save);
put(proxy, header.bytes, size);
- copy(data, proxy, length - size, percent);
+ copy(data, proxy, length - size, progress);
}));
}));
}), fun([&](const std::string &name, const Functor<std::string ()> &read) {
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, percent);
+ 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 Functor<void (const std::string &)> &progress, const Functor<void (double)> &percent) {
- std::map<std::string, Hash> local;
- return Sign(root, folder, key, local, requirements, alter, progress, percent);
+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) {
+ State local;
+ return Sign(root, folder, key, local, requirements, alter, progress);
}
#endif
#endif
}
+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);
+
#ifndef LDID_NOFLAGT
bool flag_T(false);
#endif
bool flag_u(false);
+ bool flag_M(false);
+
+ uint32_t flags(0);
+ bool platform(false);
+
uint32_t flag_CPUType(_not(uint32_t));
uint32_t flag_CPUSubtype(_not(uint32_t));
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 'Q': {
const char *xml = argv[argi] + 2;
requirements.open(xml, O_RDONLY, PROT_READ, MAP_PRIVATE);
}
break;
+ case 'C': {
+ const char *name = argv[argi] + 2;
+ if (false);
+ else if (strcmp(name, "host") == 0)
+ flags |= kSecCodeSignatureHost;
+ else if (strcmp(name, "adhoc") == 0)
+ flags |= kSecCodeSignatureAdhoc;
+ else if (strcmp(name, "hard") == 0)
+ flags |= kSecCodeSignatureForceHard;
+ else if (strcmp(name, "kill") == 0)
+ flags |= kSecCodeSignatureForceKill;
+ else if (strcmp(name, "expires") == 0)
+ flags |= kSecCodeSignatureForceExpiration;
+ else if (strcmp(name, "restrict") == 0)
+ flags |= kSecCodeSignatureRestrict;
+ else if (strcmp(name, "enforcement") == 0)
+ flags |= kSecCodeSignatureEnforcement;
+ else if (strcmp(name, "library-validation") == 0)
+ flags |= kSecCodeSignatureLibraryValidation;
+ else _assert(false);
+ } break;
+
+ case 'P':
+ platform = true;
+ break;
+
case 's':
_assert(!flag_r);
_assert(!flag_S);
}
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 (files.empty())
+ return 0;
size_t filei(0), filee(0);
_foreach (file, files) try {
struct stat info;
_syscall(stat(path.c_str(), &info));
- if (S_ISDIR(info.st_mode)) {
+ if (flag_S && S_ISDIR(info.st_mode)) {
#ifndef LDID_NOPLIST
_assert(!flag_r);
- ldid::DiskFolder folder(path);
- path += "/" + Sign("", folder, key, requirements, ldid::fun([&](const std::string &, const std::string &) -> std::string { return entitlements; })
- , ldid::fun([&](const std::string &) {}), ldid::fun(dummy)
- ).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);
#endif
auto temp(Temporary(output, split));
if (flag_r)
- ldid::Unsign(input.data(), input.size(), output, ldid::fun(dummy));
+ 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, ldid::fun(dummy));
+ ldid::Sign(input.data(), input.size(), output, identifier, entitlements, flag_M, requirements, key, slots, flags, platform, dummy_);
}
Commit(path, temp);
git.ckatri.com / ldid.git / blobdiff