summaryrefslogtreecommitdiffstats
path: root/partitionmanager.cpp
diff options
context:
space:
mode:
authora3955269 <a3955269>2013-01-08 17:14:56 +0100
committerDees_Troy <dees_troy@teamw.in>2013-01-08 21:09:56 +0100
commit6ff55cefd060b4c8f6c0fa97d5521516f9ee43f1 (patch)
tree2617e02d06b317d4f40779131a9e494b163f6651 /partitionmanager.cpp
parentMerge "Fix up libmincrypt rules for Android 4.2" into jb-wip (diff)
downloadandroid_bootable_recovery-6ff55cefd060b4c8f6c0fa97d5521516f9ee43f1.tar
android_bootable_recovery-6ff55cefd060b4c8f6c0fa97d5521516f9ee43f1.tar.gz
android_bootable_recovery-6ff55cefd060b4c8f6c0fa97d5521516f9ee43f1.tar.bz2
android_bootable_recovery-6ff55cefd060b4c8f6c0fa97d5521516f9ee43f1.tar.lz
android_bootable_recovery-6ff55cefd060b4c8f6c0fa97d5521516f9ee43f1.tar.xz
android_bootable_recovery-6ff55cefd060b4c8f6c0fa97d5521516f9ee43f1.tar.zst
android_bootable_recovery-6ff55cefd060b4c8f6c0fa97d5521516f9ee43f1.zip
Diffstat (limited to '')
-rw-r--r--partitionmanager.cpp53
1 files changed, 52 insertions, 1 deletions
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 95f010093..26143831f 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1567,12 +1567,44 @@ int TWPartitionManager::Decrypt_Device(string Password) {
property_set("ro.crypto.fs_options", CRYPTO_FS_OPTIONS);
property_set("ro.crypto.fs_flags", CRYPTO_FS_FLAGS);
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));
+#endif
+
+ property_set("rw.km_fips_status", "ready");
+
+#endif
+
+ // some samsung devices store "footer" on efs partition
+ TWPartition *efs = Find_Partition_By_Path("/efs");
+ if(efs && !efs->Is_Mounted())
+ efs->Mount(false);
+ else
+ efs = 0;
+#ifdef TW_EXTERNAL_STORAGE_PATH
+ TWPartition* sdcard = Find_Partition_By_Path(EXPAND(TW_EXTERNAL_STORAGE_PATH));
+ if (sdcard) {
+ property_set("ro.crypto.external_encrypted", "1");
+ property_set("ro.crypto.external_blkdev", sdcard->Actual_Block_Device.c_str());
+ } else {
+ property_set("ro.crypto.external_encrypted", "0");
+ }
#endif
+
strcpy(cPassword, Password.c_str());
- if (cryptfs_check_passwd(cPassword) != 0) {
+ int pwret = cryptfs_check_passwd(cPassword);
+
+ if (pwret != 0) {
LOGE("Failed to decrypt data.\n");
return -1;
}
+
+ if(efs)
+ efs->UnMount(false);
+
property_get("ro.crypto.fs_crypto_blkdev", crypto_blkdev, "error");
if (strcmp(crypto_blkdev, "error") == 0) {
LOGE("Error retrieving decrypted data block device.\n");
@@ -1585,6 +1617,25 @@ int TWPartitionManager::Decrypt_Device(string Password) {
dat->Decrypted_Block_Device = crypto_blkdev;
dat->Setup_File_System(false);
ui_print("Data successfully decrypted, new block device: '%s'\n", crypto_blkdev);
+
+#ifdef CRYPTO_SD_FS_TYPE
+ char crypto_blkdev_sd[255];
+ property_get("ro.crypto.sd_fs_crypto_blkdev", crypto_blkdev_sd, "error");
+ if (strcmp(crypto_blkdev_sd, "error") == 0) {
+ LOGE("Error retrieving decrypted data block device.\n");
+ } else if(TWPartition* emmc = Find_Partition_By_Path(TW_INTERNAL_STORAGE_PATH)){
+ emmc->Is_Decrypted = true;
+ emmc->Decrypted_Block_Device = crypto_blkdev_sd;
+ emmc->Setup_File_System(false);
+ ui_print("Internal SD successfully decrypted, new block device: '%s'\n", crypto_blkdev_sd);
+ }
+
+#ifdef TW_EXTERNAL_STORAGE_PATH
+ sdcard->Is_Decrypted = true;
+ sdcard->Setup_File_System(false);
+#endif //ifdef TW_EXTERNAL_STORAGE_PATH
+#endif //ifdef CRYPTO_SD_FS_TYPE
+
// Sleep for a bit so that the device will be ready
sleep(1);
#ifdef RECOVERY_SDCARD_ON_DATA