ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Do not restrict .fs-verity keyring in debuggable build"

Browse source 
am: be51525424

Change-Id: I544db4a4e13de0fe680a15814c139155c32bf093
This commit is contained in:
Victor Hsieh 2019-04-05 10:15:27 -07:00 • committed by android-build-merger
commit 0cf9bfd4a6
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rootdir/fsverity_init.sh
View file

@ -24,6 +24,9 @@ for cert in /product/etc/security/fsverity/*.der; do
log -p e -t fsverity_init "Failed to load $cert"
done
# Prevent future key links to .fs-verity keyring
/system/bin/mini-keyctl restrict_keyring .fs-verity ||
log -p e -t fsverity_init "Failed to restrict .fs-verity keyring"
DEBUGGABLE=$(getprop ro.debuggable)
if [ $DEBUGGABLE != "1" ]; then
# Prevent future key links to .fs-verity keyring
/system/bin/mini-keyctl restrict_keyring .fs-verity ||
log -p e -t fsverity_init "Failed to restrict .fs-verity keyring"
fi