Skip to content
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

Jump to bottom

Adding support for OSX 10.14.6 build:18G2022 #341

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

Adding support for OSX 10.14.6 build:18G2022 #341

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb20147
Added support for 10.4.6
jquinter Jul 24, 2019
bdfe322
Adding support for version:10.14.6 build:18G2022
jquinter Dec 25, 2019
27af94f
Merge branch 'master' into master
jquinter Feb 3, 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
14 changes: 14 additions & 0 deletions CoreDisplay-patcher.command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ oToolCoreDisplayUnpatched=(
6e04ad9d1f2bf43dc01ed92a0ba4b8ac '10.13.4 (17E199)' 4
a273850d90c3cdf39f17ad63ed43203a '10.13.5 (17F77)' 4
714a9e14ccc64b0cf4bef2f083087d8e '10.14.2 (18C54)' 5
814fe7a8695f6583d821b5665f6df71a '10.14.5 (18F132)' 5
105051509e563ba96f190ed78a52feb9 '10.14.6 (18G84)' 5
105051509e563ba96f190ed78a52feb9 '10.14.6 (18G95)' 5
105051509e563ba96f190ed78a52feb9 '10.14.6 (18G1012)' 5
105051509e563ba96f190ed78a52feb9 '10.14.6 (18G2022)' 5
)

# md5 checksum of '(__DATA,__data)' section exported by otool from patched CoreDisplays
Expand All @@ -52,8 +57,17 @@ oToolCoreDisplayPatched=(
11882f5e04a525da6701777c814c920a '10.13.4 (17E199)'
b5dd02fe05903d7c39791afc642f9b2b '10.13.5 (17F77)'
2d71736504e14882b2eb5e994859ec09 '10.14.2 (18C54)'
9581c3d50658882e79325bcf5f510245 '10.14.5 (18F132)'
d4f2aca73c7915c639dbe9a7b9cf5ecd '10.14.6 (18G84)'
450241a06a439cd226c9e9cf5cf634d7 '10.14.6 (18G95, 18G1012 and 18G2022)'
)

# when I ran "./CoreDisplay-patcher.command" this was the post-output of "./CoreDisplay-patcher.command md5"
# otool CoreDisplay: 450241a06a439cd226c9e9cf5cf634d7
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can confirm the same hash and value:

otool -t CoreDisplay2 |tail -n +2 |md5 -q
450241a06a439cd226c9e9cf5cf634d7

hexdump CoreDisplay  | grep -i "31 DB 90 90 90 90 90 90 E9"
00187c0 20 31 db 90 90 90 90 90 90 e9 8a 07 00 00 49 89

The current code on master appears to be wrong though as far as I can tell, see #343

Are you sure your code signing is working properly?
I've found out that the script silently discards all code signing errors and potentially leaves you with a broken file.
What is your output from
sudo codesign -f -s - $CoreDisplayLocation

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

d4f2aca73c7915c639dbe9a7b9cf5ecd is unlikely to be a proper value though, this is the same one I saw in #343

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with this, I patched my PR

# otool CoreDisplay.bak: 105051509e563ba96f190ed78a52feb9
# CoreDisplay: 823e4c55d077cb17e430e0834ac75d58
# CoreDisplay.bak: 2e73c9f4476cd887d2839a907e6e962d

function makeExit {
printf "Closing...\n"
exit
Expand Down