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

Commit 20b32627 authored by Seth Moore's avatar Seth Moore Committed by Gerrit Code Review
Browse files

Merge changes from topic "cherry-pick-rkp-hal-split" 

* changes:
  Add missing dependency on RKP HAL
  ID attestation: Define tag for a second IMEI
parents f4756ff0 5937f07a

security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Tag.aidl

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ enum Tag { 
  DEVICE_UNIQUE_ATTESTATION = 1879048912,

  IDENTITY_CREDENTIAL_KEY = 1879048913,

  STORAGE_KEY = 1879048914,

  ATTESTATION_ID_SECOND_IMEI = -1879047469,

  ASSOCIATED_DATA = -1879047192,

  NONCE = -1879047191,

  MAC_LENGTH = 805307371,

security/keymint/aidl/android/hardware/security/keymint/Tag.aidl

+17 −2
Original line number Diff line number Diff line
@@ -726,9 +726,10 @@ enum Tag { 
    ATTESTATION_ID_SERIAL = TagType.BYTES | 713,



    /**

     * Tag::ATTESTATION_ID_IMEI provides the IMEIs for all radios on the device to attested key

     * Tag::ATTESTATION_ID_IMEI provides the IMEI one of the radios on the device to attested key

     * generation/import operations.  This field must be set only when requesting attestation of the

     * device's identifiers.

     * device's identifiers. If the device has more than one IMEI, a second IMEI may be included

     * by using the Tag::ATTESTATION_ID_SECOND_IMEI tag.

     *

     * If the device does not support ID attestation (or destroyAttestationIds() was previously

     * called and the device can no longer attest its IDs), any key attestation request that
@@ -882,6 +883,20 @@ enum Tag { 
     */

    STORAGE_KEY = TagType.BOOL | 722,



    /**

     * Tag::ATTESTATION_ID_SECOND_IMEI provides an additional IMEI of one of the radios on the

     * device to attested key generation/import operations. This field MUST be accompanied by

     * the Tag::ATTESTATION_ID_IMEI tag. It would only be used to convery a second IMEI the device

     * has, after Tag::ATTESTATION_ID_SECOND_IMEI has been used to convery the first IMEI.

     *

     * If the device does not support ID attestation (or destroyAttestationIds() was previously

     * called and the device can no longer attest its IDs), any key attestation request that

     * includes this tag must fail with ErrorCode::CANNOT_ATTEST_IDS.

     *

     * Must never appear in KeyCharacteristics.

     */

    ATTESTATION_ID_SECOND_IMEI = TagType.BYTES | 723,



    /**

     * OBSOLETE: Do not use.

     *

security/keymint/support/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ cc_test { 
    name: "libkeymint_remote_prov_support_test",

    srcs: ["remote_prov_utils_test.cpp"],

    static_libs: [

        "android.hardware.security.rkp-V3-ndk",

        "libgmock",

        "libgtest_main",

    ],