From fbda6a6e7265d74bcc7c965ab7927b26af1ce59d Mon Sep 17 00:00:00 2001 From: Colin Moller Date: Tue, 18 Jun 2013 18:46:41 -0700 Subject: [PATCH] Rudimentary support for not re-encrypting already encrypted messages --- gpg-mailgate.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpg-mailgate.py b/gpg-mailgate.py index 00ab3cf..89266ce 100755 --- a/gpg-mailgate.py +++ b/gpg-mailgate.py @@ -50,6 +50,8 @@ def encrypt_payload( payload, gpg_to_cmdline ): return payload gpg = GnuPG.GPGEncryptor( cfg['gpg']['keyhome'], gpg_to_cmdline, payload.get_content_charset() ) gpg.update( raw_payload ) + if "-----BEGIN PGP MESSAGE-----" in raw_payload and "-----END PGP MESSAGE-----" in raw_payload: + return payload payload.set_payload( gpg.encrypt() ) if payload['Content-Disposition']: payload.replace_header( 'Content-Disposition', re.sub(r'filename="([^"]+)"', r'filename="\1.pgp"', payload['Content-Disposition']) )