Merge branch 'release/1.0.1'
commit
906cbd2305
|
@ -775,11 +775,15 @@ class Sign(object):
|
||||||
"""
|
"""
|
||||||
if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE",
|
if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE",
|
||||||
"GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL",
|
"GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL",
|
||||||
"INV_SGNR"):
|
"INV_SGNR", "SIGEXPIRED"):
|
||||||
pass
|
pass
|
||||||
elif key == "SIG_CREATED":
|
elif key == "SIG_CREATED":
|
||||||
(self.sig_type, self.sig_algo, self.sig_hash_algo,
|
(self.sig_type, self.sig_algo, self.sig_hash_algo,
|
||||||
self.what, self.timestamp, self.fingerprint) = value.split()
|
self.what, self.timestamp, self.fingerprint) = value.split()
|
||||||
|
elif key == "KEYEXPIRED":
|
||||||
|
self.status = "skipped signing key, key expired"
|
||||||
|
if (value is not None) and (len(value) > 0):
|
||||||
|
self.status += " on {}".format(str(value))
|
||||||
elif key == "NODATA":
|
elif key == "NODATA":
|
||||||
self.status = nodata(value)
|
self.status = nodata(value)
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -16,10 +16,10 @@
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU Affero General Public License for more details.
|
# GNU Affero General Public License for more details.
|
||||||
"""gnupg.py
|
"""gnupg.py
|
||||||
========
|
===========
|
||||||
A Python interface to GnuPG.
|
A Python interface to GnuPG.
|
||||||
|
|
||||||
This is a modified version of python-gnupg-0.3.0, which was created by Vinay
|
This is a modified version of python-gnupg-0.3.2, which was created by Vinay
|
||||||
Sajip, which itself is a modification of GPG.py written by Steve Traugott,
|
Sajip, which itself is a modification of GPG.py written by Steve Traugott,
|
||||||
which in turn is a modification of the pycrypto GnuPG interface written by
|
which in turn is a modification of the pycrypto GnuPG interface written by
|
||||||
A.M. Kuchling.
|
A.M. Kuchling.
|
||||||
|
|
Loading…
Reference in New Issue