#include <sys/types.h>
#ifndef LDID_NOSMIME
+#include <openssl/opensslv.h>
+# if OPENSSL_VERSION_NUMBER >= 0x30000000
+# include <openssl/provider.h>
+# endif
#include <openssl/err.h>
#include <openssl/pem.h>
#include <openssl/pkcs7.h>
#include <openssl/pkcs12.h>
+#include <openssl/ui.h>
#endif
#ifdef __APPLE__
#define _packed \
__attribute__((packed))
+#ifndef LDID_NOSMIME
+std::string password;
+#endif
+
template <typename Type_>
struct Iterator_ {
typedef typename Type_::const_iterator Result;
#define _scope(function) \
_scope_(__COUNTER__, function)
-#define CPU_ARCH_MASK uint32_t(0xff000000)
-#define CPU_ARCH_ABI64 uint32_t(0x01000000)
+#define CPU_ARCH_MASK uint32_t(0xff000000)
+#define CPU_ARCH_ABI64 uint32_t(0x01000000)
+#define CPU_ARCH_ABI64_32 uint32_t(0x02000000)
#define CPU_TYPE_ANY uint32_t(-1)
#define CPU_TYPE_VAX uint32_t( 1)
#define CPU_TYPE_ARM64 (CPU_ARCH_ABI64 | CPU_TYPE_ARM)
#define CPU_TYPE_POWERPC64 (CPU_ARCH_ABI64 | CPU_TYPE_POWERPC)
#define CPU_TYPE_X86_64 (CPU_ARCH_ABI64 | CPU_TYPE_X86)
+#define CPU_TYPE_ARM64_32 (CPU_TYPE_ARM | CPU_ARCH_ABI64_32)
struct fat_header {
uint32_t magic;
return writ;
}
+static inline void put(std::streambuf &stream, uint8_t value) {
+ _assert(stream.sputc(value) != EOF);
+}
+
static inline void get(std::streambuf &stream, void *data, size_t size) {
_assert(read(stream, data, size) == size);
}
}
}
+static inline void put(std::streambuf &stream, const std::string &data) {
+ return put(stream, data.data(), data.size());
+}
+
static size_t most(std::streambuf &stream, void *data, size_t size) {
size_t total(size);
while (size > 0)
static const uint8_t PageShift_(0x0c);
static const uint32_t PageSize_(1 << PageShift_);
+static inline unsigned bytes(uint64_t value) {
+ return (64 - __builtin_clzll(value) + 7) / 8;
+}
+
+static void put(std::streambuf &stream, uint64_t value, size_t length) {
+ length *= 8;
+ do put(stream, uint8_t(value >> (length -= 8)));
+ while (length != 0);
+}
+
+static void der(std::streambuf &stream, uint64_t value) {
+ if (value < 128)
+ put(stream, value);
+ else {
+ unsigned length(bytes(value));
+ put(stream, 0x80 | length);
+ put(stream, value, length);
+ }
+}
+
+static std::string der(uint8_t tag, const char *value, size_t length) {
+ std::stringbuf data;
+ put(data, tag);
+ der(data, length);
+ put(data, value, length);
+ return data.str();
+}
+
+static std::string der(uint8_t tag, const char *value) {
+ return der(tag, value, strlen(value)); }
+static std::string der(uint8_t tag, const std::string &value) {
+ return der(tag, value.data(), value.size()); }
+
+template <typename Type_>
+static void der_(std::stringbuf &data, const Type_ &values) {
+ size_t size(0);
+ for (const auto &value : values)
+ size += value.size();
+ der(data, size);
+ for (const auto &value : values)
+ put(data, value);
+}
+
+static std::string der(const std::vector<std::string> &values) {
+ std::stringbuf data;
+ put(data, 0x30);
+ der_(data, values);
+ return data.str();
+}
+
+static std::string der(const std::multiset<std::string> &values) {
+ std::stringbuf data;
+ put(data, 0x31);
+ der_(data, values);
+ return data.str();
+}
+
+static std::string der(const std::pair<std::string, std::string> &value) {
+ const auto key(der(0x0c, value.first));
+ std::stringbuf data;
+ put(data, 0x30);
+ der(data, key.size() + value.second.size());
+ put(data, key);
+ put(data, value.second);
+ return data.str();
+}
+
+#ifndef LDID_NOPLIST
+static std::string der(plist_t data) {
+ switch (const auto type = plist_get_node_type(data)) {
+ case PLIST_BOOLEAN: {
+ uint8_t value(0);
+ plist_get_bool_val(data, &value);
+
+ std::stringbuf data;
+ put(data, 0x01);
+ der(data, 1);
+ put(data, value != 0 ? 1 : 0);
+ return data.str();
+ } break;
+
+ case PLIST_UINT: {
+ uint64_t value;
+ plist_get_uint_val(data, &value);
+ const auto length(bytes(value));
+
+ std::stringbuf data;
+ put(data, 0x02);
+ der(data, length);
+ put(data, value, length);
+ return data.str();
+ } break;
+
+ case PLIST_REAL: {
+ _assert(false);
+ } break;
+
+ case PLIST_DATE: {
+ _assert(false);
+ } break;
+
+ case PLIST_DATA: {
+ char *value;
+ uint64_t length;
+ plist_get_data_val(data, &value, &length);
+ _scope({ free(value); });
+ return der(0x04, value, length);
+ } break;
+
+ case PLIST_STRING: {
+ char *value;
+ plist_get_string_val(data, &value);
+ _scope({ free(value); });
+ return der(0x0c, value);
+ } break;
+
+ case PLIST_ARRAY: {
+ std::vector<std::string> values;
+ for (auto e(plist_array_get_size(data)), i(decltype(e)(0)); i != e; ++i)
+ values.push_back(der(plist_array_get_item(data, i)));
+ return der(values);
+ } break;
+
+ case PLIST_DICT: {
+ std::multiset<std::string> values;
+
+ plist_dict_iter iterator(NULL);
+ plist_dict_new_iter(data, &iterator);
+ _scope({ free(iterator); });
+
+ for (;;) {
+ char *key(NULL);
+ plist_t value(NULL);
+ plist_dict_next_item(data, iterator, &key, &value);
+ if (key == NULL)
+ break;
+ _scope({ free(key); });
+ values.insert(der(std::make_pair(key, der(value))));
+ }
+
+ return der(values);
+ } break;
+
+ default: {
+ _assert_(false, "unsupported plist type %d", type);
+ } break;
+ }
+}
+#endif
+
static inline uint16_t Swap_(uint16_t value) {
return
((value >> 8) & 0x00ff) |
#define CSMAGIC_EMBEDDED_SIGNATURE uint32_t(0xfade0cc0)
#define CSMAGIC_EMBEDDED_SIGNATURE_OLD uint32_t(0xfade0b02)
#define CSMAGIC_EMBEDDED_ENTITLEMENTS uint32_t(0xfade7171)
+#define CSMAGIC_EMBEDDED_DERFORMAT uint32_t(0xfade7172) // name?
#define CSMAGIC_DETACHED_SIGNATURE uint32_t(0xfade0cc1)
#define CSMAGIC_BLOBWRAPPER uint32_t(0xfade0b01)
#define CSSLOT_RESOURCEDIR uint32_t(0x00003)
#define CSSLOT_APPLICATION uint32_t(0x00004)
#define CSSLOT_ENTITLEMENTS uint32_t(0x00005)
+#define CSSLOT_REPSPECIFIC uint32_t(0x00006) // name?
+#define CSSLOT_DERFORMAT uint32_t(0x00007) // name?
#define CSSLOT_ALTERNATE uint32_t(0x01000)
#define CSSLOT_SIGNATURESLOT uint32_t(0x10000)
static std::vector<Algorithm *> algorithms;
if (algorithms.empty()) {
- if (do_sha1)
- algorithms.push_back(&sha1);
if (do_sha256)
algorithms.push_back(&sha256);
+ if (do_sha1)
+ algorithms.push_back(&sha1);
}
return algorithms;
struct Baton {
std::string entitlements_;
+ std::string derformat_;
};
struct CodesignAllocation {
break;
case CPU_TYPE_ARM:
case CPU_TYPE_ARM64:
+ case CPU_TYPE_ARM64_32:
align = 0xe;
break;
default:
case CPU_TYPE_ARM64:
arch = "arm64";
break;
+ case CPU_TYPE_ARM64_32:
+ arch = "arm64_32";
+ break;
}
offset = Align(offset, 1 << align);
ca_(NULL)
{
_assert(value_ != NULL);
- _assert(PKCS12_parse(value_, "", &key_, &cert_, &ca_) != 0);
+ if (!PKCS12_verify_mac(value_, "", 0) && password.empty()) {
+ char passbuf[2048];
+ UI_UTIL_read_pw_string(passbuf, 2048, "Enter password: ", 0);
+ password = passbuf;
+ }
+
+ _assert(PKCS12_parse(value_, password.c_str(), &key_, &cert_, &ca_) != 0);
_assert(key_ != NULL);
_assert(cert_ != NULL);
_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));
+ value.assign(reinterpret_cast<const char *>(ASN1_STRING_get0_data(asn)), ASN1_STRING_length(asn));
}
#endif
alloc += sizeof(struct BlobIndex);
alloc += backing.str().size();
- if (!merge)
- baton.entitlements_ = entitlements;
- else {
-#ifndef LDID_NOPLIST
+#ifdef LDID_NOPLIST
+ baton.entitlements_ = entitlements;
+#else
+ if (merge)
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 (!baton.entitlements_.empty() || !entitlements.empty()) {
+ auto combined(plist(baton.entitlements_));
+ _scope({ plist_free(combined); });
+ _assert(plist_get_node_type(combined) == PLIST_DICT);
- char *xml(NULL);
- uint32_t size;
- plist_to_xml(combined, &xml, &size);
- _scope({ free(xml); });
+ auto merging(plist(entitlements));
+ _scope({ plist_free(merging); });
+ _assert(plist_get_node_type(merging) == PLIST_DICT);
- baton.entitlements_.assign(xml, size);
+ 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));
}
-#else
- _assert(false);
-#endif
+
+ baton.derformat_ = der(combined);
+
+ char *xml(NULL);
+ uint32_t size;
+ plist_to_xml(combined, &xml, &size);
+ _scope({ free(xml); });
+
+ baton.entitlements_.assign(xml, size);
}
+#endif
if (!baton.entitlements_.empty()) {
special = std::max(special, CSSLOT_ENTITLEMENTS);
alloc += baton.entitlements_.size();
}
+ if (!baton.derformat_.empty()) {
+ special = std::max(special, CSSLOT_DERFORMAT);
+ alloc += sizeof(struct BlobIndex);
+ alloc += sizeof(struct Blob);
+ alloc += baton.derformat_.size();
+ }
+
size_t directory(0);
directory += sizeof(struct BlobIndex);
#endif
}
+ if (!baton.derformat_.empty()) {
+ std::stringbuf data;
+ put(data, baton.derformat_.data(), baton.derformat_.size());
+ insert(blobs, CSSLOT_DERFORMAT, CSMAGIC_EMBEDDED_DERFORMAT, data);
+ }
+
Slots posts(slots);
mach_header.ForSection(fun([&](const char *segment, const char *section, void *data, size_t size) {
void DiskFolder::Save(const std::string &path, bool edit, const void *flag, const Functor<void (std::streambuf &)> &code) {
if (!edit) {
- // XXX: use nullbuf
- std::stringbuf save;
+ NullBuffer save;
code(save);
} else {
std::filebuf save;
#ifndef LDID_NOPLIST
static plist_t plist(const std::string &data) {
+ if (data.empty())
+ return plist_new_dict();
plist_t plist(NULL);
if (Starts(data, "bplist00"))
plist_from_bin(data.data(), data.size(), &plist);
Mode mode_;
std::string code_;
- mutable std::auto_ptr<Expression> regex_;
+ mutable std::unique_ptr<Expression> regex_;
Rule(unsigned weight, Mode mode, const std::string &code) :
weight_(weight),
}
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);
+ fprintf(stderr, "Link Identity Editor %s\n\n", LDID_VERSION);
+ fprintf(stderr, "usage: %s [-Acputype:subtype] [-a]\n", argv0);
+ fprintf(stderr, " [-C[adhoc | enforcement | expires | hard |\n");
+ fprintf(stderr, " host | kill | library-validation | restrict | runtime]] [-D] [-d]\n");
+ fprintf(stderr, " [-e] [-h] [-Kkey.p12 [-Upassword]] [-M] [-P] [-q] [-r | -Sfile | -s]\n");
+ fprintf(stderr, " [-Ttimestamp] [-u] file ...\n\n");
+ fprintf(stderr, "Options:\n");
+ fprintf(stderr, " -S[file.xml] Pseudo-sign using the entitlements in file.xml\n");
+ fprintf(stderr, " -Kkey.p12 Sign using private key in key.p12\n");
+ fprintf(stderr, " -Upassword Use password to unlock key.p12\n");
+ fprintf(stderr, " -M Merge entitlements with any existing\n");
+ fprintf(stderr, " -h Print CDHash of file\n\n");
+ fprintf(stderr, "More information: 'man ldid'\n");
}
#ifndef LDID_NOTOOLS
int main(int argc, char *argv[]) {
#ifndef LDID_NOSMIME
OpenSSL_add_all_algorithms();
+# if OPENSSL_VERSION_NUMBER >= 0x30000000
+ OSSL_PROVIDER *legacy = OSSL_PROVIDER_load(NULL, "legacy");
+ OSSL_PROVIDER *deflt = OSSL_PROVIDER_load(NULL, "default");
+# endif
#endif
union {
flag_M = true;
break;
+ case 'U':
+ password = argv[argi] + 2;
+ break;
+
case 'K':
if (argv[argi][2] != '\0')
key.open(argv[argi] + 2, O_RDONLY, PROT_READ, MAP_PRIVATE);
++filei;
}
+#ifndef LDID_NOSMINE
+# if OPENSSL_VERSION_NUM >= 0x30000000
+ OSSL_PROVIDER_unload(legacy);
+ OSSL_PROVIDER_unload(deflt);
+# endif
+#endif
+
return filee;
}
#endif
git.ckatri.com / ldid.git / blobdiff