1 files changed, 48 insertions, 24 deletions

diff --git a/src/mailman_pgp/utils/pgp.py b/src/mailman_pgp/utils/pgp.py
index c44a27e..46fc797 100644
--- a/src/mailman_pgp/utils/pgp.py
+++ b/src/mailman_pgp/utils/pgp.py
@@ -31,7 +31,19 @@ def expired(verifications):
     :param verifications:
     :return:
     """
-    return any(any(sigsubj.signature.is_expired
+    return any(any(sigsubj.signature.is_expired or sigsubj.by.is_expired
+                   for sigsubj in verification.good_signatures)
+               for verification in verifications)
+
+
+@public
+def revoked(verifications):
+    """
+
+    :param verifications:
+    :return:
+    """
+    return any(any(key_revoked(sigsubj.by)
                    for sigsubj in verification.good_signatures)
                for verification in verifications)
 
@@ -114,16 +126,43 @@ def revoc_from_blob(blob):
 
 
 @public
-def key_flags(key):
-    if key.is_expired:
-        return set()
+def key_revoked(key):
+    """
+
+    :param key:
+    :type key: pgpy.PGPKey
+    :return:
+    :rtype: bool
+    """
+    if key.is_primary:
+        verifier = key
+    else:
+        verifier = key.parent
+
     for revoc in key.revocation_signatures:
         try:
-            verified = key.verify(key, revoc)
+            verified = verifier.verify(key, revoc)
         except PGPError:
             continue
         if bool(verified):
-            return set()
+            return True
+
+    return False
+
+
+@public
+def key_flags(key):
+    """
+
+    :param key:
+    :type key: pgpy.PGPKey
+    :return:
+    :rtype: Set[pgpy.constants.KeyFlags]
+    """
+    if key.is_expired:
+        return set()
+    if key_revoked(key):
+        return set()
 
     usage_flags = set()
     uids = (uid for uid in key.userids if uid.is_primary)
@@ -151,17 +190,7 @@ def key_flags(key):
         if subkey.is_expired:
             continue
 
-        valid = True
-        for revoc in subkey.revocation_signatures:
-            try:
-                verified = key.verify(subkey, revoc)
-            except PGPError:
-                continue
-            if bool(verified):
-                valid = False
-                break
-
-        if valid:
+        if not key_revoked(subkey):
             usage_flags |= subkey.usage_flags()
     return usage_flags
 
@@ -183,13 +212,8 @@ def key_usable(key, flags_required):
     """
     if key.is_expired:
         return False
-    for revoc in key.revocation_signatures:
-        try:
-            verified = key.verify(key, revoc)
-        except PGPError:
-            continue
-        if bool(verified):
-            return False
+    if key_revoked(key):
+        return False
     return flags_required.issubset(key_flags(key))