projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ud-info: fix changing of DD status/DD status comment - we were missing prompt informa...
[mirror/userdir-ldap.git]
/
userdir_gpg.py
diff --git
a/userdir_gpg.py
b/userdir_gpg.py
index
9b497b2
..
273ac47
100644
(file)
--- a/
userdir_gpg.py
+++ b/
userdir_gpg.py
@@
-368,10
+368,15
@@
def GPGCheckSig(Message):
Why = "Unable to verify signature, signing key missing.";
# Expired signature
Why = "Unable to verify signature, signing key missing.";
# Expired signature
- if Split[1] == "
SIGEXPIRED" or Split[1] == "
EXPSIG":
+ if Split[1] == "EXPSIG":
GoodSig = 0;
Why = "Signature has expired";
GoodSig = 0;
Why = "Signature has expired";
-
+
+ # Expired signature
+ if Split[1] == "EXPKEYSIG":
+ GoodSig = 0;
+ Why = "Signing key (%s, %s) has expired"%(Split[2], Split[3]);
+
# Revoked key
if Split[1] == "KEYREVOKED" or Split[1] == "REVKEYSIG":
GoodSig = 0;
# Revoked key
if Split[1] == "KEYREVOKED" or Split[1] == "REVKEYSIG":
GoodSig = 0;