Skip to content

Added iOS 12 support for signing #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added iOS 12 support for signing #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4da3a6
fix assertion error when trying to sign some special IPAs
subho007 Apr 15, 2020
23365f2
Add new load commands and binary magic number for iOS 12
subho007 Apr 15, 2020
0f79d68
Update CodeResources file generation for iOS 11+ (omit specific symlink)
subho007 Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions isign/code_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@ def scan(self):
filename)
# log.debug(rule_debug_fmt.format(rule, path, relative_path))

# specifically ignore the CodeResources symlink in base directory if it exists (iOS 11+ fix)
if relative_path == "CodeResources" and os.path.islink(path):
continue

# There's no rule for the Entitlements.plist file which we
# generate temporarily so we just ommit the file as a special
# case...
Expand Down
21 changes: 1 addition & 20 deletions isign/code_resources_template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</dict>
<key>rules</key>
<dict>
<key>^</key>
<key>^.*</key>
<true/>
<key>^.*\.lproj/</key>
<dict>
Expand Down Expand Up @@ -38,25 +38,13 @@
<key>weight</key>
<real>11</real>
</dict>
<key>^</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^(.*/)?\.DS_Store$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>2000</real>
</dict>
<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^.*</key>
<true/>
<key>^.*\.lproj/</key>
Expand Down Expand Up @@ -92,13 +80,6 @@
<key>weight</key>
<real>20</real>
</dict>
<key>^[^/]+$</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^embedded\.provisionprofile$</key>
<dict>
<key>weight</key>
Expand Down
8 changes: 7 additions & 1 deletion isign/macho.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@
LC_ENCRYPTION_INFO_64=0x2c,
LC_LINKER_OPTION=0x2d,
LC_LINKER_OPTIMIZATION_HINT=0x2e,
LC_VERSION_MIN_TVOS=0x2f,
LC_VERSION_MIN_WATCHOS=0x30,
LC_NOTE=0x31,
LC_BUILD_VERSION=0x32,
),

UInt32("cmdsize"),
Expand Down Expand Up @@ -174,6 +178,7 @@
Enum(UInt32("magic"),
MH_MAGIC=0xfeedface,
MH_MAGIC_64=0xfeedfacf,
MH_CIGAM_64=0xcffaedfe,
),
UInt32("cputype"),
UInt32("cpusubtype"),
Expand Down Expand Up @@ -227,7 +232,7 @@
MH_UNUSED_5=0x40000000,
MH_UNUSED_6=0x80000000,
),
If(lambda ctx: ctx['magic'] == 'MH_MAGIC_64', UInt32('reserved')), Rename('commands', Array(lambda ctx: ctx['ncmds'], LoadCommand)))
If(lambda ctx: ctx['magic'] in ('MH_MAGIC_64', 'MH_CIGAM_64'), UInt32('reserved')), Rename('commands', Array(lambda ctx: ctx['ncmds'], LoadCommand)))

FatArch = Struct("FatArch",
UBInt32("cputype"),
Expand All @@ -248,6 +253,7 @@
Peek(UInt32("magic")),
Switch("data", lambda ctx: ctx['magic'], {0xfeedface: MachO,
0xfeedfacf: MachO,
0xcffaedfe: MachO,
0xcafebabe: Fat,
0xbebafeca: Fat,
0xc10cdefa: Blob,
Expand Down
2 changes: 1 addition & 1 deletion isign/signable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def sign(self, app, signer):
# TODO: we assume that if any slice is unsigned, all slices are. This should be true in practice but
# we should still guard against this.
if self.sign_from_scratch and 'FatArch' in self.m.data:
assert len(self.arches) >= 2
assert len(self.arches) >= 1

# todo(markwang): Update fat headers and mach_start for each slice if needewd
log.debug('signing fat binary from scratch')
Expand Down