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

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

Merge changes from topic "revert-20364235-split-rkp-aidl-UDIJDKGXDE" 

* changes:
  Revert "Split rkp from keymint."
  Revert "Update README and CHANGELOG for RKP"
  Revert "Update the RKP aidl dependency"
parents 5dd54b97 ccbb5d8a

identity/aidl/Android.bp

+5 −5
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ aidl_interface { 
    ],

    imports: [

        "android.hardware.keymaster-V3",

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

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

    ],

    stability: "vintf",

    frozen: false,
@@ -32,28 +32,28 @@ aidl_interface { 
            version: "1",

            imports: [

                "android.hardware.keymaster-V3",

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

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

            ],

        },

        {

            version: "2",

            imports: [

                "android.hardware.keymaster-V3",

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

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

            ],

        },

        {

            version: "3",

            imports: [

                "android.hardware.keymaster-V3",

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

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

            ],

        },

        {

            version: "4",

            imports: [

                "android.hardware.keymaster-V3",

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

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

            ],

        },

identity/aidl/default/Android.bp

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

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

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

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

    ],

}
@@ -113,7 +112,6 @@ 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

+0 −2
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ 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

deleted100644 → 0
+0 −10
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/rkp/CHANGELOG.md→security/keymint/RKP_CHANGELOG.md

+0 −6
Original line number Diff line number Diff line
@@ -19,12 +19,6 @@ This document provides an exact description of which changes have occurred in th 
  * `uniqueId` String added as a field in order to differentiate IRPC instances on device.



## IRemotelyProvisionedComponent 2 -> 3

* The RKP HAL now builds separately from KeyMint.

  * The HAL remains under the `android.hardware.security.keymint` package for

    compatibility with previous releases. ABI compatibility requires this.

  * Dependencies on the RKP HAL must add a dependency on

    `"android.hardware.security.rkp"` generated code (instead of

    `"android.hardward.security.keymint"`).

* ProtectedData has been removed.

* DeviceInfo

  * `version` has moved to a top-level field within the CSR generated by the HAL