tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "KeyMint + KeyMaster: Include permissions for FEATURE_HARDWARE_KEYSTORE."

Browse source
This commit is contained in:
David Zeuthen 2021-03-25 18:27:48 +00:00 committed by Gerrit Code Review
commit 94b8b11324
4 changed files with 57 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
keymaster/4.1/default/Android.bp
View file

@ -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",
}

18
keymaster/4.1/default/android.hardware.hardware_keystore.km41.xml Normal file
View file

@ -0,0 +1,18 @@
<?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>

12
security/keymint/aidl/default/Android.bp
View file

@ -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 {

18
security/keymint/aidl/default/android.hardware.hardware_keystore.xml Normal file
View file

@ -0,0 +1,18 @@
<?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>