summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDinesh K Garg <dineshg@codeaurora.org>2015-08-21 00:18:48 (GMT)
committerZhao Wei Liew <zhaoweiliew@gmail.com>2017-02-12 12:44:29 (GMT)
commit7223712c2a10e8b55e61231bca34ea00b6732eaf (patch)
tree6e1f5689f7f6684e165ab3cb25c3e59fdf1120d2
parent0e645431a808d8742665df12aceff0a929793cb3 (diff)
downloadandroid_vendor_qcom_opensource_cryptfs_hw-7223712c2a10e8b55e61231bca34ea00b6732eaf.zip
android_vendor_qcom_opensource_cryptfs_hw-7223712c2a10e8b55e61231bca34ea00b6732eaf.tar.gz
android_vendor_qcom_opensource_cryptfs_hw-7223712c2a10e8b55e61231bca34ea00b6732eaf.tar.bz2
cryptfs_hw: Update module as per vold project
Update cryptfs_hw API signatures as per the vold project requests to avoid compilation errors. Change-Id: I1c2133f3cee395892e7fa160afc6314059ba0bcb
-rwxr-xr-xcryptfs_hw.c7
-rwxr-xr-xcryptfs_hw.h2
2 files changed, 3 insertions, 6 deletions
diff --git a/cryptfs_hw.c b/cryptfs_hw.c
index 3045bd0..109d406 100755
--- a/cryptfs_hw.c
+++ b/cryptfs_hw.c
@@ -221,12 +221,9 @@ int is_ice_enabled(void)
return storage_type;
}
-int wipe_hw_device_encryption_key(const char* enc_mode)
+int clear_hw_device_encryption_key()
{
- if (!enc_mode)
- return -1;
-
- if (is_hw_disk_encryption(enc_mode) && load_qseecom_library())
+ if (load_qseecom_library())
return qseecom_wipe_key(map_usage(QSEECOM_DISK_ENCRYPTION));
return 0;
diff --git a/cryptfs_hw.h b/cryptfs_hw.h
index 5d4881c..c840d02 100755
--- a/cryptfs_hw.h
+++ b/cryptfs_hw.h
@@ -35,7 +35,7 @@ extern "C" {
int set_hw_device_encryption_key(const char*, const char*);
int update_hw_device_encryption_key(const char*, const char*, const char*);
-int wipe_hw_device_encryption_key(const char*);
+int clear_hw_device_encryption_key();
unsigned int is_hw_disk_encryption(const char*);
int is_ice_enabled(void);