summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorthat <github@that.at>2014-12-09 23:15:16 +0100
committerDees Troy <dees_troy@teamw.in>2014-12-10 17:22:09 +0100
commitceb7b8e5767aaac364d75c647ea130968e15f3ed (patch)
tree1a6b0b947f2df0ca431bfde14a0ff6efa9b66410 /crypto
parentFix mkexfatfs exclusion when TW_NO_EXFAT enabled (diff)
downloadandroid_bootable_recovery-ceb7b8e5767aaac364d75c647ea130968e15f3ed.tar
android_bootable_recovery-ceb7b8e5767aaac364d75c647ea130968e15f3ed.tar.gz
android_bootable_recovery-ceb7b8e5767aaac364d75c647ea130968e15f3ed.tar.bz2
android_bootable_recovery-ceb7b8e5767aaac364d75c647ea130968e15f3ed.tar.lz
android_bootable_recovery-ceb7b8e5767aaac364d75c647ea130968e15f3ed.tar.xz
android_bootable_recovery-ceb7b8e5767aaac364d75c647ea130968e15f3ed.tar.zst
android_bootable_recovery-ceb7b8e5767aaac364d75c647ea130968e15f3ed.zip
Diffstat (limited to 'crypto')
-rw-r--r--crypto/lollipop/Android.mk2
-rw-r--r--crypto/lollipop/cryptfs.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/lollipop/Android.mk b/crypto/lollipop/Android.mk
index da25eac30..fb9860917 100644
--- a/crypto/lollipop/Android.mk
+++ b/crypto/lollipop/Android.mk
@@ -1,5 +1,5 @@
LOCAL_PATH := $(call my-dir)
-ifeq ($(TW_INCLUDE_L_CRYPTO), true)
+ifeq ($(TW_INCLUDE_CRYPTO), true)
include $(CLEAR_VARS)
common_c_includes := \
diff --git a/crypto/lollipop/cryptfs.c b/crypto/lollipop/cryptfs.c
index 90f1523d3..c6586cc49 100644
--- a/crypto/lollipop/cryptfs.c
+++ b/crypto/lollipop/cryptfs.c
@@ -131,6 +131,7 @@ static int keymaster_check_compatibility()
printf("keymaster version is %d\n", keymaster_dev->common.module->module_api_version);
+#if (KEYMASTER_HEADER_VERSION >= 3)
if (keymaster_dev->common.module->module_api_version
< KEYMASTER_MODULE_API_VERSION_0_3) {
rc = 0;
@@ -141,6 +142,7 @@ static int keymaster_check_compatibility()
rc = 1;
}
+#endif
out:
keymaster_close(keymaster_dev);
return rc;