Merge "Add Attestation IDs State to DeviceInfo" into sc-dev (e35b1427) · Commits · e / os / android_hardware_interfaces

security/keymint/aidl/android/hardware/security/keymint/DeviceInfo.aidl

+6 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,12 @@ parcelable DeviceInfo {
		* ? "vendor_patch_level" : uint, // YYYYMMDD
		* "version" : 1, // The CDDL schema version.
		* "security_level" : "tee" / "strongbox"
		* "att_id_state": "locked" / "open", // Attestation IDs State. If "locked", this
		* // indicates a device's attestable IDs are
		* // factory-locked and immutable. If "open",
		* // this indicates the device is still in a
		* // provisionable state and the attestable IDs
		* // are not yet frozen.
		* }
		*/
		byte[] deviceInfo;

+1 −14

Original line number	Diff line number	Diff line
		@@ -158,20 +158,7 @@ parcelable ProtectedData {
		* payload: bstr .cbor BccPayload
		* ]
		*
		* VerifiedDeviceInfo = {
		* ? "brand" : tstr,
		* ? "manufacturer" : tstr,
		* ? "product" : tstr,
		* ? "model" : tstr,
		* ? "board" : tstr,
		* ? "device" : tstr,
		* ? "vb_state" : "green" / "yellow" / "orange",
		* ? "bootloader_state" : "locked" / "unlocked",
		* ? "os_version" : tstr,
		* ? "system_patch_level" : uint, // YYYYMMDD
		* ? "boot_patch_level" : uint, // YYYYMMDD
		* ? "vendor_patch_level" : uint, // YYYYMMDD
		* }
		* VerifiedDeviceInfo = DeviceInfo // See DeviceInfo.aidl
		*
		* PubKeyX25519 = { // COSE_Key
		* 1 : 1, // Key type : Octet Key Pair