commit 4efda9db461579452a9afcec495ee355166ecbae
author Victor Hsieh <victorhsieh@google.com> Tue Sep 17 13:42:36 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 17 13:42:36 2019 -0700
tree d25937d0729512ec0d1d7ddfd6564532bc6b0862
parent 8bac7ba894c3d4cf1e20e590fe19df858ed9d443
parent aad4f6ed19d739da43bfdfa94407c43b90ef48a8

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

Change-Id: Iaf8053877a995044e65eed2e128706bdbe6e4df7

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