Changeset 74726 in vbox for trunk/include/iprt/crypto

Timestamp:

Oct 9, 2018 9:06:46 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

125654

Message:

IPRT/ldr: More hacking Mach-O code signatures. bugref:9232

File:

• trunk/include/iprt/crypto/applecodesign.h (modified) (5 diffs)

trunk/include/iprt/crypto/applecodesign.h

@@ -63 +63 @@
  *       greater-than and less-than comparisons works correctly.
  * @{  */
+#define RTCRAPLCS_VER_2_0                               UINT32_C(0x00020000)
 #define RTCRAPLCS_VER_SUPPORTS_SCATTER                  UINT32_C(0x00020100)
 #define RTCRAPLCS_VER_SUPPORTS_TEAMID                   UINT32_C(0x00020200)
+#define RTCRAPLCS_VER_SUPPORTS_CODE_LIMIT_64            UINT32_C(0x00020300)
+#define RTCRAPLCS_VER_SUPPORTS_EXEC_SEG                 UINT32_C(0x00020400)
 /** @} */
 
@@ -78 +81 @@
 #define RTCRAPLCS_SLOT_ALTERNATE_CODEDIRECTORIES        RT_N2H_U32_C(UINT32_C(0x00001000))
 #define RTCRAPLCS_SLOT_ALTERNATE_CODEDIRECTORIES_END    RT_N2H_U32_C(UINT32_C(0x00001005))
+#define RTCRAPLCS_SLOT_ALTERNATE_CODEDIRECTORIES_COUNT  UINT32_C(0x00000005)
 #define RTCRAPLCS_SLOT_ALTERNATE_CODEDIRECTORY_INC      RT_N2H_U32_C(UINT32_C(0x00000001))
 /** The signature.
@@ -162 +166 @@
     /** 0x0c: Flags & mode, RTCRAPLCS_???.  (Big endian. ) */
     uint32_t        fFlags;
-    /** 0x10: Offset of the hash slots.  Big endian. */
+    /** 0x10: Offset of the hash slots.  Big endian.
+     * Special slots found below this offset, code slots at and after.  */
     uint32_t        offHashSlots;
     /** 0x14: Offset of the identifier string.  Big endian. */
@@ -170 +175 @@
     /** 0x1c: Number of code hash slots.  Big endian. */
     uint32_t        cCodeSlots;
-    /** 0x20: Number of bytes of code that's covered.  Big endian. */
-    uint32_t        cbCodeLimit;
+    /** 0x20: Number of bytes of code that's covered, 32-bit wide.  Big endian. */
+    uint32_t        cbCodeLimit32;
     /** 0x24: The hash size. */
     uint8_t         cbHash;
@@ -181 +186 @@
     uint8_t         cPageShift;
     /** 0x28: Spare field, MBZ. */
-    uint32_t        uUnused;
+    uint32_t        uUnused1;
     /** 0x2c: Offset of scatter vector (optional).  Big endian.
      * @since RTCRAPLCS_VER_SUPPORTS_SCATTER */
     uint32_t        offScatter;
     /** 0x30: Offset of team identifier (optional).  Big endian.
-     * @since RTCRAPLCS_VER_SUPPORTS_TEAM */
-    uint32_t        offTeam;
+     * @since RTCRAPLCS_VER_SUPPORTS_TEAMID */
+    uint32_t        offTeamId;
+    /** 0x34: Unused field, MBZ.
+     * @since RTCRAPLCS_VER_SUPPORTS_CODE_LIMIT_64 */
+    uint32_t        uUnused2;
+    /** 0x38: Number of bytes of code that's covered, 64-bit wide.  Big endian.
+     * @since RTCRAPLCS_VER_SUPPORTS_CODE_LIMIT_64 */
+    uint64_t        cbCodeLimit64;
+    /** 0x40: File offset of the first segment.  Big endian.
+     * @since RTCRAPLCS_VER_SUPPORTS_EXEC_SEG
+     * @note  Would be better to just sign the exe header + load commands. */
+    uint64_t        offExecSeg;
+    /** 0x48: The size of the first segment.  Big endian.
+     * @since RTCRAPLCS_VER_SUPPORTS_EXEC_SEG */
+    uint64_t        cbExecSeg;
+    /** 0x50: Flags for the first segment.  Big endian.
+     * @since RTCRAPLCS_VER_SUPPORTS_EXEC_SEG */
+    uint64_t        fExecSeg;
 } RTCRAPLCSCODEDIRECTORY;
-AssertCompileSize(RTCRAPLCSCODEDIRECTORY, 0x34);
+AssertCompileSize(RTCRAPLCSCODEDIRECTORY, 0x58);
 /** Pointer to a CS code directory. */
 typedef RTCRAPLCSCODEDIRECTORY *PRTCRAPLCSCODEDIRECTORY;