Run the decrypted backup through htmlentities, otherwise things like & in the actual config get turned into their decoded counterparts (&, ", etc) and if that result is copy/pasted, saved, and restored, it is invalid XML and gets tossed out.

1 files changed, 1 insertions, 1 deletions

diff --git a/config/autoconfigbackup/autoconfigbackup.php b/config/autoconfigbackup/autoconfigbackup.php
index e43620c4..5ebe8e20 100644
--- a/config/autoconfigbackup/autoconfigbackup.php
+++ b/config/autoconfigbackup/autoconfigbackup.php
@@ -267,7 +267,7 @@ EOF;
 						$configtype = "Encrypted";
 						if (!tagfile_deformat($data, $data, "config.xml")) 
 							$input_errors[] = "The downloaded file does not appear to contain an encrypted pfSense configuration.";
-						$data = decrypt_data($data, $decrypt_password);
+						$data = htmlentities(decrypt_data($data, $decrypt_password));
 						if(!strstr($data, "pfsense")) {
 							$data = "Could not decrypt.  Different encryption key?";
 							$input_errors[] = "Could not decrypt config.xml";