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

Add new Apple Managed Device Attestation OIDs #1496

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Add new Apple Managed Device Attestation OIDs #1496

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fc1d91
Add new Apple Managed Device Attestation OIDs
hslatman Jul 31, 2023
9b12867
Merge branch 'master' into herman/acme-macos-properties
hslatman Nov 27, 2023
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
48 changes: 38 additions & 10 deletions acme/challenge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,19 +819,33 @@ ZwFEh9bhKjJ+5VQ9/Do1os0u3LEkgN/r
-----END CERTIFICATE-----`

var (
oidAppleSerialNumber = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 9, 1}
oidAppleUniqueDeviceIdentifier = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 9, 2}
oidAppleSecureEnclaveProcessorOSVersion = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 10, 2}
oidAppleNonce = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 11, 1}
oidAppleSerialNumber = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 9, 1}
oidAppleUniqueDeviceIdentifier = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 9, 2}
oidAppleSecureEnclaveEnrollmentIdentifier = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 9, 3}
oidAppleSoftwareUpdateDeviceIdentifier = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 9, 4}
oidAppleOperatingSystemVersion = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 10, 1}
oidAppleSecureEnclaveProcessorOSVersion = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 10, 2}
oidAppleLowLevelBootloaderVersion = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 10, 3}
oidAppleNonce = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 11, 1}
oidAppleSIPStatus = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 13, 1}
oidAppleSecureBootStatus = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 13, 2}
oidAppleThirdPartyKernelExtensionsAllowed = asn1.ObjectIdentifier{1, 2, 840, 113635, 100, 8, 13, 3}
)

type appleAttestationData struct {
Nonce []byte
SerialNumber string
UDID string
SEPVersion string
Certificate *x509.Certificate
Fingerprint string
Nonce []byte
SerialNumber string
UDID string
OSVersion string
SEPVersion string
LLBVersion string
SecureEnclaveEnrollmentID string
SoftwareUpdateDeviceID string
SIPStatus string
SecureBootStatus string
ThirdPartyKernelExtensionsAllowed string // TODO(hs): check if this can/should be bool instead
Certificate *x509.Certificate
Fingerprint string
}

func doAppleAttestationFormat(_ context.Context, prov Provisioner, _ *Challenge, att *attestationObject) (*appleAttestationData, error) {
Expand Down Expand Up @@ -901,6 +915,20 @@ func doAppleAttestationFormat(_ context.Context, prov Provisioner, _ *Challenge,
data.SEPVersion = string(ext.Value)
case ext.Id.Equal(oidAppleNonce):
data.Nonce = ext.Value
case ext.Id.Equal(oidAppleOperatingSystemVersion):
data.OSVersion = string(ext.Value)
case ext.Id.Equal(oidAppleLowLevelBootloaderVersion):
data.LLBVersion = string(ext.Value)
case ext.Id.Equal(oidAppleSecureEnclaveEnrollmentIdentifier):
data.SecureEnclaveEnrollmentID = string(ext.Value)
case ext.Id.Equal(oidAppleSoftwareUpdateDeviceIdentifier):
data.SoftwareUpdateDeviceID = string(ext.Value)
case ext.Id.Equal(oidAppleSIPStatus):
data.SIPStatus = string(ext.Value)
case ext.Id.Equal(oidAppleSecureBootStatus):
data.SecureBootStatus = string(ext.Value)
case ext.Id.Equal(oidAppleThirdPartyKernelExtensionsAllowed):
data.ThirdPartyKernelExtensionsAllowed = string(ext.Value)
}
}

Expand Down