From 71413f4ee9a2d345da059793e795d798924b2209 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Wed, 26 Feb 2014 13:36:08 -0600 Subject: Check crypto footer before offering to decrypt Verify that we have a valid footer with proper magic before setting things up for decryption to help prevent user confusion when dealing with data partitions that fail to mount. Also check to make sure that the block device for /data is present. Change-Id: Ie87818fe4505a8bf71df7d3934c114e7328ef3ca --- partitionmanager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'partitionmanager.cpp') diff --git a/partitionmanager.cpp b/partitionmanager.cpp index e8b362cf6..e6193f919 100644 --- a/partitionmanager.cpp +++ b/partitionmanager.cpp @@ -1383,9 +1383,9 @@ int TWPartitionManager::Decrypt_Device(string Password) { property_set("ro.crypto.keyfile.userdata", CRYPTO_KEY_LOC); #ifdef CRYPTO_SD_FS_TYPE - property_set("ro.crypto.sd_fs_type", CRYPTO_SD_FS_TYPE); - property_set("ro.crypto.sd_fs_real_blkdev", CRYPTO_SD_REAL_BLKDEV); - property_set("ro.crypto.sd_fs_mnt_point", EXPAND(TW_INTERNAL_STORAGE_PATH)); + property_set("ro.crypto.sd_fs_type", CRYPTO_SD_FS_TYPE); + property_set("ro.crypto.sd_fs_real_blkdev", CRYPTO_SD_REAL_BLKDEV); + property_set("ro.crypto.sd_fs_mnt_point", EXPAND(TW_INTERNAL_STORAGE_PATH)); #endif property_set("rw.km_fips_status", "ready"); -- cgit v1.2.3