commit 2f43a6a7549c069b2d06e7f8f9228aa99fe42410
author Dorin Drimus <dorindrimus@google.com> Tue May 05 19:19:24 2020 +0200
committer Dorin Drimus <dorindrimus@google.com> Tue May 05 19:19:24 2020 +0200
tree 84ba34d85b5667ef3ad686e6e6f3ae1c152aaf84
parent e3541e4d0660a5becb015e6d8a72c604ed883240

Allow device properties attestation in attestKey

Allow base device properties that are not unique IDs and don't
require special permission to be attested from any process.

Test: atest CtsKeystoreTestCases
Bug: 152945378
Change-Id: I45eeda0eac725fd0ad28caf25a5a183fe117fabb

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index e766182..1b8b575 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1072,7 +1072,7 @@
 
     uid_t callingUid = IPCThreadState::self()->getCallingUid();
 
-    if (isDeviceIdAttestationRequested(params) && (get_app_id(callingUid) != AID_SYSTEM)) {
+    if (needsPermissionToAttestDeviceIds(params) && (get_app_id(callingUid) != AID_SYSTEM)) {
         return AIDL_RETURN(KeyStoreServiceReturnCode(ErrorCode::INVALID_ARGUMENT));
     }