diff options
| author | bigbiff bigbiff <bigbiff@teamw.in> | 2019-08-28 02:50:31 +0200 |
|---|---|---|
| committer | bigbiff bigbiff <bigbiff@teamw.in> | 2019-09-01 19:38:44 +0200 |
| commit | 0be03b3217cc60944b60f6ba65dabcffd411e138 (patch) | |
| tree | 736d01729b3eb12755c59ed244102d9e0d247037 /partitionmanager.cpp | |
| parent | ext4crypt: change to upgrade key if export fails (diff) | |
| download | android_bootable_recovery-0be03b3217cc60944b60f6ba65dabcffd411e138.tar android_bootable_recovery-0be03b3217cc60944b60f6ba65dabcffd411e138.tar.gz android_bootable_recovery-0be03b3217cc60944b60f6ba65dabcffd411e138.tar.bz2 android_bootable_recovery-0be03b3217cc60944b60f6ba65dabcffd411e138.tar.lz android_bootable_recovery-0be03b3217cc60944b60f6ba65dabcffd411e138.tar.xz android_bootable_recovery-0be03b3217cc60944b60f6ba65dabcffd411e138.tar.zst android_bootable_recovery-0be03b3217cc60944b60f6ba65dabcffd411e138.zip | |
Diffstat (limited to 'partitionmanager.cpp')
| -rwxr-xr-x | partitionmanager.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/partitionmanager.cpp b/partitionmanager.cpp index 85dc79d36..41d8af209 100755 --- a/partitionmanager.cpp +++ b/partitionmanager.cpp @@ -296,7 +296,14 @@ int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error) while (!Decrypt_Data->Mount(false) && --retry_count) usleep(500); if (Decrypt_Data->Mount(false)) { - Decrypt_Data->Decrypt_FBE_DE(); + if (!Decrypt_Data->Decrypt_FBE_DE()) { + LOGINFO("Trying wrapped key.\n"); + property_set("fbe.data.wrappedkey", "true"); + if (!Decrypt_Data->Decrypt_FBE_DE()) { + LOGERR("Unable to decrypt FBE device\n"); + } + } + } else { LOGINFO("Failed to mount data after metadata decrypt\n"); } |