Fix failing tests

easywks/httpd.py

@@ -62,7 +62,7 @@ def advanced_hu(domain: str, userhash: str):
         pubkey, revoked = read_hashed_public_key(domain, userhash)
         response.add_header('Content-Type', 'application/octet-stream')
         response.add_header(*CORS)
-        return bytes(pubkey) + b''.join([bytes(k) for k in revoked])
+        return bytes(pubkey[0]) + b''.join([bytes(k) for k in revoked])
     except FileNotFoundError:
         abort(404, 'Not Found')
 

easywks/process.py

@@ -55,7 +55,7 @@ def _get_pgp_publickeys(parts: List[MIMEPart]) -> Tuple[PGPKey, List[PGPKey]]:
             for (_, public), key in keys.items():
                 if not public:
                     continue
-                fpr = fingerprint(key.fingerprint)
+                fpr = fingerprint(key)
                 if fpr in pubkeys:
                     raise EasyWksError(f'Key with fingerprint {fpr} appears multiple times in submission request.')
                 pubkeys[fpr] = key

easywks/util.py

@@ -69,7 +69,7 @@ def armor_keys(keys: List[PGPKey]) -> str:
 def split_revoked(keys: Iterable[PGPKey]) -> Tuple[List[PGPKey], List[PGPKey]]:
     revoked_keys = set()
     for key in keys:
-        if len(key.revocation_signatures) == 0:
+        if len(list(key.revocation_signatures)) == 0:
             continue
         for rsig in key.revocation_signatures:
             if rsig.type == SignatureType.KeyRevocation: