Don't encrypt if it's a signed message, since that would mess with the signature.
This commit is contained in:
parent
003c7fe62b
commit
3c7b44d17f
|
@ -45,7 +45,7 @@ def send_msg( message, recipients = None ):
|
||||||
|
|
||||||
def encrypt_payload( payload, gpg_to_cmdline ):
|
def encrypt_payload( payload, gpg_to_cmdline ):
|
||||||
raw_payload = payload.get_payload(decode=True)
|
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
|
return payload
|
||||||
gpg = GnuPG.GPGEncryptor( cfg['gpg']['keyhome'], gpg_to_cmdline, payload.get_content_charset() )
|
gpg = GnuPG.GPGEncryptor( cfg['gpg']['keyhome'], gpg_to_cmdline, payload.get_content_charset() )
|
||||||
gpg.update( raw_payload )
|
gpg.update( raw_payload )
|
||||||
|
|
Loading…
Reference in New Issue