Merge pull request #6160 from nabla-c0d3/refactor-key-and-encryption-…

…mgmt Refactor encryption logic to fix type-checking and improve tests (CryptoUtil 3/3)
freedomofpress · Dec 17, 2021 · 6cb4578 · 6cb4578
2 parents 12b6c67 + 6fa34d0
commit 6cb4578
Show file tree

Hide file tree

Showing 26 changed files with 779 additions and 625 deletions.
diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2
@@ -165,10 +165,10 @@
   /var/www/securedrop/__pycache__/ rw,
   /var/www/securedrop/__pycache__/* rw,
   /var/www/securedrop/config.py r,
-  /var/www/securedrop/crypto_util.py r,
   /var/www/securedrop/db.py r,
   /var/www/securedrop/dictionaries/adjectives.txt r,
   /var/www/securedrop/dictionaries/nouns.txt r,
+  /var/www/securedrop/encryption.py r,
   /var/www/securedrop/execution.py r,
   /var/www/securedrop/i18n.py r,
   /var/www/securedrop/journalist.py r,

diff --git a/securedrop/crypto_util.py b/securedrop/crypto_util.py