projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT #70: Fix SUBKEY signatures; update some error cases to more recent gpgv docs
[mirror/userdir-ldap.git]
/
userdir_gpg.py
diff --git
a/userdir_gpg.py
b/userdir_gpg.py
index
59e7400
..
ab192c7
100644
(file)
--- a/
userdir_gpg.py
+++ b/
userdir_gpg.py
@@
-368,12
+368,12
@@
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":
+ if Split[1] == "SIGEXPIRED"
or Split[1] == "EXPSIG"
:
GoodSig = 0;
Why = "Signature has expired";
# Revoked key
GoodSig = 0;
Why = "Signature has expired";
# Revoked key
- if Split[1] == "KEYREVOKED":
+ if Split[1] == "KEYREVOKED"
or Split[1] == "REVKEYSIG"
:
GoodSig = 0;
Why = "Signing key has been revoked";
GoodSig = 0;
Why = "Signing key has been revoked";
@@
-389,7
+389,11
@@
def GPGCheckSig(Message):
# ValidSig has the key finger print
if Split[1] == "VALIDSIG":
# ValidSig has the key finger print
if Split[1] == "VALIDSIG":
- KeyFinger = Split[2];
+ # Use the fingerprint of the primary key when available
+ if len(Split) >= 12:
+ KeyFinger = Split[11];
+ else:
+ KeyFinger = Split[2];
# Reopen the stream as a readable stream
Text = Res[2].read();
# Reopen the stream as a readable stream
Text = Res[2].read();