diff options
| author | J08nY | 2017-08-09 17:07:10 +0200 |
|---|---|---|
| committer | J08nY | 2017-08-09 17:07:10 +0200 |
| commit | 22a688b4f0579b1e1e51b4164934fe2afc357671 (patch) | |
| tree | 6e166fb047f5e3006de5d4347ed045ff3bbe97b1 /src/mailman_pgp/mta | |
| parent | cb998cf4c060ad219f3abffb08f114fbeafb16cf (diff) | |
| download | mailman-pgp-22a688b4f0579b1e1e51b4164934fe2afc357671.tar.gz mailman-pgp-22a688b4f0579b1e1e51b4164934fe2afc357671.tar.zst mailman-pgp-22a688b4f0579b1e1e51b4164934fe2afc357671.zip | |
Diffstat (limited to 'src/mailman_pgp/mta')
| -rw-r--r-- | src/mailman_pgp/mta/bulk.py | 2 | ||||
| -rw-r--r-- | src/mailman_pgp/mta/personalized.py | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/mailman_pgp/mta/bulk.py b/src/mailman_pgp/mta/bulk.py index a2cc8c6..a01b5a7 100644 --- a/src/mailman_pgp/mta/bulk.py +++ b/src/mailman_pgp/mta/bulk.py @@ -97,6 +97,8 @@ class PGPBulkMixin: else: out = wrapped.sign(pgp_list.key) else: + # Definitely encrypt here, the case where we don't encrypt or sign + # is handled above at the start of the func. out = wrapped.encrypt(pgp_list.pubkey, *keys, throw_keyid=True) overwrite_message(out, msg) diff --git a/src/mailman_pgp/mta/personalized.py b/src/mailman_pgp/mta/personalized.py index a89301f..bd50c70 100644 --- a/src/mailman_pgp/mta/personalized.py +++ b/src/mailman_pgp/mta/personalized.py @@ -16,6 +16,8 @@ # this program. If not, see <http://www.gnu.org/licenses/>. """PGP enabled IndividualDelivery.""" +import copy + from mailman.mta.base import IndividualDelivery from mailman.mta.decorating import DecoratingMixin from mailman.mta.personalized import PersonalizedMixin @@ -67,6 +69,8 @@ class PGPIndividualMixin: else: out = wrapped.sign(pgp_list.key) else: + # Definitely encrypt here, the case where we don't encrypt or sign + # is handled above at the start of the func. out = wrapped.encrypt(key, pgp_list.pubkey) overwrite_message(out, msg) |
