From c64d4507d858f1d443eee0926000e14fe9755adc Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 14 Jul 2017 14:27:04 -0700 Subject: db/utils: Allow encrypted messages to be put in mixed payloads as well Since a multipart/mixed can contain anything that a normal message could, this should be allowed. The only case that I can think of this actually happening is if an email server takes the original message, puts it in a multipart/mixed, and then attaches it's own message, like on of the annoying "this mail scanned for viruses by ". --- tests/db/utils_test.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests/db') diff --git a/tests/db/utils_test.py b/tests/db/utils_test.py index d2c92577..26768597 100644 --- a/tests/db/utils_test.py +++ b/tests/db/utils_test.py @@ -603,7 +603,6 @@ class TestMessageFromFile(TestCaseClassCleanup): self.assertIn(utils.X_SIGNATURE_VALID_HEADER, m) self.assertIn(utils.X_SIGNATURE_MESSAGE_HEADER, m) - @unittest.expectedFailure def test_encrypted_unsigned_in_multipart_mixed(self): """It is valid to encapsulate a multipart/encrypted payload inside a multipart/mixed payload, verify that works. @@ -615,7 +614,6 @@ class TestMessageFromFile(TestCaseClassCleanup): self.assertNotIn(utils.X_SIGNATURE_VALID_HEADER, m) self.assertNotIn(utils.X_SIGNATURE_MESSAGE_HEADER, m) - @unittest.expectedFailure def test_encrypted_signed_in_multipart_mixed(self): """It is valid to encapsulate a multipart/encrypted payload inside a multipart/mixed payload, verify that works when the multipart/encrypted -- cgit v1.2.3