Encryption: try wrapped key also for device without metadata support

Change-Id: I8b58e45ec0d42470226083e8003dcd8152a91af1
tonirmv · Nov 23, 2019 · 9bf7335 · 9bf7335
1 parent 8c0bcc8
commit 9bf7335
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/partition.cpp b/partition.cpp
@@ -662,7 +662,14 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
 			LOGERR("Primary block device '%s' for mount point '%s' is not present!\n", Primary_Block_Device.c_str(), Mount_Point.c_str());
 		}
 	} else {
-		Decrypt_FBE_DE();
+
+		if (!Decrypt_FBE_DE()) {
+			LOGINFO("Trying wrapped key.\n");
+			property_set("fbe.data.wrappedkey", "true");
+				if (!Decrypt_FBE_DE()) {
+					LOGERR("Unable to decrypt FBE device\n");
+				}
+		}
 	}
 	if (datamedia && (!Is_Encrypted || (Is_Encrypted && Is_Decrypted))) {
 		Setup_Data_Media();