forked from Disroot/gpg-lacre
Merged change:
779e712a5d
( Changed GPGEncryptor.encrypt() to also give PGP return code. Write rc to logfile in encrypt_payload(). )
This commit is contained in:
parent
f8ae458d88
commit
63435c72c5
2 changed files with 5 additions and 2 deletions
|
@ -100,7 +100,7 @@ class GPGEncryptor:
|
||||||
def encrypt(self):
|
def encrypt(self):
|
||||||
p = subprocess.Popen( self._command(), stdin=subprocess.PIPE, stdout=subprocess.PIPE,stderr=subprocess.PIPE )
|
p = subprocess.Popen( self._command(), stdin=subprocess.PIPE, stdout=subprocess.PIPE,stderr=subprocess.PIPE )
|
||||||
encdata = p.communicate(input=self._message)[0]
|
encdata = p.communicate(input=self._message)[0]
|
||||||
return encdata
|
return (encdata, p.returncode)
|
||||||
|
|
||||||
def _command(self):
|
def _command(self):
|
||||||
cmd = ["/usr/bin/gpg", "--trust-model", "always", "--homedir", self._keyhome, "--batch", "--yes", "--pgp7", "--no-secmem-warning", "-a", "-e"]
|
cmd = ["/usr/bin/gpg", "--trust-model", "always", "--homedir", self._keyhome, "--batch", "--yes", "--pgp7", "--no-secmem-warning", "-a", "-e"]
|
||||||
|
|
|
@ -82,7 +82,10 @@ def encrypt_payload( payload, gpg_to_cmdline ):
|
||||||
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 )
|
||||||
payload.set_payload( gpg.encrypt() )
|
encrypted_data, returncode = gpg.encrypt()
|
||||||
|
if verbose:
|
||||||
|
log("Return code from encryption=%d (0 indicates success)." % returncode)
|
||||||
|
payload.set_payload( encrypted_data )
|
||||||
isAttachment = payload.get_param( 'attachment', None, 'Content-Disposition' ) is not None
|
isAttachment = payload.get_param( 'attachment', None, 'Content-Disposition' ) is not None
|
||||||
if isAttachment:
|
if isAttachment:
|
||||||
filename = payload.get_filename()
|
filename = payload.get_filename()
|
||||||
|
|
Loading…
Reference in a new issue