- Support signature verification with SubjectPublicKeyInfo formatted keys

since, although rare, they are RFC 6376 specified (LP: #1851862)
2019-11-08 23:12:31 -05:00
parent 5893862e31
commit 4d2f425ae3
2 changed files with 7 additions and 2 deletions
@@ -118,8 +118,11 @@ def parse_public_key(data):
        # Not sure why the [1:] is necessary to skip a byte.
        x = asn1_parse(ASN1_Object, data)
        pkd = asn1_parse(ASN1_RSAPublicKey, x[0][1][1:])
-    except ASN1FormatError as e:
-        raise UnparsableKeyError('Unparsable public key: ' + str(e))
+    except ASN1FormatError as e_spki:
+        try:
+            pkd = asn1_parse(ASN1_RSAPublicKey, data)
+        except ASN1FormatError as e_rsa:
+            raise UnparsableKeyError('Unparsable public key; SubjectPublicKeyInfo: ' + str(e_spki) + '; RSAPublicKey: ' + str(e_rsa))
    pk = {
        'modulus': pkd[0][0],
        'publicExponent': pkd[0][1],