Changeset 302

Timestamp:

06/13/08 23:27:12 (5 months ago)

Author:

saurik

Message:

Replaced codesign with ldid -S.

Location:

trunk/util

Files:

• ldid.cpp (modified) (12 diffs)
• sha1.c (added)
• sha1.h (added)

trunk/util/ldid.cpp

@@ -39 +39 @@
 #include "minimal/mapping.h"
 
+#include "sha1.h"
+
 #include <cstring>
 #include <string>
 #include <vector>
+
+#include <sys/wait.h>
 
 struct fat_header {
@@ -69 +73 @@
 };
 
-#define MH_MAGIC 0xfeedface
+#define MH_MAGIC 0xfeedface
 #define MH_CIGAM 0xcefaedfe
 
-#define MH_EXECUTE 0x2
-#define MH_DYLIB   0x6
-#define MH_BUNDLE  0x8
+#define MH_EXECUTE 0x2
+#define MH_DYLIB   0x6
+#define MH_BUNDLE  0x8
 
 struct load_command {
@@ -83 +87 @@
 #define LC_REQ_DYLD  0x80000000
 
-#define LC_LOAD_DYLIB      0x0c
-#define LC_ID_DYLIB        0x0d
-#define LC_UUID            0x1b
+#define LC_LOAD_DYLIB      0x0c
+#define LC_ID_DYLIB        0x0d
+#define LC_UUID            0x1b
+#define LC_CODE_SIGNATURE  0x1d
 #define LC_REEXPORT_DYLIB (0x1f | LC_REQ_DYLD)
 
@@ -106 +111 @@
     uint8_t uuid[16];
 };
+
+struct linkedit_data_command {
+    uint32_t cmd;
+    uint32_t cmdsize;
+    uint32_t dataoff;
+    uint32_t datasize;
+};
+
+uint16_t Swap_(uint16_t value) {
+    return
+        ((value >>  8) & 0x00ff) |
+        ((value <<  8) & 0xff00);
+}
+
+uint32_t Swap_(uint32_t value) {
+    value = ((value >>  8) & 0x00ff00ff) |
+            ((value <<  8) & 0xff00ff00);
+    value = ((value >> 16) & 0x0000ffff) |
+            ((value << 16) & 0xffff0000);
+    return value;
+}
+
+int16_t Swap_(int16_t value) {
+    return Swap_(static_cast<uint16_t>(value));
+}
+
+int32_t Swap_(int32_t value) {
+    return Swap_(static_cast<uint32_t>(value));
+}
+
+uint16_t Swap(uint16_t value) {
+    return true ? Swap_(value) : value;
+}
+
+uint32_t Swap(uint32_t value) {
+    return true ? Swap_(value) : value;
+}
+
+int16_t Swap(int16_t value) {
+    return Swap(static_cast<uint16_t>(value));
+}
+
+int32_t Swap(int32_t value) {
+    return Swap(static_cast<uint32_t>(value));
+}
 
 class Framework {
@@ -115 +165 @@
 
   public:
+    uint16_t Swap(uint16_t value) const {
+        return swapped_ ? Swap_(value) : value;
+    }
+
+    uint32_t Swap(uint32_t value) const {
+        return swapped_ ? Swap_(value) : value;
+    }
+
     int16_t Swap(int16_t value) const {
         return Swap(static_cast<uint16_t>(value));
@@ -121 +179 @@
     int32_t Swap(int32_t value) const {
         return Swap(static_cast<uint32_t>(value));
-    }
-
-    uint16_t Swap(uint16_t value) const {
-        return !swapped_ ? value :
-            ((value >>  8) & 0x00ff) |
-            ((value <<  8) & 0xff00);
-    }
-
-    uint32_t Swap(uint32_t value) const {
-        if (!swapped_)
-            return value;
-        else {
-            value = ((value >>  8) & 0x00ff00ff) |
-                    ((value <<  8) & 0xff00ff00);
-            value = ((value >> 16) & 0x0000ffff) |
-                    ((value << 16) & 0xffff0000);
-            return value;
-        }
     }
 
@@ -199 +239 @@
 };
 
+#define CSMAGIC_CODEDIRECTORY 0xfade0c02
+#define CSMAGIC_EMBEDDED_SIGNATURE 0xfade0cc0
+#define CSSLOT_CODEDIRECTORY 0
+
+struct BlobIndex {
+    uint32_t type;
+    uint32_t offset;
+};
+
+struct SuperBlob {
+    uint32_t magic;
+    uint32_t length;
+    uint32_t count;
+    struct BlobIndex index[];
+};
+
+struct CodeDirectory {
+    uint32_t magic;
+    uint32_t length;
+    uint32_t version;
+    uint32_t flags;
+    uint32_t hashOffset;
+    uint32_t identOffset;
+    uint32_t nSpecialSlots;
+    uint32_t nCodeSlots;
+    uint32_t codeLimit;
+    uint8_t hashSize;
+    uint8_t hashType;
+    uint8_t spare1;
+    uint8_t pageSize;
+    uint32_t spare2;
+};
+
 extern "C" uint32_t hash(uint8_t *k, uint32_t length, uint32_t initval);
+
+#define CODESIGN_ALLOCATE "arm-apple-darwin9-codesign_allocate"
+
+void sha1(uint8_t *hash, uint8_t *data, size_t size) {
+    SHA1Context context;
+    SHA1Reset(&context);
+    SHA1Input(&context, data, size);
+    SHA1Result(&context, hash);
+}
 
 int main(int argc, const char *argv[]) {
@@ -208 +290 @@
 
     bool flag_T(false);
+    bool flag_S(false);
 
     bool timeh(false);
@@ -223 +306 @@
             case 'u': flag_u = true; break;
             case 'p': flag_p = true; break;
+            case 'S': flag_S = true; break;
 
             case 'T': {
@@ -246 +330 @@
     size_t filei(0), filee(0);
     _foreach (file, files) try {
-        Framework framework(file->c_str());
+        const char *path(file->c_str());
+        const char *base = strrchr(path, '/');
+        char *temp(NULL), *dir;
+
+        if (base != NULL)
+            dir = strndup(path, base++ - path + 1);
+        else {
+            dir = strdup("");
+            base = path;
+        }
+
+        if (flag_S) {
+            asprintf(&temp, "%s.%s.cs", dir, base);
+            const char *allocate = getenv("CODESIGN_ALLOCATE");
+            if (allocate == NULL)
+                allocate = "codesign_allocate";
+
+            size_t size; {
+                Framework framework(path);
+                size = framework.GetSize();
+            }
+
+            pid_t pid = fork();
+            _syscall(pid);
+            if (pid == 0) {
+                char *ssize;
+                asprintf(&ssize, "%u", (sizeof(struct SuperBlob) + sizeof(struct BlobIndex) + sizeof(struct CodeDirectory) + strlen(base) + 1 + (size + 0x1000 - 1) / 0x1000 * 0x14 + 15) / 16 * 16);
+                printf("%s\n", ssize);
+                execlp(allocate, allocate, "-i", path, "-a", "arm", ssize, "-o", temp, NULL);
+                _assert(false);
+            }
+
+            int status;
+            _syscall(waitpid(pid, &status, 0));
+            _assert(WIFEXITED(status));
+            _assert(WEXITSTATUS(status) == 0);
+        }
+
+        Framework framework(temp == NULL ? path : temp);
+        struct linkedit_data_command *signature(NULL);
 
         if (flag_p)
@@ -256 +379 @@
             if (flag_R && cmd == LC_REEXPORT_DYLIB)
                 (*load_command)->cmd = framework.Swap(LC_LOAD_DYLIB);
+            else if (cmd == LC_CODE_SIGNATURE)
+                signature = reinterpret_cast<struct linkedit_data_command *>(*load_command);
             else if (cmd == LC_UUID) {
                 volatile struct uuid_command *uuid_command(reinterpret_cast<struct uuid_command *>(*load_command));
@@ -288 +413 @@
         }
 
+        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<uint8_t *>(framework.GetBase());
+            uint8_t *blob = top + data;
+            struct SuperBlob *super = reinterpret_cast<struct SuperBlob *>(blob);
+            super->magic = Swap(CSMAGIC_EMBEDDED_SIGNATURE);
+
+            uint32_t count = 1;
+            uint32_t offset = sizeof(struct SuperBlob) + count * sizeof(struct BlobIndex);
+
+            super->index[0].type = Swap(CSSLOT_CODEDIRECTORY);
+            super->index[0].offset = Swap(offset);
+
+            uint32_t begin = offset;
+            struct CodeDirectory *directory = reinterpret_cast<struct CodeDirectory *>(blob + begin);
+            offset += sizeof(struct CodeDirectory);
+
+            directory->magic = Swap(CSMAGIC_CODEDIRECTORY);
+            directory->version = Swap(0x00020001);
+            directory->flags = Swap(0);
+            directory->codeLimit = Swap(data);
+            directory->hashSize = 0x14;
+            directory->hashType = 0x01;
+            directory->spare1 = 0x00;
+            directory->pageSize = 0x0c;
+            directory->spare2 = Swap(0);
+
+            directory->identOffset = Swap(offset - begin);
+            strcpy(reinterpret_cast<char *>(blob + offset), base);
+            offset += strlen(base) + 1;
+
+            uint8_t (*hashes)[20] = reinterpret_cast<uint8_t (*)[20]>(blob + offset);
+            uint32_t special = 0;
+
+            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);
+            if (pages != 0)
+                sha1(hashes[special + pages - 1], top + 0x1000 * (pages - 1), data % 0x1000);
+
+            directory->hashOffset = Swap(offset - begin);
+            offset += sizeof(*hashes) * (special + pages);
+            directory->length = Swap(offset - begin);
+
+            super->count = Swap(count);
+            super->length = Swap(offset);
+
+            _assert(offset < size);
+            memset(blob + offset, 0, size - offset);
+        }
+
+        if (temp) {
+            _syscall(unlink(path));
+            _syscall(rename(temp, path));
+            free(temp);
+        }
+
+        free(dir);
         ++filei;
     } catch (const char *) {