summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-12-10 03:28:32 (GMT)
committerLinux Build Service Account <lnxbuild@localhost>2018-12-10 03:28:32 (GMT)
commit6720228660e88a4a03065c324cea96b23d3d7b56 (patch)
tree707e507d2a1377011926e08724a908ca295a8238
parent2823d0f7245ddc0fb5ea5894ecd0b79cd0e104d6 (diff)
parent5f57639048bd30e2ab5e10f31c9e8ccb4249a1da (diff)
downloadandroid_vendor_qcom_opensource_cryptfs_hw-6720228660e88a4a03065c324cea96b23d3d7b56.zip
android_vendor_qcom_opensource_cryptfs_hw-6720228660e88a4a03065c324cea96b23d3d7b56.tar.gz
android_vendor_qcom_opensource_cryptfs_hw-6720228660e88a4a03065c324cea96b23d3d7b56.tar.bz2
Merge 5f57639048bd30e2ab5e10f31c9e8ccb4249a1da on remote branchrefs/changes/08/242608/1
Change-Id: Ie123a3a9f2b2de857eef26135cfc5c66efbc7656
-rw-r--r--cryptfs_hw.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/cryptfs_hw.c b/cryptfs_hw.c
index ebf9381..72d0133 100644
--- a/cryptfs_hw.c
+++ b/cryptfs_hw.c
@@ -413,6 +413,13 @@ int should_use_keymaster()
{
/*
* HW FDE key should be tied to keymaster
+ * if version is above 0.3. this is to
+ * support msm8909 go target.
*/
- return 1;
+ int rc = 1;
+ if (get_keymaster_version() == KEYMASTER_MODULE_API_VERSION_0_3) {
+ SLOGI("Keymaster version is 0.3");
+ rc = 0;
+ }
+ return rc;
}