summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mkbestas@lineageos.org>2017-12-20 22:07:16 +0200
committerMichael Bestas <mkbestas@lineageos.org>2017-12-27 13:12:43 +0000
commit4b8e73d0aec6dbf4f4ccde4a0e95fae3f09fcba9 (patch)
tree4582da9b315b06a421d222bd6293de71581bcc98
parentf51f69d5c7f7880c1adb4d620fb40161b2984170 (diff)
downloadandroid_vendor_qcom_opensource_cryptfs_hw-4b8e73d0aec6dbf4f4ccde4a0e95fae3f09fcba9.tar.gz
android_vendor_qcom_opensource_cryptfs_hw-4b8e73d0aec6dbf4f4ccde4a0e95fae3f09fcba9.tar.bz2
android_vendor_qcom_opensource_cryptfs_hw-4b8e73d0aec6dbf4f4ccde4a0e95fae3f09fcba9.zip
cryptfs_hw: Featureize support for waiting on QSEE to start
* Match keymaster change to support older blobs Change-Id: I2d45fe60e0f4bf076d064d6c432740af0b3c840c
-rw-r--r--Android.mk4
-rwxr-xr-xcryptfs_hw.c7
2 files changed, 11 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 2b68c02..eda0c94 100644
--- a/Android.mk
+++ b/Android.mk
@@ -41,5 +41,9 @@ ifeq ($(TARGET_LEGACY_HW_DISK_ENCRYPTION),true)
LOCAL_CFLAGS += -DLEGACY_HW_DISK_ENCRYPTION
endif
+ifeq ($(TARGET_KEYMASTER_WAIT_FOR_QSEE),true)
+LOCAL_CFLAGS += -DWAIT_FOR_QSEE
+endif
+
include $(BUILD_SHARED_LIBRARY)
endif
diff --git a/cryptfs_hw.c b/cryptfs_hw.c
index 827d846..9650ea3 100755
--- a/cryptfs_hw.c
+++ b/cryptfs_hw.c
@@ -305,6 +305,7 @@ static unsigned char* get_tmp_passwd(const char* passwd)
return tmp_passwd;
}
+#ifdef WAIT_FOR_QSEE
static int is_qseecom_up()
{
int i = 0;
@@ -323,6 +324,12 @@ static int is_qseecom_up()
SLOGE("%s Qseecom daemon timed out", __func__);
return 0;
}
+#else
+static int is_qseecom_up()
+{
+ return 1;
+}
+#endif
#ifdef LEGACY_HW_DISK_ENCRYPTION
static int load_qseecom_library()