From 5fb04e2b08990213610d3053e88008a21f8534a9 Mon Sep 17 00:00:00 2001
From: Matt Mower <mowerm@gmail.com>
Date: Sun, 26 Feb 2017 17:42:48 -0600
Subject: [PATCH] Disable encrypted backups

Encrypted backups are poorly implemented (both by TWRP for padding a
password with zeros to achieve an AES key and openaes for using
non-standard CBC) and not to be trusted. Do not give users a false
sense of security by offering this option. Remove the ability to use
openaes to encrypt backups, but still allow already openaes-encrypted
backups to be restored.

Ref: https://github.com/TeamWin/Team-Win-Recovery-Project/issues/817

Change-Id: Ibc1802372d8caa8c475039e66fb08ce163df27e9
---
 gui/theme/common/landscape.xml |  4 ++--
 gui/theme/common/portrait.xml  | 12 ++++++------
 gui/theme/common/watch.xml     |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 1e1412b3ec..2b2ecfeab6 100644
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -1645,7 +1645,7 @@
 
 			<text style="text_m">
 				<conditions>
-					<condition var1="tw_include_encrypted_backup" var2="1"/>
+					<condition var1="tw_include_encrypted_backup" var2="999"/>
 					<condition var1="tw_encrypt_backup" var2="0"/>
 				</conditions>
 				<placement x="%col1_x_right%" y="%row3_y%"/>
@@ -1654,7 +1654,7 @@
 
 			<text style="text_m">
 				<conditions>
-					<condition var1="tw_include_encrypted_backup" var2="1"/>
+					<condition var1="tw_include_encrypted_backup" var2="999"/>
 					<condition var1="tw_encrypt_backup" var2="1"/>
 				</conditions>
 				<placement x="%col1_x_right%" y="%row3_y%"/>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 54adfac1dc..38fcd11962 100644
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -1570,7 +1570,7 @@
 
 			<button style="tab">
 				<conditions>
-					<condition var1="tw_include_encrypted_backup" var2="1"/>
+					<condition var1="tw_include_encrypted_backup" var2="999"/>
 					<condition var1="tw_encrypt_backup" var2="0"/>
 				</conditions>
 				<placement x="%tab3_col3_x%" y="%row1_y%" w="%tab3_width%" h="%tab_height%"/>
@@ -1584,7 +1584,7 @@
 
 			<button style="tab">
 				<conditions>
-					<condition var1="tw_include_encrypted_backup" var2="1"/>
+					<condition var1="tw_include_encrypted_backup" var2="999"/>
 					<condition var1="tw_encrypt_backup" var2="1"/>
 				</conditions>
 				<placement x="%tab3_col3_x%" y="%row1_y%" w="%tab3_width%" h="%tab_height%"/>
@@ -1681,7 +1681,7 @@
 
 			<button style="tab">
 				<conditions>
-					<condition var1="tw_include_encrypted_backup" var2="1"/>
+					<condition var1="tw_include_encrypted_backup" var2="999"/>
 					<condition var1="tw_encrypt_backup" var2="0"/>
 				</conditions>
 				<placement x="%tab3_col3_x%" y="%row1_y%" w="%tab3_width%" h="%tab_height%"/>
@@ -1695,7 +1695,7 @@
 
 			<button style="tab">
 				<conditions>
-					<condition var1="tw_include_encrypted_backup" var2="1"/>
+					<condition var1="tw_include_encrypted_backup" var2="999"/>
 					<condition var1="tw_encrypt_backup" var2="1"/>
 				</conditions>
 				<placement x="%tab3_col3_x%" y="%row1_y%" w="%tab3_width%" h="%tab_height%"/>
@@ -1806,7 +1806,7 @@
 
 			<button style="tab">
 				<conditions>
-					<condition var1="tw_include_encrypted_backup" var2="1"/>
+					<condition var1="tw_include_encrypted_backup" var2="999"/>
 					<condition var1="tw_encrypt_backup" var2="0"/>
 				</conditions>
 				<placement x="%tab3_col3_x%" y="%row1_y%" w="%tab3_width%" h="%tab_height%"/>
@@ -1820,7 +1820,7 @@
 
 			<button style="tab">
 				<conditions>
-					<condition var1="tw_include_encrypted_backup" var2="1"/>
+					<condition var1="tw_include_encrypted_backup" var2="999"/>
 					<condition var1="tw_encrypt_backup" var2="1"/>
 				</conditions>
 				<placement x="%tab3_col3_x%" y="%row1_y%" w="%tab3_width%" h="%tab_height%"/>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 865bb98750..69dc213cb4 100644
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -2030,7 +2030,7 @@
 
 			<button>
 				<conditions>
-					<condition var1="tw_include_encrypted_backup" var2="1"/>
+					<condition var1="tw_include_encrypted_backup" var2="999"/>
 					<condition var1="tw_encrypt_backup" var2="0"/>
 				</conditions>
 				<placement x="%btn4_col2_x%" y="%row11_y%"/>
@@ -2045,7 +2045,7 @@
 
 			<button>
 				<conditions>
-					<condition var1="tw_include_encrypted_backup" var2="1"/>
+					<condition var1="tw_include_encrypted_backup" var2="999"/>
 					<condition var1="tw_encrypt_backup" var2="1"/>
 				</conditions>
 				<placement x="%btn4_col2_x%" y="%row11_y%"/>
@@ -2168,7 +2168,7 @@
 
 			<text style="text_m">
 				<conditions>
-					<condition var1="tw_include_encrypted_backup" var2="1"/>
+					<condition var1="tw_include_encrypted_backup" var2="999"/>
 					<condition var1="tw_encrypt_backup" var2="0"/>
 				</conditions>
 				<placement x="%col1_x_right%" y="%row4a_y%"/>
@@ -2177,7 +2177,7 @@
 
 			<text style="text_m">
 				<conditions>
-					<condition var1="tw_include_encrypted_backup" var2="1"/>
+					<condition var1="tw_include_encrypted_backup" var2="999"/>
 					<condition var1="tw_encrypt_backup" var2="1"/>
 				</conditions>
 				<placement x="%col1_x_right%" y="%row4a_y%"/>