Merge branch 'jt+jc/encryption_improvement' into jt+jc/encryption_imp…

…rovement_migration
dimagi · Dec 9, 2024 · bbc58d0 · bbc58d0
2 parents b0d9bd3 + 0a94aa1
commit bbc58d0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 53 deletions.
diff --git a/corehq/apps/email/migrations/0003_emailsettings_password_cbc.py b/corehq/apps/email/migrations/0003_emailsettings_password_cbc.py
diff --git a/corehq/motech/tests/test_reencryption_migration.py b/corehq/motech/tests/test_reencryption_migration.py
@@ -40,7 +40,7 @@ def test_reencrypt_ecb_to_cbc_mode_match_plaintext_without_prefix(self):
 
         self.assertEqual(plaintext_password, self.email_settings.plaintext_password)
 
-    def test_empty_password_reencrypt_cbc_to_ecb_mode_match_plaintext(self):
+    def test_empty_password_reencrypt_ecb_to_cbc_mode_match_plaintext(self):
         plaintext_password = ''
         self.email_settings.password = plaintext_password
         reencrypted_password = reencrypt_ecb_to_cbc_mode(self.email_settings.password, f'${ALGO_AES}$')

diff --git a/migrations.lock b/migrations.lock
@@ -416,7 +416,6 @@ dropbox
 email
  0001_initial
  0002_emailsettings_return_path_email
- 0003_emailsettings_password_cbc
 enterprise
  0001_initial
  0002_enterprisepermissions_account_unique