aboutsummaryrefslogtreecommitdiff
path: root/src/mailman_pgp/pgp/tests/test_mime.py
diff options
context:
space:
mode:
authorJ08nY2017-07-28 16:50:19 +0200
committerJ08nY2017-07-28 16:50:19 +0200
commitebc8b78480a039e71d6eb1578046754f78bd8fab (patch)
treef79b34061d99d893a5c5e05d95f43eb5da4f9e0e /src/mailman_pgp/pgp/tests/test_mime.py
parent84b94dfcc84c9f9e1a69734a3005637daee77cb3 (diff)
downloadmailman-pgp-ebc8b78480a039e71d6eb1578046754f78bd8fab.tar.gz
mailman-pgp-ebc8b78480a039e71d6eb1578046754f78bd8fab.tar.zst
mailman-pgp-ebc8b78480a039e71d6eb1578046754f78bd8fab.zip
Diffstat (limited to 'src/mailman_pgp/pgp/tests/test_mime.py')
-rw-r--r--src/mailman_pgp/pgp/tests/test_mime.py17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/mailman_pgp/pgp/tests/test_mime.py b/src/mailman_pgp/pgp/tests/test_mime.py
index 883e6ca..1415be5 100644
--- a/src/mailman_pgp/pgp/tests/test_mime.py
+++ b/src/mailman_pgp/pgp/tests/test_mime.py
@@ -90,7 +90,7 @@ class TestEncryption(MIMEWrapperTestCase):
@parameterized.expand([
(load_message('mime_encrypted.eml'),
True),
- (load_message('mime_encrypted_then_signed.eml'),
+ (load_message('mime_signed_then_encrypted.eml'),
True)
])
def test_is_encrypted(self, message, encrypted):
@@ -99,7 +99,7 @@ class TestEncryption(MIMEWrapperTestCase):
@parameterized.expand([
(load_message('mime_encrypted.eml'),
True),
- (load_message('mime_encrypted_then_signed.eml'),
+ (load_message('mime_signed_then_encrypted.eml'),
True)
])
def test_has_encryption(self, message, has):
@@ -193,3 +193,16 @@ class TestCombined(MIMEWrapperTestCase):
def test_sign_then_encrypt_decrypt_verify(self, message, sign_key,
encrypt_key):
self.sign_then_encrypt_decrypt_verify(message, sign_key, encrypt_key)
+
+ @parameterized.expand([
+ (load_message('mime_encrypted_signed.eml'),
+ load_key('rsa_1024.priv.asc'),
+ load_key('rsa_1024.pub.asc'),
+ True),
+ (load_message('mime_signed_then_encrypted.eml'),
+ load_key('rsa_1024.priv.asc'),
+ load_key('rsa_1024.pub.asc'),
+ True)
+ ])
+ def test_decrypt_verify(self, message, decrypt_key, verify_key, valid):
+ self.decrypt_verify(message, decrypt_key, verify_key, valid)