Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a5c2cd2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add Attestation IDs State to DeviceInfo" am: d0047ec5 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1760969

Change-Id: I3cc3fa8499d4ae3c2824cef47b0e08eb4902b7fd
parents 487e99b8 d0047ec5

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;

security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl

+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