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

Commit 7f8ccb5c authored by David Zeuthen's avatar David Zeuthen
Browse files

KeyMint + KeyMaster: Include permissions for FEATURE_HARDWARE_KEYSTORE. 

This change includes permission files for the new permission
FEATURE_HARDWARE_KEYSTORE for the default KeyMaster and KeyMint
implementations.

Test: Manually inspected that permission files are installed.
Test: atest android.keystore.cts.KeyAttestationTest#testAttestationKmVersionMatchesFeatureVersion
Bug: 160616951
Change-Id: Ia35e1ba6c894624999eed62e8434a20ebc833b97
parent 4c912d90

keymaster/4.1/default/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -45,5 +45,14 @@ cc_binary { 
        "liblog",

        "libutils",

    ],

    required: [

        "android.hardware.hardware_keystore.km41.xml",

    ],

}



prebuilt_etc {

    name: "android.hardware.hardware_keystore.km41.xml",

    sub_dir: "permissions",

    vendor: true,

    src: "android.hardware.hardware_keystore.km41.xml",

}

keymaster/4.1/default/android.hardware.hardware_keystore.km41.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright 2021 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<permissions>

  <feature name="android.hardware.hardware_keystore" version="41" />

</permissions>

security/keymint/aidl/default/Android.bp

+11 −1
Original line number Diff line number Diff line
@@ -39,7 +39,17 @@ cc_binary { 
    srcs: [

        "service.cpp",

    ],

    required: ["RemoteProvisioner"],

    required: [

        "RemoteProvisioner",

        "android.hardware.hardware_keystore.xml",

    ],

}



prebuilt_etc {

    name: "android.hardware.hardware_keystore.xml",

    sub_dir: "permissions",

    vendor: true,

    src: "android.hardware.hardware_keystore.xml",

}



cc_library {

security/keymint/aidl/default/android.hardware.hardware_keystore.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright 2021 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<permissions>

  <feature name="android.hardware.hardware_keystore" version="100" />

</permissions>