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

Offsets for 14.4 Final #40

Closed
wants to merge 1 commit into from
Closed
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ registration code and use it in Beeper Mini.
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, 12.7.1, 13.3.1, 13.5 - 13.6.4, 14.0 - 14.3
* Apple Silicon: 12.7.1, 13.3.1, 13.5 - 13.6.4, 14.0 - 14.3
* Apple Silicon: 12.7.1, 13.3.1, 13.5 - 13.6.4, 14.0 - 14.4

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 @@ -200,6 +200,23 @@ var offsets_14_3 = imdOffsetTuple{
},
}

var offsets_14_4 = imdOffsetTuple{
x86: imdOffsets{
ReferenceSymbol: "IDSProtoKeyTransparencyTrustedServiceReadFrom",
ReferenceAddress: 0x0d6715,
NACInitAddress: 0x557cd0,
NACKeyEstablishmentAddress: 0x537d10,
NACSignAddress: 0x54b000,
},
arm64: imdOffsets{
ReferenceSymbol: "IDSProtoKeyTransparencyTrustedServiceReadFrom",
ReferenceAddress: 0x0c0b84,
NACInitAddress: 0x4c2468,
NACKeyEstablishmentAddress: 0x4afccc,
NACSignAddress: 0x489ed8,
},
}

// offsets is a map from sha256 hash of identityservicesd to the function pointer offsets in that binary.
var offsets = map[[32]byte]imdOffsetTuple{
// macOS 10.13.6
Expand Down Expand Up @@ -250,6 +267,8 @@ var offsets = map[[32]byte]imdOffsetTuple{
hexToByte32("034fc179e1cce559931a8e46866f54154cb1c5413902319473537527a2702b64"): offsets_14_2,
// macOS 14.3
hexToByte32("d3c6986fefcbd2efea2a8a7c88104bf22d60d1f4f2bbf3615a1e3ce098aba765"): offsets_14_3,
// macOS 14.4
hexToByte32("b82c5c6c9010a42cb64397e3760dd31144cbd471126111de9bb27fa3d2d2639a"): offsets_14_4,
}

type imdOffsetTuple struct {
Expand Down
Loading