Commit 9dcf7ee9c904b25fbffd264cabeb6638e9d9e2d6 | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2020-11-20 11:50:44+01:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2020-11-26 11:50:09+01:00
log	9dcf7ee9c904b25fbffd264cabeb6638e9d9e2d6
tree	b15b3c0bcc0708e44e8009b15a4c0dc72f723a6a
parent	79381dc4fb1f7eb92b5e01d21f866f550ca3ff20

3 files changed, 17 insertions(+), 11 deletions(-)

lib/std/macho.zig+4-4

...	...	@@ -1402,6 +1402,10 @@ pub const CS_SIGNER_TYPE_UNKNOWN: u32 = 0;
1402	1402	pub const CS_SIGNER_TYPE_LEGACYVPN: u32 = 5;
1403	1403	pub const CS_SIGNER_TYPE_MAC_APP_STORE: u32 = 6;
1404	1404
	1405	pub const CS_ADHOC: u32 = 0x2;
	1406
	1407	pub const CS_EXECSEG_MAIN_BINARY: u32 = 0x1;
	1408
1405	1409	/// This CodeDirectory is tailored specfically at version 0x20400.
1406	1410	pub const CodeDirectory = extern struct {
1407	1411	/// Magic number (CSMAGIC_CODEDIRECTORY)
...	...	@@ -1488,8 +1492,6 @@ pub const SuperBlob = extern struct {
1488	1492
1489	1493	/// Number of index BlobIndex entries following this struct
1490	1494	count: u32,
1491
1492		// index: []const BlobIndex,
1493	1495	};
1494	1496
1495	1497	pub const GenericBlob = extern struct {
...	...	@@ -1498,6 +1500,4 @@ pub const GenericBlob = extern struct {
1498	1500
1499	1501	/// Total length of blob
1500	1502	length: u32,
1501
1502		// data: []const u8,
1503	1503	};

src/link/MachO.zig+1-1

...	...	@@ -1758,7 +1758,7 @@ fn writecodeSignature(self: *MachO) !void {
1758	1758	var code_sig = CodeSignature.init(self.base.allocator);
1759	1759	defer code_sig.deinit();
1760	1760
1761		try code_sig.calcAdhocSignature();
	1761	try code_sig.calcAdhocSignature(self);
1762	1762
1763	1763	var buffer = try self.base.allocator.alloc(u8, code_sig.size());
1764	1764	defer self.base.allocator.free(buffer);

src/link/MachO/CodeSignature.zig+12-6

...	...	@@ -8,6 +8,8 @@ const mem = std.mem;
8	8	const testing = std.testing;
9	9	const Allocator = mem.Allocator;
10	10
	11	const MachO = @import("../MachO.zig");
	12
11	13	const Blob = struct {
12	14	inner: macho.CodeDirectory,
13	15	data: std.ArrayListUnmanaged(u8) = .{},
...	...	@@ -56,13 +58,17 @@ pub fn init(alloc: *Allocator) CodeSignature {
56	58	};
57	59	}
58	60
59		pub fn calcAdhocSignature(self: *CodeSignature) !void {
	61	pub fn calcAdhocSignature(self: CodeSignature, bin_file: const MachO) !void {
	62	const text_segment = bin_file.load_commands.items[bin_file.text_segment_cmd_index.?].Segment;
	63	const execSegBase: u64 = text_segment.fileoff;
	64	const execSegLimit: u64 = text_segment.filesize;
	65	const execSegFlags: u64 = text_segment.flags;
60	66	var blob = Blob{
61	67	.inner = .{
62	68	.magic = macho.CSMAGIC_CODEDIRECTORY,
63	69	.length = @sizeOf(macho.CodeDirectory),
64		.version = 0x20400,
65		.flags = 0,
	70	.version = macho.CS_SUPPORTSEXECSEG,
	71	.flags = macho.CS_ADHOC,
66	72	.hashOffset = 0,
67	73	.identOffset = 0,
68	74	.nSpecialSlots = 0,
...	...	@@ -77,9 +83,9 @@ pub fn calcAdhocSignature(self: *CodeSignature) !void {
77	83	.teamOffset = 0,
78	84	.spare3 = 0,
79	85	.codeLimit64 = 0,
80		.execSegBase = 0,
81		.execSegLimit = 0,
82		.execSegFlags = 0,
	86	.execSegBase = execSegBase,
	87	.execSegLimit = execSegLimit,
	88	.execSegFlags = execSegFlags,
83	89	},
84	90	};
85	91	self.inner.length += @sizeOf(macho.BlobIndex) + blob.size();