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

Fix encryption on Nakasi

Browse source 
We need to make sure we don't try to read the flags on keymaster
version 2 or below, or we get random junk.

Requires
  https://googleplex-android-review.git.corp.google.com/#/c/460689/

Bug: 14384714
Change-Id: I5a4ede1bec0347b8319cedaae6535201c122cf48
This commit is contained in:
Paul Lawrence 2014-05-06 14:02:48 -07:00 committed by The Android Automerger
parent 8ee0410a4d
commit a8014507b0
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cryptfs.c
View file

@ -121,6 +121,14 @@ static int keymaster_check_compatibility()
goto out;
}
SLOGI("keymaster version is %d", keymaster_dev->common.module->module_api_version);
if (keymaster_dev->common.module->module_api_version
< KEYMASTER_MODULE_API_VERSION_0_3) {
rc = 0;
goto out;
}
if (keymaster_dev->flags & KEYMASTER_BLOBS_ARE_STANDALONE) {
rc = 1;
}