diff --git a/dkim/__init__.py b/dkim/__init__.py index 81bcd12..9714b7f 100644 --- a/dkim/__init__.py +++ b/dkim/__init__.py @@ -520,6 +520,8 @@ class DKIM(object): raise KeyFormatError(e) try: pk = parse_public_key(base64.b64decode(pub[b'p'])) + except KeyError: + raise KeyFormatError("incomplete public key: %s" % s) except (TypeError,UnparsableKeyError) as e: raise KeyFormatError("could not parse public key (%s): %s" % (pub[b'p'],e)) include_headers = [x.lower() for x in re.split(br"\s*:\s*", sig[b'h'])] diff --git a/dkimverify.py b/dkimverify.py index 6798db2..0fcf4f6 100644 --- a/dkimverify.py +++ b/dkimverify.py @@ -32,7 +32,7 @@ if sys.version_info[0] >= 3: sys.stdin = sys.stdin.detach() message = sys.stdin.read() -verbose = False +verbose = True if verbose: d = dkim.DKIM(message) res = d.verify()