X-Git-Url: https://git.saurik.com/ldid.git/blobdiff_plain/c05d97585c834a81efaf4e3288c22af9ab45743b..e067acdcc9870305978666f6c1f277688893dc01:/ldid.cpp?ds=inline diff --git a/ldid.cpp b/ldid.cpp index 3bf2f77..19bfcc7 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -36,6 +36,7 @@ */ #include "minimal/stdlib.h" +#include "minimal/string.h" #include "minimal/mapping.h" #include "sha1.h" @@ -301,9 +302,12 @@ int main(int argc, const char *argv[]) { bool flag_t(false); bool flag_p(false); bool flag_u(false); + bool flag_e(false); bool flag_T(false); + bool flag_S(false); + bool flag_s(false); bool timeh(false); uint32_t timev(0); @@ -313,7 +317,14 @@ int main(int argc, const char *argv[]) { std::vector files; - _assert(argc != 0); + if (argc == 1) { + fprintf(stderr, "usage: %s -S[entitlements.xml] \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); + } + for (int argi(1); argi != argc; ++argi) if (argv[argi][0] != '-') files.push_back(argv[argi]); @@ -322,8 +333,15 @@ int main(int argc, const char *argv[]) { case 't': flag_t = true; break; case 'u': flag_u = true; break; case 'p': flag_p = true; break; + case 'e': flag_e = true; break; + + case 's': + _assert(!flag_S); + flag_s = true; + break; case 'S': + _assert(!flag_s); flag_S = true; if (argv[argi][2] != '\0') { const char *xml = argv[argi] + 2; @@ -356,10 +374,9 @@ int main(int argc, const char *argv[]) { const char *path(file->c_str()); const char *base = strrchr(path, '/'); char *temp(NULL), *dir; - mode_t mode = 0; if (base != NULL) - dir = strndup(path, base++ - path + 1); + dir = strndup_(path, base++ - path + 1); else { dir = strdup(""); base = path; @@ -404,8 +421,8 @@ int main(int argc, const char *argv[]) { _syscall(pid); if (pid == 0) { char *ssize; - asprintf(&ssize, "%u", (sizeof(struct SuperBlob) + 2 * sizeof(struct BlobIndex) + sizeof(struct CodeDirectory) + strlen(base) + 1 + (size + 0x1000 - 1) / 0x1000 * 0x14 + 0xc + (xmld == NULL ? 0 : 0x10 + xmls) + 15) / 16 * 16); - //printf("codesign_allocate -i %s -a %s %s -o %s\n", path, arch, ssize, temp); + asprintf(&ssize, "%u", (sizeof(struct SuperBlob) + 2 * sizeof(struct BlobIndex) + sizeof(struct CodeDirectory) + strlen(base) + 1 + ((xmld == NULL ? CSSLOT_REQUIREMENTS : CSSLOT_ENTITLEMENTS) + (size + 0x1000 - 1) / 0x1000) * 0x14 + 0xc + (xmld == NULL ? 0 : 0x10 + xmls) + 15) / 16 * 16); + //printf("%s -i %s -a %s %s -o %s\n", allocate, path, arch, ssize, temp); execlp(allocate, allocate, "-i", path, "-a", arch, ssize, "-o", temp, NULL); _assert(false); } @@ -461,6 +478,50 @@ int main(int argc, const char *argv[]) { } } + if (flag_e) { + _assert(signature != NULL); + + uint32_t data = framework.Swap(signature->dataoff); + uint32_t size = framework.Swap(signature->datasize); + + uint8_t *top = reinterpret_cast(framework.GetBase()); + uint8_t *blob = top + data; + struct SuperBlob *super = reinterpret_cast(blob); + + for (size_t index(0); index != Swap(super->count); ++index) + if (Swap(super->index[index].type) == CSSLOT_ENTITLEMENTS) { + uint32_t begin = Swap(super->index[index].offset); + struct Blob *entitlements = reinterpret_cast(blob + begin); + fwrite(entitlements + 1, 1, Swap(entitlements->length) - sizeof(struct Blob), stdout); + } + } + + if (flag_s) { + _assert(signature != NULL); + + uint32_t data = framework.Swap(signature->dataoff); + uint32_t size = framework.Swap(signature->datasize); + + uint8_t *top = reinterpret_cast(framework.GetBase()); + uint8_t *blob = top + data; + struct SuperBlob *super = reinterpret_cast(blob); + + for (size_t index(0); index != Swap(super->count); ++index) + if (Swap(super->index[index].type) == CSSLOT_CODEDIRECTORY) { + uint32_t begin = Swap(super->index[index].offset); + struct CodeDirectory *directory = reinterpret_cast(blob + begin); + + uint8_t (*hashes)[20] = reinterpret_cast(blob + begin + Swap(directory->hashOffset)); + uint32_t pages = Swap(directory->nCodeSlots); + + if (pages != 1) + for (size_t i = 0; i != pages - 1; ++i) + sha1(hashes[i], top + 0x1000 * i, 0x1000); + if (pages != 0) + sha1(hashes[pages - 1], top + 0x1000 * (pages - 1), ((data - 1) % 0x1000) + 1); + } + } + if (flag_S) { _assert(signature != NULL); @@ -496,21 +557,26 @@ int main(int argc, const char *argv[]) { strcpy(reinterpret_cast(blob + offset), base); offset += strlen(base) + 1; + uint32_t special = xmld == NULL ? CSSLOT_REQUIREMENTS : CSSLOT_ENTITLEMENTS; + directory->nSpecialSlots = Swap(special); + uint8_t (*hashes)[20] = reinterpret_cast(blob + offset); - uint32_t special = 0; + memset(hashes, 0, sizeof(*hashes) * special); + + offset += sizeof(*hashes) * special; + hashes += special; uint32_t pages = (data + 0x1000 - 1) / 0x1000; - directory->nSpecialSlots = Swap(special); directory->nCodeSlots = Swap(pages); if (pages != 1) for (size_t i = 0; i != pages - 1; ++i) - sha1(hashes[special + i], top + 0x1000 * i, 0x1000); + sha1(hashes[i], top + 0x1000 * i, 0x1000); if (pages != 0) - sha1(hashes[special + pages - 1], top + 0x1000 * (pages - 1), data % 0x1000); + sha1(hashes[pages - 1], top + 0x1000 * (pages - 1), ((data - 1) % 0x1000) + 1); directory->hashOffset = Swap(offset - begin); - offset += sizeof(*hashes) * (special + pages); + offset += sizeof(*hashes) * pages; directory->blob.length = Swap(offset - begin); super->index[1].type = Swap(CSSLOT_REQUIREMENTS); @@ -534,11 +600,20 @@ int main(int argc, const char *argv[]) { entitlements->length = Swap(offset - begin); } + for (size_t index(0); index != count; ++index) { + uint32_t type = Swap(super->index[index].type); + if (type != 0 && type <= special) { + uint32_t offset = Swap(super->index[index].offset); + struct Blob *local = (struct Blob *) (blob + offset); + sha1((uint8_t *) (hashes - type), (uint8_t *) local, Swap(local->length)); + } + } + super->count = Swap(count); super->blob.length = Swap(offset); if (offset > size) { - fprintf(stderr, "offset (%zu) > size (%zu)\n", offset, size); + fprintf(stderr, "offset (%u) > size (%u)\n", offset, size); _assert(false); } //else fprintf(stderr, "offset (%zu) <= size (%zu)\n", offset, size);