From 786e17631bcfc93dfb81c4bc50714ac31c3a3338 Mon Sep 17 00:00:00 2001 From: Captain Throwback Date: Mon, 10 Jan 2022 13:15:53 -0500 Subject: [PATCH] tw_crypto_pwtype: move default setting to data.cpp Change-Id: Id3dda3bc2c32ad286b1ec67595f482f84b5077d7 --- data.cpp | 1 + partition.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/data.cpp b/data.cpp index d3c4a6188..2ef7445e8 100755 --- a/data.cpp +++ b/data.cpp @@ -783,6 +783,7 @@ initSHRPVars(&mConst, &mData, &mPersist); mData.SetValue(TW_IS_ENCRYPTED, "0"); mData.SetValue(TW_IS_DECRYPTED, "0"); mData.SetValue(TW_CRYPTO_PASSWORD, "0"); + mData.SetValue(TW_CRYPTO_PWTYPE, "0"); // Set initial value so that recovery will not be confused when using unencrypted data or failed to decrypt data mData.SetValue("tw_terminal_state", "0"); mData.SetValue("tw_background_thread_running", "0"); mData.SetValue(TW_RESTORE_FILE_DATE, "0"); diff --git a/partition.cpp b/partition.cpp index cc8fb07d3..58bb4d3cf 100755 --- a/partition.cpp +++ b/partition.cpp @@ -736,7 +736,6 @@ void TWPartition::Set_FBE_Status() { bool TWPartition::Decrypt_FBE_DE() { if (TWFunc::Path_Exists("/data/unencrypted/key/version")) { DataManager::SetValue(TW_IS_FBE, 1); - DataManager::SetValue(TW_CRYPTO_PWTYPE, "0"); // Set initial value so that recovery will not be confused when using unencrypted data or failed to decrypt data PartitionManager.Set_Crypto_State(); PartitionManager.Set_Crypto_Type("file"); LOGINFO("File Based Encryption is present\n");