aboutsummaryrefslogtreecommitdiff
path: root/src/mailman_pgp
diff options
context:
space:
mode:
authorJ08nY2017-07-06 00:58:35 +0200
committerJ08nY2017-07-06 01:01:34 +0200
commitf5e987e4efeda04ac3c94918ddcbe3f3bb9bd61f (patch)
tree909adeb27b3e8aeb921286dca2fcfeca6b372190 /src/mailman_pgp
parent5669d2db3a3c8637680d7130ff5d3a1391997b20 (diff)
downloadmailman-pgp-f5e987e4efeda04ac3c94918ddcbe3f3bb9bd61f.tar.gz
mailman-pgp-f5e987e4efeda04ac3c94918ddcbe3f3bb9bd61f.tar.zst
mailman-pgp-f5e987e4efeda04ac3c94918ddcbe3f3bb9bd61f.zip
Diffstat (limited to 'src/mailman_pgp')
-rw-r--r--src/mailman_pgp/pgp/inline.py4
-rw-r--r--src/mailman_pgp/testing/layers.py2
-rw-r--r--src/mailman_pgp/testing/start.py2
3 files changed, 5 insertions, 3 deletions
diff --git a/src/mailman_pgp/pgp/inline.py b/src/mailman_pgp/pgp/inline.py
index ca83e89..3cd2aa1 100644
--- a/src/mailman_pgp/pgp/inline.py
+++ b/src/mailman_pgp/pgp/inline.py
@@ -263,4 +263,6 @@ class InlineWrapper:
def sign_then_encrypt(self, key, *keys, hash=None,
cipher=SymmetricKeyAlgorithm.AES256):
- return self.sign_encrypt(key, *keys, hash=hash, cipher=cipher) \ No newline at end of file
+ # TODO: sign into cleartext here and then encrypt? I mean that's weird
+ # but thats what sing *then* encrypt means for inline pgp.
+ return self.sign_encrypt(key, *keys, hash=hash, cipher=cipher)
diff --git a/src/mailman_pgp/testing/layers.py b/src/mailman_pgp/testing/layers.py
index 8ae2779..401f7a6 100644
--- a/src/mailman_pgp/testing/layers.py
+++ b/src/mailman_pgp/testing/layers.py
@@ -17,7 +17,7 @@
import os
from os.path import isfile
-from mailman.testing.layers import ConfigLayer, RESTLayer, SMTPLayer
+from mailman.testing.layers import (ConfigLayer, RESTLayer, SMTPLayer)
from mailman_pgp.config import config
from mailman_pgp.database import transaction
diff --git a/src/mailman_pgp/testing/start.py b/src/mailman_pgp/testing/start.py
index 1cdbf6f..37f3de4 100644
--- a/src/mailman_pgp/testing/start.py
+++ b/src/mailman_pgp/testing/start.py
@@ -22,6 +22,6 @@ from public import public
@public
-def start_run(testobj):
+def start_run(plugin):
warnings.filterwarnings(action='ignore', category=UserWarning,
module='.*mailman_pgp.*')