Don't encrypt if it's a signed message, since that would mess with the signature.

This commit is contained in:
perennate 2013-09-22 15:14:09 -04:00 committed by Igor Rzegocki
parent f8711583a3
commit 52bdb31637
1 changed files with 1 additions and 1 deletions

View File

@ -47,7 +47,7 @@ def send_msg( message, recipients = None ):
def encrypt_payload( payload, gpg_to_cmdline ):
gpg = GnuPG.GPGEncryptor( cfg['gpg']['keyhome'], gpg_to_cmdline, payload.get_content_charset() )
raw_payload = payload.get_payload(decode=True)
if "-----BEGIN PGP MESSAGE-----" in raw_payload and "-----END PGP MESSAGE-----" in raw_payload:
if ("-----BEGIN PGP MESSAGE-----" in raw_payload and "-----END PGP MESSAGE-----" in raw_payload) or ("-----BEGIN PGP SIGNED MESSAGE-----" in raw_payload):
return payload
gpg = GnuPG.GPGEncryptor( cfg['gpg']['keyhome'], gpg_to_cmdline, payload.get_content_charset() )
gpg.update( raw_payload )