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.

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

add offsets for 12.7.1 (x86/arm64) #18

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ registration code and use it in Beeper Mini.
## Supported MacOS versions
The tool is currently quite hacky, so it only works on specific versions of macOS.

* Intel: 10.14.6, 10.15.1 - 10.15.7, 11.5 - 11.7, 13.3.1, 13.5 - 13.6, 14.0 - 14.3
* Apple Silicon: 13.3.1, 13.5 - 13.6, 14.0 - 14.3

* Intel: 10.14.6, 10.15.1 - 10.15.7, 11.5 - 11.7, 12.7.1, 13.3.1, 13.5 - 13.6, 14.0 - 14.3
* Apple Silicon: 12.7.1, 13.3.1, 13.5 - 13.6, 14.0 - 14.3

On unsupported versions, it will tell you that it's unsupported and exit.
A future version may work in less hacky ways to support more OS versions.
Expand Down
19 changes: 19 additions & 0 deletions nac/offsets.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,23 @@ var offsets_11_7_7 = imdOffsetTuple{x86: imdOffsets{
NACSignAddress: 0x3c71a0,
}}

var offsets_12_7_1 = imdOffsetTuple{
x86: imdOffsets{
ReferenceSymbol: "IDSProtoKeyTransparencyTrustedServiceReadFrom",
ReferenceAddress: 0xb2278,
NACInitAddress: 0x4132e0,
NACKeyEstablishmentAddress: 0x465e00,
NACSignAddress: 0x405c10,
},
arm64: imdOffsets{
ReferenceSymbol: "IDSProtoKeyTransparencyTrustedServiceReadFrom",
ReferenceAddress: 0x0b562c,
NACInitAddress: 0x43d408,
NACKeyEstablishmentAddress: 0x3fdafc,
NACSignAddress: 0x3f2844,
},
}

var offsets_13_3_1 = imdOffsetTuple{
x86: imdOffsets{
ReferenceSymbol: "IDSProtoKeyTransparencyTrustedServiceReadFrom",
Expand Down Expand Up @@ -208,6 +225,8 @@ var offsets = map[[32]byte]imdOffsetTuple{
hexToByte32("80107d249088d9762ec38c8f86d6797b5070d476377e7c5ddacf83ad32d00a1e"): offsets_11_7_7,
// macOS 12.6.3
hexToByte32("6e8caf477c2b4d3a56a91835a2b6455f36fb0feb13006def7516ac09578c67d0"): {},
// macOS 12.7.1
hexToByte32("5833338da6350266eda33f5501c5dfc793e0632b52883aa2389c438c02d03718"): offsets_12_7_1,
// macOS 13.2.1
hexToByte32("4d96de9438fdea5b0b7121e485541ecf0a74489eeb330c151a7d44d289dd3a85"): {},
// macOS 13.3.1
Expand Down