commit d48f31280ae14c3549b2482ea3188b02ecf4c485
author Victor Hsieh <victorhsieh@google.com> Tue Sep 17 13:48:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 17 13:48:31 2019 -0700
tree d25937d0729512ec0d1d7ddfd6564532bc6b0862
parent a63f99d0062c16dedad37bd4b6cb4600cd9f68bc
parent 4efda9db461579452a9afcec495ee355166ecbae

Merge "Allow system and root to access fsverity keys" am: aad4f6ed19
am: 4efda9db46

Change-Id: I8da718a83617c4cefb7f3def6034352d9d5faae2

keystore/permissions.cpp

diff --git a/keystore/permissions.cpp b/keystore/permissions.cpp
index 05454cb..d17fcdd 100644
--- a/keystore/permissions.cpp
+++ b/keystore/permissions.cpp
@@ -59,6 +59,8 @@
                           {AID_ROOT, AID_SYSTEM},
                           {AID_WIFI, AID_KEYSTORE},
                           {AID_KEYSTORE, AID_WIFI},
+                          {AID_FSVERITY_CERT, AID_ROOT},
+                          {AID_FSVERITY_CERT, AID_SYSTEM},
 
 #ifdef GRANT_ROOT_ALL_PERMISSIONS
                           // Allow VTS tests to act on behalf of the wifi user