Update version

- Fix version number
- Fix import functions text
- Remove auto-select for imported functions (already done with python)
- Add extracted functions for 15.0.0 arm64
- Show script version
- Add clear command

docs/shell.sh

@@ -15,3 +15,5 @@ tree() {
   path=${1:-.}
   find ${path} -print | sort | sed 's;[^/]*/;|---;g;s;---|; |;g'
 }
+
+clear

extractor/__init__.py

@@ -1,4 +1,4 @@
 from .cdm import *
 from .vendor import *
 
-__version__ = '1.0.1'
+__version__ = '1.0.3'

extractor/script.js

@@ -75,20 +75,19 @@ const hookLibrary = (name) => {
     const library = getLibrary(name);
     if (!library) return false;
 
-    let functions;
+    let functions, target;
     if (SYMBOLS.length > 0) {
         functions = SYMBOLS.map(symbol => ({
             'type': 'function',
             'name': symbol.name,
             'address': ptr(parseInt(symbol.address, 16) + parseInt(library.base, 16))
         }));
-        print(Level.INFO, 'Successfully imported symbols');
+        print(Level.INFO, 'Successfully imported functions');
     } else {
         functions = [...library.enumerateExports(), ...library.enumerateImports()];
+        target = functions.find(func => OEM_CRYPTO_API.includes(func.name));
     }
 
-    const targetFunction = functions.find(func => OEM_CRYPTO_API.includes(func.name));
-
     let hookedCount = 0;
     functions.forEach((func) => {
         if (func.type !== 'function') return;
@@ -102,7 +101,7 @@ const hookLibrary = (name) => {
                 disablePrivacyMode(funcAddr);
             } else if (funcName.includes('PrepareKeyRequest')) {
                 prepareKeyRequest(funcAddr);
-            } else if (targetFunction === func || (!targetFunction && funcName.match(/^[a-z]+$/))) {
+            } else if (target === func || (!target && funcName.match(/^[a-z]+$/))) {
                 getPrivateKey(funcAddr);
             } else {
                 funcHooked = false;
@@ -113,7 +112,7 @@ const hookLibrary = (name) => {
                 print(Level.DEBUG, `Hooked (${funcAddr}): ${funcName}`);
             }
         } catch (e) {
-            print(Level.ERROR, `${funcName} (${funcAddr}): ${e.message}`);
+            print(Level.ERROR, `${e.message} for ${funcName}`);
         }
     });
 

keydive.py

@@ -7,6 +7,7 @@ import coloredlogs
 from _frida import Process
 from pathlib import Path
 
+import extractor
 from extractor.cdm import Cdm
 
 coloredlogs.install(
@@ -24,6 +25,8 @@ if __name__ == '__main__':
     args = parser.parse_args()
 
     try:
+        logger.info('Version: %s', extractor.__version__)
+
         # Start ADB server
         exitcode, _ = subprocess.getstatusoutput('adb start-server')
         if exitcode != 0: