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

Commit 5ad0bc26 authored by Seth Moore's avatar Seth Moore Committed by Android (Google) Code Review
Browse files

Merge changes from topics "add-imei-tag", "split-rkp-hal-v2" 

* changes:
  Revert^2 "Update the RKP aidl dependency"
  Revert^2 "Update README and CHANGELOG for RKP"
  Revert^2 "Split rkp from keymint."
  ID attestation: Define tag for a second IMEI
parents a4dbfb7d f8aea9b9

identity/aidl/Android.bp

+6 −6
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ aidl_interface { 
    ],

    imports: [

        "android.hardware.keymaster-V3",

        "android.hardware.security.keymint-V3",

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

    ],

    stability: "vintf",

    frozen: false,

    frozen: true,

    backend: {

        java: {

            platform_apis: true,
@@ -32,28 +32,28 @@ aidl_interface { 
            version: "1",

            imports: [

                "android.hardware.keymaster-V3",

                "android.hardware.security.keymint-V1",

                "android.hardware.security.rkp-V1",

            ],

        },

        {

            version: "2",

            imports: [

                "android.hardware.keymaster-V3",

                "android.hardware.security.keymint-V1",

                "android.hardware.security.rkp-V1",

            ],

        },

        {

            version: "3",

            imports: [

                "android.hardware.keymaster-V3",

                "android.hardware.security.keymint-V1",

                "android.hardware.security.rkp-V1",

            ],

        },

        {

            version: "4",

            imports: [

                "android.hardware.keymaster-V3",

                "android.hardware.security.keymint-V2",

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

            ],

        },

identity/aidl/default/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ cc_library_static { 
        "libpuresoftkeymasterdevice",

        "android.hardware.identity-support-lib",

        "android.hardware.keymaster-V3-ndk",

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

    ],

}
@@ -112,6 +113,7 @@ cc_binary { 
        "android.hardware.keymaster-V3-ndk",

        "android.hardware.identity-libeic-hal-common",

        "android.hardware.identity-libeic-library",

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

    ],

    srcs: [

        "service.cpp",

identity/aidl/vts/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ cc_test { 
        "libcrypto",

    ],

    static_libs: [

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

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

        "android.hardware.security.secureclock-V1-ndk",

        "libcppbor_external",

        "libcppcose_rkp",

security/keymint/README.md

0 → 100644
+10 −0
Original line number Diff line number Diff line 
# KeyMint HAL



This directory contains the HAL definition for KeyMint. KeyMint provides

cryptographic services in a hardware-isolated environment.



Note that the `IRemotelyProvisionedComponent` HAL, and it's associated types,

used to also be defined in this directory. As of Android U, this HAL has been

moved to a different directory (../rkp). This move is ABI compatible, as the

interfaces have been maintained. The build is split so that the generated

code may be built with different options.

security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/.hash

+1 −0
Original line number Diff line number Diff line 
976674616001f714f4a4df49ee45f548de828524

cd862ae2e49b54fc965dc1b99c218eb729c93bb1