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

Commit 38ba08e6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ID attestation: update docs for a second IMEI" am: 2f2544e4 am: 1fe35dfb am: 72f4dc28 

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



Change-Id: I13ac85769b93f7eb00dbbae655b85e7fec4a9c13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb786527 72f4dc28

security/keymint/aidl/android/hardware/security/keymint/KeyCreationResult.aidl

+3 −2
Original line number Original line Diff line number Diff line
@@ -125,9 +125,9 @@ parcelable KeyCreationResult { 
     * straightforward translation of the KeyMint tag/value parameter lists to ASN.1.

     * straightforward translation of the KeyMint tag/value parameter lists to ASN.1.

     *

     *

     * KeyDescription ::= SEQUENCE {

     * KeyDescription ::= SEQUENCE {

     *     attestationVersion         INTEGER, # Value 200

     *     attestationVersion         INTEGER, # Value 300

     *     attestationSecurityLevel   SecurityLevel, # See below

     *     attestationSecurityLevel   SecurityLevel, # See below

     *     keyMintVersion             INTEGER, # Value 200

     *     keyMintVersion             INTEGER, # Value 300

     *     keymintSecurityLevel       SecurityLevel, # See below

     *     keymintSecurityLevel       SecurityLevel, # See below

     *     attestationChallenge       OCTET_STRING, # Tag::ATTESTATION_CHALLENGE from attestParams

     *     attestationChallenge       OCTET_STRING, # Tag::ATTESTATION_CHALLENGE from attestParams

     *     uniqueId                   OCTET_STRING, # Empty unless key has Tag::INCLUDE_UNIQUE_ID

     *     uniqueId                   OCTET_STRING, # Empty unless key has Tag::INCLUDE_UNIQUE_ID
@@ -209,6 +209,7 @@ parcelable KeyCreationResult { 
     *     vendorPatchLevel           [718] EXPLICIT INTEGER OPTIONAL,

     *     vendorPatchLevel           [718] EXPLICIT INTEGER OPTIONAL,

     *     bootPatchLevel             [719] EXPLICIT INTEGER OPTIONAL,

     *     bootPatchLevel             [719] EXPLICIT INTEGER OPTIONAL,

     *     deviceUniqueAttestation    [720] EXPLICIT NULL OPTIONAL,

     *     deviceUniqueAttestation    [720] EXPLICIT NULL OPTIONAL,

     *     attestationIdSecondImei    [723] EXPLICIT OCTET_STRING OPTIONAL,

     * }

     * }

     */

     */

    Certificate[] certificateChain;

    Certificate[] certificateChain;