]> xmof Git - DeDRM.git/commitdiff
Fix FileNotFoundError during PassHash handling
authorNoDRM <no_drm123@protonmail.com>
Sun, 2 Jan 2022 17:52:07 +0000 (18:52 +0100)
committerNoDRM <no_drm123@protonmail.com>
Sun, 2 Jan 2022 17:52:07 +0000 (18:52 +0100)
DeDRM_plugin/__init__.py

index 050fefb8fc2759692e9b21a73c06c8866b186cac..83b4b7ac47ab5cb7e99af133657cfa1e155069d3 100644 (file)
@@ -393,8 +393,11 @@ class DeDRM(FileTypePlugin):
                     defaultkeys_ade = []
                     if iswindows:
                         # Right now this is only implemented for Windows. MacOS support still needs to be added.
-                        from adobekey_get_passhash import passhash_keys
-                        defaultkeys_ade, names = passhash_keys()
+                        from adobekey_get_passhash import passhash_keys, ADEPTError
+                        try: 
+                            defaultkeys_ade, names = passhash_keys()
+                        except ADEPTError:
+                            defaultkeys_ade = []
                     if isosx:
                         print("{0} v{1}: Dumping ADE PassHash data is not yet supported on MacOS.".format(PLUGIN_NAME, PLUGIN_VERSION))
                         defaultkeys_ade = []