PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check to ensure that external is encrypted

Browse Source
This commit is contained in:
Dees_Troy
2013-01-14 15:36:13 +00:00
parent 5c9f677e63
commit 999b39d041
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
partition.cpp
View File

@@ -705,7 +705,9 @@ bool TWPartition::Mount(bool Display_Error) {
return false;
} else {
#ifdef TW_INCLUDE_CRYPTO_SAMSUNG
if (EcryptFS_Password.size() > 0 && PartitionManager.Mount_By_Path("/data", false)) {
string MetaEcfsFile = EXPAND(TW_EXTERNAL_STORAGE_PATH);
MetaEcfsFile += "/.MetaEcfsFile";
if (EcryptFS_Password.size() > 0 && PartitionManager.Mount_By_Path("/data", false) && TWFunc::Path_Exists(MetaEcfsFile)) {
if (mount_ecryptfs_drive(EcryptFS_Password.c_str(), Mount_Point.c_str(), Mount_Point.c_str(), 0) != 0) {
if (Display_Error)
LOGE("Unable to mount ecryptfs for '%s'\n", Mount_Point.c_str());

7
partitionmanager.cpp
View File

@@ -1650,6 +1650,13 @@ int TWPartitionManager::Decrypt_Device(string Password) {
sdcard->Is_Decrypted = true;
sdcard->EcryptFS_Password = Password;
sdcard->Decrypted_Block_Device = sdcard->Actual_Block_Device;
string MetaEcfsFile = EXPAND(TW_EXTERNAL_STORAGE_PATH);
MetaEcfsFile += "/.MetaEcfsFile";
if (!TWFunc::Path_Exists(MetaEcfsFile)) {
// External storage isn't actually encrypted so unmount and remount without ecryptfs
sdcard->UnMount(false);
sdcard->Mount(false);
}
} else {
sdcard->Is_Decrypted = false;
sdcard->Decrypted_Block_Device = "";