Merge remote-tracking branch 'origin/pr/224'

* origin/pr/224: backup/restore: hardcode MD5 algo for format v2/v3 decryption
QubesOS · Nov 22, 2022 · f6d3222 · f6d3222
2 parents e6efb91 + 0f35e53
commit f6d3222
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/qubesadmin/backup/restore.py b/qubesadmin/backup/restore.py
@@ -679,6 +679,8 @@ def __run__(self):
                         ["openssl", "enc",
                          "-d",
                          "-" + self.crypto_algorithm,
+                         "-md",
+                         "MD5",
                          "-pass",
                          "pass:" + self.passphrase],
                         stdin=subprocess.PIPE,

diff --git a/qubesadmin/tests/backup/backupcompatibility.py b/qubesadmin/tests/backup/backupcompatibility.py
@@ -1142,7 +1142,8 @@ def handle_v3_file(self, f_name, subdir, stream, compressed=True,
         tar = subprocess.Popen(tar_cmdline, stdout=subprocess.PIPE)
         if encrypted:
             encryptor = subprocess.Popen(
-                ["openssl", "enc", "-e", "-aes-256-cbc", "-pass", "pass:qubes"],
+                ["openssl", "enc", "-e", "-aes-256-cbc",
+                 "-md", "MD5", "-pass", "pass:qubes"],
                 stdin=tar.stdout,
                 stdout=subprocess.PIPE)
             tar.stdout.close()