Merge pull request #1040 from olokos/fix-sign-pubkey-finger

androsign: Fix #1031 & #764 - use oscrypto to load public_key instead…

androguard/cli/main.py

@@ -10,6 +10,7 @@
 from pygments import highlight
 from pygments.lexers import get_lexer_by_name
 from pygments.formatters.terminal import TerminalFormatter
+from oscrypto import asymmetric
 
 # internal modules
 from androguard.core import androconf
@@ -360,14 +361,14 @@ def androsign_main(args_apk, args_hash, args_all, show):
 
             for public_key in pkeys:
                 if show:
-                    x509_public_key = keys.PublicKeyInfo.load(public_key)
+                    x509_public_key = asymmetric.load_public_key(public_key)
                     print("PublicKey Algorithm:", x509_public_key.algorithm)
                     print("Bit Size:", x509_public_key.bit_size)
                     print("Fingerprint:", binascii.hexlify(x509_public_key.fingerprint))
                     try:
-                        print("Hash Algorithm:", x509_public_key.hash_algo)
+                        print("Hash Algorithm:", x509_public_key.asn1.hash_algo)
                     except ValueError as ve:
-                        # RSA pkey does not have an hash algorithm
+                        # RSA pkey does not have a hash algorithm
                         pass
                 print()
 

pyproject.toml

@@ -36,6 +36,7 @@ PyQt5-Qt5 = [
     {version = "5.15.2", markers = "sys_platform != 'darwin'"}
 ]
 pyyaml = "*"
+oscrypto = ">=1.3.0"
 
 [tool.setuptools.package_data]
 "androguard.core.api_specific_resources" = ["aosp_permissions/*.json", "api_permission_mappings/*.json"]

requirements.txt

@@ -14,3 +14,4 @@ matplotlib
 networkx
 PyQt5
 pyyaml
+oscrypto>=1.3.0