X-Git-Url: https://git.cameronkatri.com/ldid.git/blobdiff_plain/56459e5774b4089e734239f51961f128957f62c5..e1aab7c3043ca8f7c08b171dedf204fde92b42da:/ldid.cpp diff --git a/ldid.cpp b/ldid.cpp index b228419..9042d87 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -2,6 +2,7 @@ * Copyright (C) 2007-2015 Jay Freeman (saurik) */ +/* SPDX-License-Identifier: AGPL-3.0-only */ /* GNU Affero General Public License, Version 3 {{{ */ /* * This program is free software: you can redistribute it and/or modify @@ -43,10 +44,16 @@ #include #ifndef LDID_NOSMIME +#include +# if OPENSSL_VERSION_MAJOR >= 3 +# include +# endif #include #include +#include #include #include +#include #endif #ifdef __APPLE__ @@ -91,6 +98,8 @@ #include "ldid.hpp" +#include "machine.h" + #define _assert___(line) \ #line #define _assert__(line) \ @@ -129,7 +138,8 @@ for (auto success : (long[]) {EINTR, __VA_ARGS__}) \ if (error == success) \ return (decltype(expr)) -success; \ - _assert_(false, "errno=%u", error); \ + fprintf(stderr, "ldid: %s: %s\n", __func__, strerror(error)); \ + exit(1); \ } }() #define _trace() \ @@ -141,6 +151,10 @@ #define _packed \ __attribute__((packed)) +#ifndef LDID_NOSMIME +std::string password; +#endif + template struct Iterator_ { typedef typename Type_::const_iterator Result; @@ -187,27 +201,6 @@ Scope _scope(const Function_ &function) { #define _scope(function) \ _scope_(__COUNTER__, function) -#define CPU_ARCH_MASK uint32_t(0xff000000) -#define CPU_ARCH_ABI64 uint32_t(0x01000000) - -#define CPU_TYPE_ANY uint32_t(-1) -#define CPU_TYPE_VAX uint32_t( 1) -#define CPU_TYPE_MC680x0 uint32_t( 6) -#define CPU_TYPE_X86 uint32_t( 7) -#define CPU_TYPE_MC98000 uint32_t(10) -#define CPU_TYPE_HPPA uint32_t(11) -#define CPU_TYPE_ARM uint32_t(12) -#define CPU_TYPE_MC88000 uint32_t(13) -#define CPU_TYPE_SPARC uint32_t(14) -#define CPU_TYPE_I860 uint32_t(15) -#define CPU_TYPE_POWERPC uint32_t(18) - -#define CPU_TYPE_I386 CPU_TYPE_X86 - -#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) - struct fat_header { uint32_t magic; uint32_t nfat_arch; @@ -515,6 +508,10 @@ static std::streamsize read(std::streambuf &stream, void *data, size_t size) { 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); } @@ -533,6 +530,10 @@ static inline void put(std::streambuf &stream, const void *data, size_t size, co } } +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) @@ -548,6 +549,41 @@ static inline void pad(std::streambuf &stream, size_t size) { put(stream, padding, size); } +/* + * Heavily based on zsign's _GenerateASN1Type(): https://github.com/zhlynn/zsign/blob/44f15cae53e4a5a000fa7486dd72f472a4c75ee4/openssl.cpp#L116 + * SPDX-License-Identifier: BSD-3-Clause OR AGPL-3.0-only + */ +static ASN1_TYPE *GenerateASN1Type(const std::string &value) +{ + std::string asn1String = "asn1=SEQUENCE:A\n[A]\nC=OBJECT:sha256\nB=FORMAT:HEX,OCT:" + value + "\n"; + + BIO *bio = BIO_new(BIO_s_mem()); + BIO_puts(bio, asn1String.c_str()); + _scope({ BIO_free(bio); }); + + CONF *conf = NCONF_new(NULL); + _scope({ NCONF_free(conf); }); + + long line = -1; + int result = NCONF_load_bio(conf, bio, &line); + if (result <= 0) + { + printf("Error generating ASN1 Type: %d (Line %ld)\n", result, line); + ERR_print_errors_fp(stdout); + return NULL; + } + + char *string = NCONF_get_string(conf, "default", "asn1"); + if (string == NULL) + { + ERR_print_errors_fp(stdout); + return NULL; + } + + ASN1_TYPE *type = ASN1_generate_nconf(string, conf); + return type; +} + template Type_ Align(Type_ value, size_t align) { value += align - 1; @@ -559,6 +595,159 @@ Type_ Align(Type_ value, size_t align) { 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 +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 &values) { + std::stringbuf data; + put(data, 0x30); + der_(data, values); + return data.str(); +} + +static std::string der(const std::multiset &values) { + std::stringbuf data; + put(data, 0x31); + der_(data, values); + return data.str(); +} + +static std::string der(const std::pair &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: { + fprintf(stderr, "ldid: Invalid plist entry type\n"); + exit(1); + } break; + + case PLIST_DATE: { + fprintf(stderr, "ldid: Invalid plist entry type\n"); + exit(1); + } 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 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 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: { + fprintf(stderr, "ldid: Unsupported plist type %d", type); + exit(1); + } break; + } +} +#endif + static inline uint16_t Swap_(uint16_t value) { return ((value >> 8) & 0x00ff) | @@ -691,7 +880,8 @@ class MachHeader : break; default: - _assert(false); + fprintf(stderr, "ldid: Unknown header magic\nAre you sure that is a Mach-O?\n"); + exit(1); } void *post = mach_header_ + 1; @@ -699,12 +889,13 @@ class MachHeader : post = (uint32_t *) post + 1; load_command_ = (struct load_command *) post; - _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 - ); + if (Swap(mach_header_->filetype) != MH_EXECUTE && + Swap(mach_header_->filetype) != MH_DYLIB && + Swap(mach_header_->filetype) != MH_DYLINKER && + Swap(mach_header_->filetype) != MH_BUNDLE) { + fprintf(stderr, "ldid: Unsupported Mach-O type\n"); + exit(1); + } } bool Bits64() const { @@ -843,6 +1034,7 @@ class FatHeader : #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) @@ -852,6 +1044,8 @@ class FatHeader : #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) @@ -861,6 +1055,26 @@ class FatHeader : #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; @@ -892,8 +1106,22 @@ struct CodeDirectory { 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 { @@ -905,6 +1133,7 @@ enum CodeSignatureFlags { kSecCodeSignatureRestrict = 0x0800, kSecCodeSignatureEnforcement = 0x1000, kSecCodeSignatureLibraryValidation = 0x2000, + kSecCodeSignatureRuntime = 0x10000, }; enum Kind : uint32_t { @@ -1057,13 +1286,14 @@ static const std::vector &GetAlgorithms() { struct Baton { std::string entitlements_; + std::string derformat_; }; 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_; @@ -1099,8 +1329,11 @@ class File { } void open(const char *path, int flags) { - _assert(file_ == -1); - file_ = _syscall(::open(path, flags)); + file_ = ::open(path, flags); + if (file_ == -1) { + fprintf(stderr, "ldid: %s: %s\n", path, strerror(errno)); + exit(1); + } } int file() const { @@ -1222,7 +1455,7 @@ std::string Analyze(const void *data, size_t size) { return entitlements; } -static void Allocate(const void *idata, size_t isize, std::streambuf &output, const Functor &allocate, const Functor &save, const Progress &progress) { +static void Allocate(const void *idata, size_t isize, std::streambuf &output, const Functor &allocate, const Functor &save, const Progress &progress) { FatHeader source(const_cast(idata), isize); size_t offset(0); @@ -1277,6 +1510,7 @@ static void Allocate(const void *idata, size_t isize, std::streambuf &output, co break; case CPU_TYPE_ARM: case CPU_TYPE_ARM64: + case CPU_TYPE_ARM64_32: align = 0xe; break; default: @@ -1304,6 +1538,9 @@ static void Allocate(const void *idata, size_t isize, std::streambuf &output, co case CPU_TYPE_ARM64: arch = "arm64"; break; + case CPU_TYPE_ARM64_32: + arch = "arm64_32"; + break; } offset = Align(offset, 1 << align); @@ -1326,14 +1563,27 @@ static void Allocate(const void *idata, size_t isize, std::streambuf &output, co 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); @@ -1347,6 +1597,9 @@ static void Allocate(const void *idata, size_t isize, std::streambuf &output, co pad(output, allocation.offset_ - position); position = allocation.offset_; + size_t left(-1); + size_t right(0); + std::vector commands; _foreach (load_command, mach_header.GetLoadCommands()) { @@ -1357,22 +1610,44 @@ static void Allocate(const void *idata, size_t isize, std::streambuf &output, co continue; break; + // XXX: this is getting ridiculous: provide a better abstraction + case LC_SEGMENT: { auto segment_command(reinterpret_cast(©[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(©[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; } @@ -1434,7 +1709,7 @@ static void Allocate(const void *idata, size_t isize, std::streambuf &output, co pad(output, allocation.limit_ - allocation.size_); position += allocation.limit_ - allocation.size_; - size_t saved(save(mach_header, allocation.baton_, 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 @@ -1520,9 +1795,19 @@ class Buffer { Buffer(PKCS7 *pkcs) : Buffer() { - _assert(i2d_PKCS7_bio(bio_, pkcs) != 0); + if(i2d_PKCS7_bio(bio_, pkcs) == 0){ + fprintf(stderr, "ldid: An error occured while getting the PKCS12 file: %s\n", ERR_error_string(ERR_get_error(), NULL)); + exit(1); + } + } + + Buffer(CMS_ContentInfo *cms) : + Buffer() + { + _assert(i2d_CMS_bio(bio_, cms) != 0); } + ~Buffer() { BIO_free_all(bio_); } @@ -1550,15 +1835,32 @@ class Stuff { value_(d2i_PKCS12_bio(bio, NULL)), ca_(NULL) { - _assert(value_ != NULL); - _assert(PKCS12_parse(value_, "", &key_, &cert_, &ca_) != 0); + if(value_ == NULL){ + fprintf(stderr, "ldid: An error occured while getting the PKCS12 file: %s\n", ERR_error_string(ERR_get_error(), NULL)); + exit(1); + } - _assert(key_ != NULL); - _assert(cert_ != NULL); + if (!PKCS12_verify_mac(value_, "", 0) && password.empty()) { + char passbuf[2048]; + UI_UTIL_read_pw_string(passbuf, 2048, "Enter password: ", 0); + password = passbuf; + } + + if(PKCS12_parse(value_, password.c_str(), &key_, &cert_, &ca_) <= 0){ + fprintf(stderr, "ldid: An error occured while parsing: %s\n", ERR_error_string(ERR_get_error(), NULL)); + exit(1); + } + if(key_ == NULL || cert_ == NULL){ + fprintf(stderr, "ldid: An error occured while parsing: %s\nYour p12 cert might not be valid\n", ERR_error_string(ERR_get_error(), NULL)); + exit(1); + } if (ca_ == NULL) ca_ = sk_X509_new_null(); - _assert(ca_ != NULL); + if(ca_ == NULL){ + fprintf(stderr, "ldid: An error occured while parsing: %s\n", ERR_error_string(ERR_get_error(), NULL)); + exit(1); + } } Stuff(const std::string &data) : @@ -1592,55 +1894,68 @@ class Stuff { class Signature { private: - PKCS7 *value_; + CMS_ContentInfo *value_; public: - Signature(const Stuff &stuff, const Buffer &data, const std::string &xml) { - value_ = PKCS7_new(); - _assert(value_ != NULL); + Signature(const Stuff &stuff, const Buffer &data, const std::string &xml,const std::vector& alternateCDSHA256) { + // + int flags = CMS_PARTIAL | CMS_DETACHED | CMS_NOSMIMECAP | CMS_BINARY; + //-------------------------------------------- + auto issuer_name(X509_get_issuer_name(stuff)); + _assert(issuer_name != NULL); + std::string issuer; + auto index(X509_NAME_get_index_by_NID(issuer_name, NID_commonName, -1)); + _assert(index >= 0); + auto next(X509_NAME_get_index_by_NID(issuer_name, NID_commonName, index)); + _assert(next == -1); + auto entry(X509_NAME_get_entry(issuer_name, index)); + _assert(entry != NULL); + auto asn(X509_NAME_ENTRY_get_data(entry)); + _assert(asn != NULL); + issuer.assign(reinterpret_cast(ASN1_STRING_get0_data(asn)), ASN1_STRING_length(asn)); + + CMS_ContentInfo *stream = CMS_sign(NULL, NULL, stuff, NULL, flags); + + CMS_SignerInfo *info = CMS_add1_signer(stream, stuff, stuff, EVP_sha256(), flags); + + + // Hash Agility + ASN1_OBJECT *obj = OBJ_txt2obj("1.2.840.113635.100.9.1", 1); + CMS_signed_add1_attr_by_OBJ(info, obj, 0x4, xml.c_str(), (int)xml.size()); + + // CDHashes (iOS 15.1+) + std::string sha256; + for (size_t i = 0; i < alternateCDSHA256.size(); i++) + { + char buf[16] = {0}; + sprintf(buf, "%02X", (uint8_t)alternateCDSHA256[i]); + sha256 += buf; + } - _assert(PKCS7_set_type(value_, NID_pkcs7_signed)); - _assert(PKCS7_content_new(value_, NID_pkcs7_data)); + X509_ATTRIBUTE *attribute = X509_ATTRIBUTE_new(); - 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))); + ASN1_OBJECT *obj2 = OBJ_txt2obj("1.2.840.113635.100.9.2", 1); + X509_ATTRIBUTE_set1_object(attribute, obj2); - // 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))); + ASN1_TYPE *type256 = GenerateASN1Type(sha256); + if (type256 != NULL) + { + X509_ATTRIBUTE_set1_data(attribute, V_ASN1_SEQUENCE, type256->value.asn1_string->data, type256->value.asn1_string->length); + } - PKCS7_set_detached(value_, 1); + CMS_signed_add1_attr(info, attribute); - ASN1_OCTET_STRING *string(ASN1_OCTET_STRING_new()); - _assert(string != NULL); - try { - _assert(ASN1_STRING_set(string, xml.data(), xml.size())); + CMS_final(stream, data, NULL, flags); - 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)); + value_ = stream; + _assert(value_ != NULL); } ~Signature() { - PKCS7_free(value_); + CMS_ContentInfo_free(value_); } - - operator PKCS7 *() const { + operator CMS_ContentInfo *() const { return value_; } }; @@ -1659,11 +1974,6 @@ class NullBuffer : } }; -class Digest { - public: - uint8_t sha1_[LDID_SHA1_DIGEST_LENGTH]; -}; - class HashBuffer : public std::streambuf { @@ -1789,7 +2099,7 @@ static void get(std::string &value, X509_NAME *name, int nid) { _assert(entry != NULL); auto asn(X509_NAME_ENTRY_get_data(entry)); _assert(asn != NULL); - value.assign(reinterpret_cast(ASN1_STRING_data(asn)), ASN1_STRING_length(asn)); + value.assign(reinterpret_cast(ASN1_STRING_get0_data(asn)), ASN1_STRING_length(asn)); } #endif @@ -1824,7 +2134,10 @@ Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::st if (!key.empty()) { Stuff stuff(key); auto name(X509_get_subject_name(stuff)); - _assert(name != NULL); + if(name == NULL){ + fprintf(stderr, "ldid: Your certificate might not be valid: %s\n", ERR_error_string(ERR_get_error(), NULL)); + exit(1); + } get(team, name, NID_organizationalUnitName); get(common, name, NID_commonName); } @@ -1883,50 +2196,47 @@ Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::st 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); + + auto merging(plist(entitlements)); + _scope({ plist_free(merging); }); + _assert(plist_get_node_type(merging) == PLIST_DICT); - char *xml(NULL); - uint32_t size; - plist_to_xml(combined, &xml, &size); - _scope({ free(xml); }); + plist_dict_iter iterator(NULL); + plist_dict_new_iter(merging, &iterator); + _scope({ free(iterator); }); - baton.entitlements_.assign(xml, size); + 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); @@ -1935,6 +2245,13 @@ Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::st 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); @@ -1957,17 +2274,60 @@ Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::st #endif return alloc; - }), 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 { + }), 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); } + uint64_t execs(0); + if (mach_header.Swap(mach_header->filetype) == MH_EXECUTE) + execs |= kSecCodeExecSegMainBinary; + if (!baton.entitlements_.empty()) { std::stringbuf data; 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); }); + if (plist_get_node_type(entitlements) != PLIST_DICT) { + fprintf(stderr, "ldid: Entitlements should be a plist dicionary\n"); + exit(1); + } + + 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 + } + + 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); @@ -1994,10 +2354,10 @@ Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::st 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_; @@ -2005,8 +2365,11 @@ Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::st 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)); @@ -2079,6 +2442,8 @@ Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::st plist_dict_set_item(plist, "cdhashes", cdhashes); #endif + std::vector alternateCDSHA256; + unsigned total(0); for (Algorithm *pointer : GetAlgorithms()) { Algorithm &algorithm(*pointer); @@ -2091,6 +2456,11 @@ Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::st algorithm(hash, blob.data(), blob.size()); hash.resize(20); + if (algorithm.type_ == CS_HASHTYPE_SHA256_256){ + alternateCDSHA256 = hash; + } + + #ifdef LDID_NOPLIST auto value(CFDataCreate(kCFAllocatorDefault, reinterpret_cast(hash.data()), hash.size())); _scope({ CFRelease(value); }); @@ -2118,7 +2488,7 @@ Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::st Stuff stuff(key); Buffer bio(sign); - Signature signature(stuff, sign, std::string(xml, size)); + Signature signature(stuff, sign, std::string(xml, size), alternateCDSHA256); Buffer result(signature); std::string value(result); put(data, value.data(), value.size()); @@ -2138,18 +2508,19 @@ Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::st 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, const Baton &baton, 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() { @@ -2225,8 +2596,7 @@ void DiskFolder::Find(const std::string &root, const std::string &base, const Fu void DiskFolder::Save(const std::string &path, bool edit, const void *flag, const Functor &code) { if (!edit) { - // XXX: use nullbuf - std::stringbuf save; + NullBuffer save; code(save); } else { std::filebuf save; @@ -2243,7 +2613,7 @@ bool DiskFolder::Look(const std::string &path) const { void DiskFolder::Open(const std::string &path, const Functor &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); @@ -2259,22 +2629,27 @@ SubFolder::SubFolder(Folder &parent, const std::string &path) : 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 &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 &code) const { - return parent_.Open(path_ + path, code); + return parent_.Open(Path(path), code); } void SubFolder::Find(const std::string &path, const Functor &code, const Functor &)> &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 { @@ -2360,6 +2735,8 @@ static void copy(std::streambuf &source, std::streambuf &target, size_t length, #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); @@ -2432,7 +2809,7 @@ struct Rule { Mode mode_; std::string code_; - mutable std::auto_ptr regex_; + mutable std::unique_ptr regex_; Rule(unsigned weight, Mode mode, const std::string &code) : weight_(weight), @@ -2498,17 +2875,29 @@ struct State { } }; -Bundle Sign(const std::string &root, Folder &folder, const std::string &key, State &remote, const std::string &requirements, const Functor &alter, const Progress &progress) { +Bundle Sign(const std::string &root, Folder &parent, const std::string &key, State &local, const std::string &requirements, const Functor &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 { + fprintf(stderr, "ldid: Could not find Info.plist\n"); + exit(1); + } + }()); folder.Open(info, fun([&](std::streambuf &buffer, size_t length, const void *flag) { plist_d(buffer, length, fun([&](plist_t node) { @@ -2517,10 +2906,8 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, Sta })); })); - if (!mac && folder.Look("MacOS/" + executable)) { + if (mac && info == "Info.plist") executable = "MacOS/" + executable; - mac = true; - } progress(root + "*"); @@ -2546,31 +2933,30 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, Sta 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$"}); } - State local; - std::string failure(mac ? "Contents/|Versions/[^/]*/Resources/" : ""); Expression nested("^(Frameworks/[^/]*\\.framework|PlugIns/[^/]*\\.appex(()|/[^/]*.app))/(" + failure + ")Info\\.plist$"); std::map bundles; @@ -2578,13 +2964,18 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, Sta folder.Find("", fun([&](const std::string &name) { if (!nested(name)) return; - auto bundle(root + Split(name).dir); - bundle.resize(bundle.size() - resources.size()); + auto bundle(Split(name).dir); + 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 : + State remote; + bundles[nested[1]] = Sign(root + bundle, subfolder, key, remote, "", Starts(name, "PlugIns/") ? alter : static_cast &>(fun([&](const std::string &, const std::string &) -> std::string { return entitlements; })) , progress); + local.Merge(bundle, remote); }), fun([&](const std::string &name, const Functor &read) { })); @@ -2759,7 +3150,7 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, Sta })); 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); @@ -2771,7 +3162,6 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, Sta })); })); - remote.Merge(root, local); return bundle; } @@ -2784,17 +3174,40 @@ Bundle Sign(const std::string &root, Folder &folder, const std::string &key, con #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] \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] [-C[adhoc | enforcement | expires | hard |\n", argv0); + fprintf(stderr, " host | kill | library-validation | restrict | runtime]] [-D] [-d]\n"); + fprintf(stderr, " [-Enum:file] [-e] [-H[sha1 | sha256]] [-h] [-Iname]\n"); + fprintf(stderr, " [-Kkey.p12 [-Upassword]] [-M] [-P] [-Qrequirements.xml] [-q]\n"); + fprintf(stderr, " [-r | -Sfile.xml | -s] [-Ttimestamp] [-u] [-arch arch_type] file ...\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_MAJOR >= 3 + OSSL_PROVIDER *legacy = OSSL_PROVIDER_load(NULL, "legacy"); + OSSL_PROVIDER *deflt = OSSL_PROVIDER_load(NULL, "default"); +# endif #endif union { @@ -2809,6 +3222,7 @@ int main(int argc, char *argv[]) { bool flag_q(false); bool flag_H(false); + bool flag_h(false); #ifndef LDID_NOFLAGT bool flag_T(false); @@ -2818,6 +3232,7 @@ int main(int argc, char *argv[]) { bool flag_s(false); bool flag_D(false); + bool flag_d(false); bool flag_A(false); bool flag_a(false); @@ -2854,10 +3269,34 @@ int main(int argc, char *argv[]) { for (int argi(1); argi != argc; ++argi) if (argv[argi][0] != '-') files.push_back(argv[argi]); - else switch (argv[argi][1]) { + else if (strcmp(argv[argi], "-arch") == 0) { + bool foundarch = false; + flag_A = true; + argi++; + if (argi == argc) { + fprintf(stderr, "ldid: -arch must be followed by an architecture string\n"); + exit(1); + } + for (int i = 0; archs[i].name != NULL; i++) { + if (strcmp(archs[i].name, argv[argi]) == 0) { + flag_CPUType = archs[i].cputype; + flag_CPUSubtype = archs[i].cpusubtype; + foundarch = true; + } + if (foundarch) + break; + } + + if (!foundarch) { + fprintf(stderr, "error: unknown architecture specification flag: -arch %s\n", argv[argi]); + exit(1); + } + } else switch (argv[argi][1]) { case 'r': - _assert(!flag_s); - _assert(!flag_S); + if (flag_s || flag_S) { + fprintf(stderr, "ldid: Can only specify one of -r, -S, -s\n"); + exit(1); + } flag_r = true; break; @@ -2886,9 +3325,6 @@ int main(int argc, char *argv[]) { 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); @@ -2896,20 +3332,29 @@ int main(int argc, char *argv[]) { do_sha1 = true; else if (strcmp(hash, "sha256") == 0) do_sha256 = true; - else _assert(false); + else { + fprintf(stderr, "ldid: only sha1 and sha256 are supported at this time\n"); + exit(1); + } } 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; case 'A': - _assert(!flag_A); + if (flag_A) { + fprintf(stderr, "ldid: -A can only be specified once\n"); + exit(1); + } flag_A = true; if (argv[argi][2] != '\0') { const char *cpu = argv[argi] + 2; @@ -2942,7 +3387,12 @@ int main(int argc, char *argv[]) { flags |= kSecCodeSignatureEnforcement; else if (strcmp(name, "library-validation") == 0) flags |= kSecCodeSignatureLibraryValidation; - else _assert(false); + else if (strcmp(name, "runtime") == 0) + flags |= kSecCodeSignatureRuntime; + else { + fprintf(stderr, "ldid: -C: Unsupported option\n"); + exit(1); + } } break; case 'P': @@ -2950,14 +3400,18 @@ int main(int argc, char *argv[]) { break; case 's': - _assert(!flag_r); - _assert(!flag_S); + if (flag_r || flag_S) { + fprintf(stderr, "ldid: Can only specify one of -r, -S, -s\n"); + exit(1); + } flag_s = true; break; case 'S': - _assert(!flag_r); - _assert(!flag_s); + if (flag_r || flag_s) { + fprintf(stderr, "ldid: Can only specify one of -r, -S, -s\n"); + exit(1); + } flag_S = true; if (argv[argi][2] != '\0') { const char *xml = argv[argi] + 2; @@ -2969,6 +3423,10 @@ int main(int argc, char *argv[]) { 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); @@ -3002,7 +3460,15 @@ int main(int argc, char *argv[]) { } _assert(flag_S || key.empty()); - _assert(flag_S || flag_I == NULL); + if (flag_I != NULL && !flag_S) { + fprintf(stderr, "ldid: -I requires -S\n"); + exit(1); + } + + 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; @@ -3012,12 +3478,18 @@ int main(int argc, char *argv[]) { std::string path(file); struct stat info; - _syscall(stat(path.c_str(), &info)); + if (stat(path.c_str(), &info) == -1) { + fprintf(stderr, "ldid: %s: %s\n", path.c_str(), strerror(errno)); + exit(1); + } if (S_ISDIR(info.st_mode)) { + if (!flag_S) { + fprintf(stderr, "ldid: Only -S can be used on directories\n"); + exit(1); + } #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); @@ -3104,14 +3576,21 @@ int main(int argc, char *argv[]) { #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); } - if (flag_e) { - _assert(signature != NULL); + if ((flag_e || flag_q || flag_s || flag_h) && signature == NULL) { + fprintf(stderr, "ldid: -e, -q, -s, and -h requre a signed binary\n"); + exit(1); + } + if (flag_e) { uint32_t data = mach_header.Swap(signature->dataoff); uint8_t *top = reinterpret_cast(mach_header.GetBase()); @@ -3127,8 +3606,6 @@ int main(int argc, char *argv[]) { } if (flag_q) { - _assert(signature != NULL); - uint32_t data = mach_header.Swap(signature->dataoff); uint8_t *top = reinterpret_cast(mach_header.GetBase()); @@ -3144,8 +3621,6 @@ int main(int argc, char *argv[]) { } if (flag_s) { - _assert(signature != NULL); - uint32_t data = mach_header.Swap(signature->dataoff); uint8_t *top = reinterpret_cast(mach_header.GetBase()); @@ -3167,6 +3642,82 @@ int main(int argc, char *argv[]) { LDID_SHA1(top + PageSize_ * (pages - 1), ((data - 1) % PageSize_) + 1, hashes[pages - 1]); } } + + if (flag_h) { + auto algorithms(GetAlgorithms()); + + uint32_t data = mach_header.Swap(signature->dataoff); + + uint8_t *top = reinterpret_cast(mach_header.GetBase()); + uint8_t *blob = top + data; + struct SuperBlob *super = reinterpret_cast(blob); + + struct Candidate { + CodeDirectory *directory_; + size_t size_; + Algorithm &algorithm_; + std::string hash_; + }; + + std::map 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(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; @@ -3175,6 +3726,13 @@ int main(int argc, char *argv[]) { ++filei; } +#ifndef LDID_NOSMIME +# if OPENSSL_VERSION_MAJOR >= 3 + OSSL_PROVIDER_unload(legacy); + OSSL_PROVIDER_unload(deflt); +# endif +#endif + return filee; } #endif