diff --git a/mobsf/MobSF/init.py b/mobsf/MobSF/init.py index ff4cc570..a90c1e23 100644 --- a/mobsf/MobSF/init.py +++ b/mobsf/MobSF/init.py @@ -10,7 +10,7 @@ from mobsf.install.windows.setup import windows_config_local logger = logging.getLogger(__name__) -VERSION = '3.6.1' +VERSION = '3.6.2' BANNER = """ __ __ _ ____ _____ _____ __ | \/ | ___ | |__/ ___|| ___|_ _|___ / / /_ diff --git a/mobsf/StaticAnalyzer/tools/jadx/README.md b/mobsf/StaticAnalyzer/tools/jadx/README.md index 9d4f431e..a6878d7d 100644 --- a/mobsf/StaticAnalyzer/tools/jadx/README.md +++ b/mobsf/StaticAnalyzer/tools/jadx/README.md @@ -3,8 +3,10 @@ ## JADX [![Build status](https://github.com/skylot/jadx/workflows/Build/badge.svg)](https://github.com/skylot/jadx/actions?query=workflow%3ABuild) -[![Alerts from lgtm.com](https://img.shields.io/lgtm/alerts/g/skylot/jadx.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/skylot/jadx/alerts/) -[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) +![GitHub contributors](https://img.shields.io/github/contributors/skylot/jadx) +![GitHub all releases](https://img.shields.io/github/downloads/skylot/jadx/total) +![GitHub release (latest by SemVer)](https://img.shields.io/github/downloads/skylot/jadx/latest/total) +![Latest release](https://img.shields.io/github/release/skylot/jadx.svg) [![Maven Central](https://img.shields.io/maven-central/v/io.github.skylot/jadx-core)](https://search.maven.org/search?q=g:io.github.skylot%20AND%20jadx) [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) @@ -33,8 +35,9 @@ See these features in action here: [jadx-gui features overview](https://github.c ### Download -- release from [github: ![Latest release](https://img.shields.io/github/release/skylot/jadx.svg)](https://github.com/skylot/jadx/releases/latest) -- latest [unstable build](https://nightly.link/skylot/jadx/workflows/build/master) +- release + from [github: ![Latest release](https://img.shields.io/github/release/skylot/jadx.svg)](https://github.com/skylot/jadx/releases/latest) +- latest [unstable build ![GitHub commits since tagged version (branch)](https://img.shields.io/github/commits-since/skylot/jadx/latest/master)](https://nightly.link/skylot/jadx/workflows/build-artifacts/master) After download unpack zip file go to `bin` directory and run: - `jadx` - command line version @@ -45,14 +48,18 @@ On Windows run `.bat` files with double-click\ For Windows, you can download it from [oracle.com](https://www.oracle.com/java/technologies/downloads/#jdk17-windows) (select x64 Installer). ### Install -1. Arch linux +1. Arch linux ![Arch Linux package](https://img.shields.io/archlinux/v/community/any/jadx?label=) ```bash - sudo pacman -S jadx + sudo pacman -S jadx ``` -2. macOS +2. macOS ![homebrew version](https://img.shields.io/homebrew/v/jadx?label=) ```bash - brew install jadx + brew install jadx ``` +3. [Flathub ![Flathub](https://img.shields.io/flathub/v/com.github.skylot.jadx?label=)](https://flathub.org/apps/details/com.github.skylot.jadx) + ```bash + flatpak install flathub com.github.skylot.jadx + ``` ### Use jadx as a library You can use jadx in your java projects, check details on [wiki page](https://github.com/skylot/jadx/wiki/Use-jadx-as-a-library) @@ -95,6 +102,7 @@ options: --add-debug-lines - add comments with debug line numbers if available --no-inline-anonymous - disable anonymous classes inline --no-inline-methods - disable methods inline + --no-finally - don't extract finally block --no-replace-consts - don't replace constant value with matching constant field --escape-unicode - escape non latin characters in strings (with \u) --respect-bytecode-access-modifiers - don't change original access modifiers @@ -107,9 +115,12 @@ options: 'read-or-save' - read if found, save otherwise (don't overwrite) 'overwrite' - don't read, always save 'ignore' - don't read and don't save - --deobf-rewrite-cfg - set '--deobf-cfg-file-mode' to 'overwrite' (deprecated) --deobf-use-sourcename - use source file name as class name alias --deobf-parse-kotlin-metadata - parse kotlin metadata to class and package names + --deobf-res-name-source - better name source for resources: + 'auto' - automatically select best name (default) + 'resources' - use resources names + 'code' - use R class fields names --use-kotlin-methods-for-var-names - use kotlin intrinsic methods to rename variables, values: disable, apply, apply-and-hide, default: apply --rename-flags - fix options (comma-separated list of): 'case' - fix case sensitivity issues (according to --fs-case-sensitive option), @@ -130,11 +141,11 @@ options: -h, --help - print this help Plugin options (-P=): - 1) dex-input (Load .dex and .apk files) - -Pdex-input.verify-checksum - Verify dex file checksum before load, values: [yes, no], default: yes - 2) java-convert (Convert .jar and .class files to dex) - -Pjava-convert.mode - Convert mode, values: [dx, d8, both], default: both - -Pjava-convert.d8-desugar - Use desugar in d8, values: [yes, no], default: no + 1) dex-input: Load .dex and .apk files + - dex-input.verify-checksum - verify dex file checksum before load, values: [yes, no], default: yes + 2) java-convert: Convert .class, .jar and .aar files to dex + - java-convert.mode - convert mode, values: [dx, d8, both], default: both + - java-convert.d8-desugar - use desugar in d8, values: [yes, no], default: no Examples: jadx -d out classes.dex diff --git a/mobsf/StaticAnalyzer/tools/jadx/bin/jadx b/mobsf/StaticAnalyzer/tools/jadx/bin/jadx index fd0ea1f1..ba4d10f8 100755 --- a/mobsf/StaticAnalyzer/tools/jadx/bin/jadx +++ b/mobsf/StaticAnalyzer/tools/jadx/bin/jadx @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/lib/jadx-cli-1.3.5.jar:$APP_HOME/lib/jadx-core-1.3.5.jar:$APP_HOME/lib/logback-classic-1.2.11.jar:$APP_HOME/lib/jadx-java-convert-1.3.5.jar:$APP_HOME/lib/jadx-smali-input-1.3.5.jar:$APP_HOME/lib/jadx-dex-input-1.3.5.jar:$APP_HOME/lib/jadx-java-input-1.3.5.jar:$APP_HOME/lib/jadx-plugins-api-1.3.5.jar:$APP_HOME/lib/raung-disasm-0.0.2.jar:$APP_HOME/lib/raung-common-0.0.2.jar:$APP_HOME/lib/slf4j-api-1.7.36.jar:$APP_HOME/lib/baksmali-2.5.2.jar:$APP_HOME/lib/smali-2.5.2.jar:$APP_HOME/lib/util-2.5.2.jar:$APP_HOME/lib/jcommander-1.82.jar:$APP_HOME/lib/gson-2.9.0.jar:$APP_HOME/lib/aapt2-proto-4.2.1-7147631.jar:$APP_HOME/lib/protobuf-java-3.11.4.jar:$APP_HOME/lib/logback-core-1.2.11.jar:$APP_HOME/lib/dexlib2-2.5.2.jar:$APP_HOME/lib/guava-30.1.1-jre.jar:$APP_HOME/lib/dalvik-dx-11.0.0_r3.jar:$APP_HOME/lib/r8-3.3.28.jar:$APP_HOME/lib/asm-9.3.jar:$APP_HOME/lib/antlr-3.5.2.jar:$APP_HOME/lib/ST4-4.0.8.jar:$APP_HOME/lib/antlr-runtime-3.5.2.jar:$APP_HOME/lib/stringtemplate-3.2.1.jar:$APP_HOME/lib/jsr305-3.0.2.jar:$APP_HOME/lib/failureaccess-1.0.1.jar:$APP_HOME/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:$APP_HOME/lib/checker-qual-3.8.0.jar:$APP_HOME/lib/error_prone_annotations-2.5.1.jar:$APP_HOME/lib/j2objc-annotations-1.3.jar:$APP_HOME/lib/antlr-2.7.7.jar +CLASSPATH=$APP_HOME/lib/jadx-cli-1.4.5.jar:$APP_HOME/lib/jadx-core-1.4.5.jar:$APP_HOME/lib/logback-classic-1.3.4.jar:$APP_HOME/lib/jadx-java-convert-1.4.5.jar:$APP_HOME/lib/jadx-smali-input-1.4.5.jar:$APP_HOME/lib/jadx-dex-input-1.4.5.jar:$APP_HOME/lib/jadx-java-input-1.4.5.jar:$APP_HOME/lib/jadx-plugins-api-1.4.5.jar:$APP_HOME/lib/raung-disasm-0.0.2.jar:$APP_HOME/lib/raung-common-0.0.2.jar:$APP_HOME/lib/slf4j-api-2.0.3.jar:$APP_HOME/lib/baksmali-2.5.2.jar:$APP_HOME/lib/smali-2.5.2.jar:$APP_HOME/lib/util-2.5.2.jar:$APP_HOME/lib/jcommander-1.82.jar:$APP_HOME/lib/gson-2.9.1.jar:$APP_HOME/lib/aapt2-proto-7.3.1-8691043.jar:$APP_HOME/lib/protobuf-java-3.21.8.jar:$APP_HOME/lib/logback-core-1.3.4.jar:$APP_HOME/lib/javax.mail-1.6.2.jar:$APP_HOME/lib/dexlib2-2.5.2.jar:$APP_HOME/lib/guava-30.1.1-jre.jar:$APP_HOME/lib/dalvik-dx-11.0.0_r3.jar:$APP_HOME/lib/r8-3.3.75.jar:$APP_HOME/lib/asm-9.4.jar:$APP_HOME/lib/activation-1.1.jar:$APP_HOME/lib/antlr-3.5.2.jar:$APP_HOME/lib/ST4-4.0.8.jar:$APP_HOME/lib/antlr-runtime-3.5.2.jar:$APP_HOME/lib/stringtemplate-3.2.1.jar:$APP_HOME/lib/jsr305-3.0.2.jar:$APP_HOME/lib/failureaccess-1.0.1.jar:$APP_HOME/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:$APP_HOME/lib/checker-qual-3.8.0.jar:$APP_HOME/lib/error_prone_annotations-2.5.1.jar:$APP_HOME/lib/j2objc-annotations-1.3.jar:$APP_HOME/lib/antlr-2.7.7.jar # Determine the Java command to use to start the JVM. @@ -204,6 +204,12 @@ set -- \ jadx.cli.JadxCLI \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/mobsf/StaticAnalyzer/tools/jadx/bin/jadx-gui b/mobsf/StaticAnalyzer/tools/jadx/bin/jadx-gui old mode 100644 new mode 100755 index f25ba84d..b5376654 --- a/mobsf/StaticAnalyzer/tools/jadx/bin/jadx-gui +++ b/mobsf/StaticAnalyzer/tools/jadx/bin/jadx-gui @@ -86,7 +86,7 @@ APP_NAME="jadx-gui" APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and JADX_GUI_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xms128M" "-XX:MaxRAMPercentage=70.0" "-XX:+UseG1GC" "-Dawt.useSystemAAFontSettings=lcd" "-Dswing.aatext=true"' +DEFAULT_JVM_OPTS='"-Xms128M" "-XX:MaxRAMPercentage=70.0" "-XX:+UseG1GC" "-Dawt.useSystemAAFontSettings=lcd" "-Dswing.aatext=true" "-Djava.util.Arrays.useLegacyMergeSort=true"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/lib/jadx-gui-1.3.5.jar:$APP_HOME/lib/jfontchooser-1.0.5.jar:$APP_HOME/lib/jadx-cli-1.3.5.jar:$APP_HOME/lib/jadx-core-1.3.5.jar:$APP_HOME/lib/logback-classic-1.2.11.jar:$APP_HOME/lib/jadx-java-convert-1.3.5.jar:$APP_HOME/lib/jadx-smali-input-1.3.5.jar:$APP_HOME/lib/jadx-dex-input-1.3.5.jar:$APP_HOME/lib/jadx-java-input-1.3.5.jar:$APP_HOME/lib/jadx-plugins-api-1.3.5.jar:$APP_HOME/lib/raung-disasm-0.0.2.jar:$APP_HOME/lib/raung-common-0.0.2.jar:$APP_HOME/lib/slf4j-api-1.7.36.jar:$APP_HOME/lib/baksmali-2.5.2.jar:$APP_HOME/lib/smali-2.5.2.jar:$APP_HOME/lib/util-2.5.2.jar:$APP_HOME/lib/jcommander-1.82.jar:$APP_HOME/lib/rsyntaxtextarea-3.2.0.jar:$APP_HOME/lib/image-viewer-1.2.3.jar:$APP_HOME/lib/flatlaf-intellij-themes-2.1.jar:$APP_HOME/lib/flatlaf-extras-2.1.jar:$APP_HOME/lib/flatlaf-2.1.jar:$APP_HOME/lib/svgSalamander-1.1.3.jar:$APP_HOME/lib/gson-2.9.0.jar:$APP_HOME/lib/commons-text-1.9.jar:$APP_HOME/lib/commons-lang3-3.12.0.jar:$APP_HOME/lib/rxjava2-swing-0.3.7.jar:$APP_HOME/lib/rxjava-2.2.21.jar:$APP_HOME/lib/apksig-4.2.1.jar:$APP_HOME/lib/jdwp-1.0.jar:$APP_HOME/lib/aapt2-proto-4.2.1-7147631.jar:$APP_HOME/lib/protobuf-java-3.11.4.jar:$APP_HOME/lib/logback-core-1.2.11.jar:$APP_HOME/lib/reactive-streams-1.0.3.jar:$APP_HOME/lib/dexlib2-2.5.2.jar:$APP_HOME/lib/guava-30.1.1-jre.jar:$APP_HOME/lib/dalvik-dx-11.0.0_r3.jar:$APP_HOME/lib/r8-3.3.28.jar:$APP_HOME/lib/asm-9.3.jar:$APP_HOME/lib/antlr-3.5.2.jar:$APP_HOME/lib/ST4-4.0.8.jar:$APP_HOME/lib/antlr-runtime-3.5.2.jar:$APP_HOME/lib/stringtemplate-3.2.1.jar:$APP_HOME/lib/jsr305-3.0.2.jar:$APP_HOME/lib/failureaccess-1.0.1.jar:$APP_HOME/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:$APP_HOME/lib/checker-qual-3.8.0.jar:$APP_HOME/lib/error_prone_annotations-2.5.1.jar:$APP_HOME/lib/j2objc-annotations-1.3.jar:$APP_HOME/lib/antlr-2.7.7.jar +CLASSPATH=$APP_HOME/lib/jadx-gui-1.4.5.jar:$APP_HOME/lib/jfontchooser-1.0.5.jar:$APP_HOME/lib/mapping-io-0.4.0-SNAPSHOT.jar:$APP_HOME/lib/jadx-cli-1.4.5.jar:$APP_HOME/lib/jadx-core-1.4.5.jar:$APP_HOME/lib/logback-classic-1.3.4.jar:$APP_HOME/lib/jadx-java-convert-1.4.5.jar:$APP_HOME/lib/jadx-smali-input-1.4.5.jar:$APP_HOME/lib/jadx-dex-input-1.4.5.jar:$APP_HOME/lib/jadx-java-input-1.4.5.jar:$APP_HOME/lib/jadx-plugins-api-1.4.5.jar:$APP_HOME/lib/raung-disasm-0.0.2.jar:$APP_HOME/lib/raung-common-0.0.2.jar:$APP_HOME/lib/slf4j-api-2.0.3.jar:$APP_HOME/lib/baksmali-2.5.2.jar:$APP_HOME/lib/smali-2.5.2.jar:$APP_HOME/lib/util-2.5.2.jar:$APP_HOME/lib/jcommander-1.82.jar:$APP_HOME/lib/rsyntaxtextarea-3.3.0.jar:$APP_HOME/lib/image-viewer-1.2.3.jar:$APP_HOME/lib/flatlaf-intellij-themes-2.6.jar:$APP_HOME/lib/flatlaf-extras-2.6.jar:$APP_HOME/lib/flatlaf-2.6.jar:$APP_HOME/lib/svgSalamander-1.1.4.jar:$APP_HOME/lib/gson-2.9.1.jar:$APP_HOME/lib/commons-text-1.10.0.jar:$APP_HOME/lib/commons-lang3-3.12.0.jar:$APP_HOME/lib/rxjava2-swing-0.3.7.jar:$APP_HOME/lib/rxjava-2.2.21.jar:$APP_HOME/lib/apksig-7.3.1.jar:$APP_HOME/lib/jdwp-2.0.0.jar:$APP_HOME/lib/aapt2-proto-7.3.1-8691043.jar:$APP_HOME/lib/protobuf-java-3.21.8.jar:$APP_HOME/lib/logback-core-1.3.4.jar:$APP_HOME/lib/javax.mail-1.6.2.jar:$APP_HOME/lib/reactive-streams-1.0.3.jar:$APP_HOME/lib/dexlib2-2.5.2.jar:$APP_HOME/lib/guava-30.1.1-jre.jar:$APP_HOME/lib/dalvik-dx-11.0.0_r3.jar:$APP_HOME/lib/r8-3.3.75.jar:$APP_HOME/lib/asm-9.4.jar:$APP_HOME/lib/activation-1.1.jar:$APP_HOME/lib/antlr-3.5.2.jar:$APP_HOME/lib/ST4-4.0.8.jar:$APP_HOME/lib/antlr-runtime-3.5.2.jar:$APP_HOME/lib/stringtemplate-3.2.1.jar:$APP_HOME/lib/jsr305-3.0.2.jar:$APP_HOME/lib/failureaccess-1.0.1.jar:$APP_HOME/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:$APP_HOME/lib/checker-qual-3.8.0.jar:$APP_HOME/lib/error_prone_annotations-2.5.1.jar:$APP_HOME/lib/j2objc-annotations-1.3.jar:$APP_HOME/lib/antlr-2.7.7.jar # Determine the Java command to use to start the JVM. @@ -204,6 +204,12 @@ set -- \ jadx.gui.JadxGUI \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/mobsf/StaticAnalyzer/tools/jadx/bin/jadx-gui.bat b/mobsf/StaticAnalyzer/tools/jadx/bin/jadx-gui.bat old mode 100644 new mode 100755 index 07d4a414..8d1fa8c5 --- a/mobsf/StaticAnalyzer/tools/jadx/bin/jadx-gui.bat +++ b/mobsf/StaticAnalyzer/tools/jadx/bin/jadx-gui.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem jadx-gui startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME%.. @@ -33,14 +33,14 @@ set APP_HOME=%DIRNAME%.. for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi @rem Add default JVM options here. You can also use JAVA_OPTS and JADX_GUI_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xms128M" "-XX:MaxRAMPercentage=70.0" "-XX:+UseG1GC" "-Dawt.useSystemAAFontSettings=lcd" "-Dswing.aatext=true" +set DEFAULT_JVM_OPTS="-Xms128M" "-XX:MaxRAMPercentage=70.0" "-XX:+UseG1GC" "-Dawt.useSystemAAFontSettings=lcd" "-Dswing.aatext=true" "-Djava.util.Arrays.useLegacyMergeSort=true" @rem Find javaw.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=javaw.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -67,7 +67,7 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\lib\jadx-gui-1.3.5.jar;%APP_HOME%\lib\jfontchooser-1.0.5.jar;%APP_HOME%\lib\jadx-cli-1.3.5.jar;%APP_HOME%\lib\jadx-core-1.3.5.jar;%APP_HOME%\lib\logback-classic-1.2.11.jar;%APP_HOME%\lib\jadx-java-convert-1.3.5.jar;%APP_HOME%\lib\jadx-smali-input-1.3.5.jar;%APP_HOME%\lib\jadx-dex-input-1.3.5.jar;%APP_HOME%\lib\jadx-java-input-1.3.5.jar;%APP_HOME%\lib\jadx-plugins-api-1.3.5.jar;%APP_HOME%\lib\raung-disasm-0.0.2.jar;%APP_HOME%\lib\raung-common-0.0.2.jar;%APP_HOME%\lib\slf4j-api-1.7.36.jar;%APP_HOME%\lib\baksmali-2.5.2.jar;%APP_HOME%\lib\smali-2.5.2.jar;%APP_HOME%\lib\util-2.5.2.jar;%APP_HOME%\lib\jcommander-1.82.jar;%APP_HOME%\lib\rsyntaxtextarea-3.2.0.jar;%APP_HOME%\lib\image-viewer-1.2.3.jar;%APP_HOME%\lib\flatlaf-intellij-themes-2.1.jar;%APP_HOME%\lib\flatlaf-extras-2.1.jar;%APP_HOME%\lib\flatlaf-2.1.jar;%APP_HOME%\lib\svgSalamander-1.1.3.jar;%APP_HOME%\lib\gson-2.9.0.jar;%APP_HOME%\lib\commons-text-1.9.jar;%APP_HOME%\lib\commons-lang3-3.12.0.jar;%APP_HOME%\lib\rxjava2-swing-0.3.7.jar;%APP_HOME%\lib\rxjava-2.2.21.jar;%APP_HOME%\lib\apksig-4.2.1.jar;%APP_HOME%\lib\jdwp-1.0.jar;%APP_HOME%\lib\aapt2-proto-4.2.1-7147631.jar;%APP_HOME%\lib\protobuf-java-3.11.4.jar;%APP_HOME%\lib\logback-core-1.2.11.jar;%APP_HOME%\lib\reactive-streams-1.0.3.jar;%APP_HOME%\lib\dexlib2-2.5.2.jar;%APP_HOME%\lib\guava-30.1.1-jre.jar;%APP_HOME%\lib\dalvik-dx-11.0.0_r3.jar;%APP_HOME%\lib\r8-3.3.28.jar;%APP_HOME%\lib\asm-9.3.jar;%APP_HOME%\lib\antlr-3.5.2.jar;%APP_HOME%\lib\ST4-4.0.8.jar;%APP_HOME%\lib\antlr-runtime-3.5.2.jar;%APP_HOME%\lib\stringtemplate-3.2.1.jar;%APP_HOME%\lib\jsr305-3.0.2.jar;%APP_HOME%\lib\failureaccess-1.0.1.jar;%APP_HOME%\lib\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;%APP_HOME%\lib\checker-qual-3.8.0.jar;%APP_HOME%\lib\error_prone_annotations-2.5.1.jar;%APP_HOME%\lib\j2objc-annotations-1.3.jar;%APP_HOME%\lib\antlr-2.7.7.jar +set CLASSPATH=%APP_HOME%\lib\jadx-gui-1.4.5.jar;%APP_HOME%\lib\jfontchooser-1.0.5.jar;%APP_HOME%\lib\mapping-io-0.4.0-SNAPSHOT.jar;%APP_HOME%\lib\jadx-cli-1.4.5.jar;%APP_HOME%\lib\jadx-core-1.4.5.jar;%APP_HOME%\lib\logback-classic-1.3.4.jar;%APP_HOME%\lib\jadx-java-convert-1.4.5.jar;%APP_HOME%\lib\jadx-smali-input-1.4.5.jar;%APP_HOME%\lib\jadx-dex-input-1.4.5.jar;%APP_HOME%\lib\jadx-java-input-1.4.5.jar;%APP_HOME%\lib\jadx-plugins-api-1.4.5.jar;%APP_HOME%\lib\raung-disasm-0.0.2.jar;%APP_HOME%\lib\raung-common-0.0.2.jar;%APP_HOME%\lib\slf4j-api-2.0.3.jar;%APP_HOME%\lib\baksmali-2.5.2.jar;%APP_HOME%\lib\smali-2.5.2.jar;%APP_HOME%\lib\util-2.5.2.jar;%APP_HOME%\lib\jcommander-1.82.jar;%APP_HOME%\lib\rsyntaxtextarea-3.3.0.jar;%APP_HOME%\lib\image-viewer-1.2.3.jar;%APP_HOME%\lib\flatlaf-intellij-themes-2.6.jar;%APP_HOME%\lib\flatlaf-extras-2.6.jar;%APP_HOME%\lib\flatlaf-2.6.jar;%APP_HOME%\lib\svgSalamander-1.1.4.jar;%APP_HOME%\lib\gson-2.9.1.jar;%APP_HOME%\lib\commons-text-1.10.0.jar;%APP_HOME%\lib\commons-lang3-3.12.0.jar;%APP_HOME%\lib\rxjava2-swing-0.3.7.jar;%APP_HOME%\lib\rxjava-2.2.21.jar;%APP_HOME%\lib\apksig-7.3.1.jar;%APP_HOME%\lib\jdwp-2.0.0.jar;%APP_HOME%\lib\aapt2-proto-7.3.1-8691043.jar;%APP_HOME%\lib\protobuf-java-3.21.8.jar;%APP_HOME%\lib\logback-core-1.3.4.jar;%APP_HOME%\lib\javax.mail-1.6.2.jar;%APP_HOME%\lib\reactive-streams-1.0.3.jar;%APP_HOME%\lib\dexlib2-2.5.2.jar;%APP_HOME%\lib\guava-30.1.1-jre.jar;%APP_HOME%\lib\dalvik-dx-11.0.0_r3.jar;%APP_HOME%\lib\r8-3.3.75.jar;%APP_HOME%\lib\asm-9.4.jar;%APP_HOME%\lib\activation-1.1.jar;%APP_HOME%\lib\antlr-3.5.2.jar;%APP_HOME%\lib\ST4-4.0.8.jar;%APP_HOME%\lib\antlr-runtime-3.5.2.jar;%APP_HOME%\lib\stringtemplate-3.2.1.jar;%APP_HOME%\lib\jsr305-3.0.2.jar;%APP_HOME%\lib\failureaccess-1.0.1.jar;%APP_HOME%\lib\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;%APP_HOME%\lib\checker-qual-3.8.0.jar;%APP_HOME%\lib\error_prone_annotations-2.5.1.jar;%APP_HOME%\lib\j2objc-annotations-1.3.jar;%APP_HOME%\lib\antlr-2.7.7.jar @rem Execute jadx-gui @@ -75,13 +75,15 @@ start "jadx-gui" /B "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %JADX_GUI_OPTS% :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable JADX_GUI_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%JADX_GUI_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%JADX_GUI_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/mobsf/StaticAnalyzer/tools/jadx/bin/jadx.bat b/mobsf/StaticAnalyzer/tools/jadx/bin/jadx.bat old mode 100644 new mode 100755 index 4cfe5229..850f8f5e --- a/mobsf/StaticAnalyzer/tools/jadx/bin/jadx.bat +++ b/mobsf/StaticAnalyzer/tools/jadx/bin/jadx.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem jadx startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME%.. @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -67,7 +67,7 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\lib\jadx-cli-1.3.5.jar;%APP_HOME%\lib\jadx-core-1.3.5.jar;%APP_HOME%\lib\logback-classic-1.2.11.jar;%APP_HOME%\lib\jadx-java-convert-1.3.5.jar;%APP_HOME%\lib\jadx-smali-input-1.3.5.jar;%APP_HOME%\lib\jadx-dex-input-1.3.5.jar;%APP_HOME%\lib\jadx-java-input-1.3.5.jar;%APP_HOME%\lib\jadx-plugins-api-1.3.5.jar;%APP_HOME%\lib\raung-disasm-0.0.2.jar;%APP_HOME%\lib\raung-common-0.0.2.jar;%APP_HOME%\lib\slf4j-api-1.7.36.jar;%APP_HOME%\lib\baksmali-2.5.2.jar;%APP_HOME%\lib\smali-2.5.2.jar;%APP_HOME%\lib\util-2.5.2.jar;%APP_HOME%\lib\jcommander-1.82.jar;%APP_HOME%\lib\gson-2.9.0.jar;%APP_HOME%\lib\aapt2-proto-4.2.1-7147631.jar;%APP_HOME%\lib\protobuf-java-3.11.4.jar;%APP_HOME%\lib\logback-core-1.2.11.jar;%APP_HOME%\lib\dexlib2-2.5.2.jar;%APP_HOME%\lib\guava-30.1.1-jre.jar;%APP_HOME%\lib\dalvik-dx-11.0.0_r3.jar;%APP_HOME%\lib\r8-3.3.28.jar;%APP_HOME%\lib\asm-9.3.jar;%APP_HOME%\lib\antlr-3.5.2.jar;%APP_HOME%\lib\ST4-4.0.8.jar;%APP_HOME%\lib\antlr-runtime-3.5.2.jar;%APP_HOME%\lib\stringtemplate-3.2.1.jar;%APP_HOME%\lib\jsr305-3.0.2.jar;%APP_HOME%\lib\failureaccess-1.0.1.jar;%APP_HOME%\lib\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;%APP_HOME%\lib\checker-qual-3.8.0.jar;%APP_HOME%\lib\error_prone_annotations-2.5.1.jar;%APP_HOME%\lib\j2objc-annotations-1.3.jar;%APP_HOME%\lib\antlr-2.7.7.jar +set CLASSPATH=%APP_HOME%\lib\jadx-cli-1.4.5.jar;%APP_HOME%\lib\jadx-core-1.4.5.jar;%APP_HOME%\lib\logback-classic-1.3.4.jar;%APP_HOME%\lib\jadx-java-convert-1.4.5.jar;%APP_HOME%\lib\jadx-smali-input-1.4.5.jar;%APP_HOME%\lib\jadx-dex-input-1.4.5.jar;%APP_HOME%\lib\jadx-java-input-1.4.5.jar;%APP_HOME%\lib\jadx-plugins-api-1.4.5.jar;%APP_HOME%\lib\raung-disasm-0.0.2.jar;%APP_HOME%\lib\raung-common-0.0.2.jar;%APP_HOME%\lib\slf4j-api-2.0.3.jar;%APP_HOME%\lib\baksmali-2.5.2.jar;%APP_HOME%\lib\smali-2.5.2.jar;%APP_HOME%\lib\util-2.5.2.jar;%APP_HOME%\lib\jcommander-1.82.jar;%APP_HOME%\lib\gson-2.9.1.jar;%APP_HOME%\lib\aapt2-proto-7.3.1-8691043.jar;%APP_HOME%\lib\protobuf-java-3.21.8.jar;%APP_HOME%\lib\logback-core-1.3.4.jar;%APP_HOME%\lib\javax.mail-1.6.2.jar;%APP_HOME%\lib\dexlib2-2.5.2.jar;%APP_HOME%\lib\guava-30.1.1-jre.jar;%APP_HOME%\lib\dalvik-dx-11.0.0_r3.jar;%APP_HOME%\lib\r8-3.3.75.jar;%APP_HOME%\lib\asm-9.4.jar;%APP_HOME%\lib\activation-1.1.jar;%APP_HOME%\lib\antlr-3.5.2.jar;%APP_HOME%\lib\ST4-4.0.8.jar;%APP_HOME%\lib\antlr-runtime-3.5.2.jar;%APP_HOME%\lib\stringtemplate-3.2.1.jar;%APP_HOME%\lib\jsr305-3.0.2.jar;%APP_HOME%\lib\failureaccess-1.0.1.jar;%APP_HOME%\lib\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;%APP_HOME%\lib\checker-qual-3.8.0.jar;%APP_HOME%\lib\error_prone_annotations-2.5.1.jar;%APP_HOME%\lib\j2objc-annotations-1.3.jar;%APP_HOME%\lib\antlr-2.7.7.jar @rem Execute jadx @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\lib\jadx-cli-1.3.5.jar;%APP_HOME%\lib\jadx-core-1.3.5.j :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable JADX_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%JADX_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%JADX_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/aapt2-proto-4.2.1-7147631.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/aapt2-proto-4.2.1-7147631.jar deleted file mode 100644 index acfd5e77..00000000 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/aapt2-proto-4.2.1-7147631.jar and /dev/null differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/aapt2-proto-7.3.1-8691043.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/aapt2-proto-7.3.1-8691043.jar new file mode 100644 index 00000000..56017584 Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/aapt2-proto-7.3.1-8691043.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/activation-1.1.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/activation-1.1.jar new file mode 100644 index 00000000..53f82a1c Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/activation-1.1.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/apksig-4.2.1.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/apksig-4.2.1.jar deleted file mode 100644 index 159148c5..00000000 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/apksig-4.2.1.jar and /dev/null differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/apksig-7.3.1.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/apksig-7.3.1.jar new file mode 100644 index 00000000..0d97b04d Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/apksig-7.3.1.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/asm-9.3.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/asm-9.4.jar similarity index 74% rename from mobsf/StaticAnalyzer/tools/jadx/lib/asm-9.3.jar rename to mobsf/StaticAnalyzer/tools/jadx/lib/asm-9.4.jar index bd8b9486..01cb52ee 100644 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/asm-9.3.jar and b/mobsf/StaticAnalyzer/tools/jadx/lib/asm-9.4.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/commons-text-1.10.0.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/commons-text-1.10.0.jar new file mode 100644 index 00000000..beada027 Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/commons-text-1.10.0.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/commons-text-1.9.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/commons-text-1.9.jar deleted file mode 100644 index cc0c6906..00000000 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/commons-text-1.9.jar and /dev/null differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-2.1.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-2.1.jar deleted file mode 100644 index bf7da703..00000000 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-2.1.jar and /dev/null differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-2.6.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-2.6.jar new file mode 100644 index 00000000..654da803 Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-2.6.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-extras-2.1.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-extras-2.6.jar similarity index 78% rename from mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-extras-2.1.jar rename to mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-extras-2.6.jar index 904428d1..001f781e 100644 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-extras-2.1.jar and b/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-extras-2.6.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-intellij-themes-2.1.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-intellij-themes-2.1.jar deleted file mode 100644 index 28caa513..00000000 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-intellij-themes-2.1.jar and /dev/null differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-intellij-themes-2.6.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-intellij-themes-2.6.jar new file mode 100644 index 00000000..39ae20a4 Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/flatlaf-intellij-themes-2.6.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/gson-2.9.0.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/gson-2.9.0.jar deleted file mode 100644 index fb62e056..00000000 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/gson-2.9.0.jar and /dev/null differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/gson-2.9.1.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/gson-2.9.1.jar new file mode 100644 index 00000000..8a663ecc Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/gson-2.9.1.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-cli-1.3.5.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-cli-1.3.5.jar deleted file mode 100644 index ba1e320f..00000000 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-cli-1.3.5.jar and /dev/null differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-cli-1.4.5.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-cli-1.4.5.jar new file mode 100644 index 00000000..5ec5d375 Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-cli-1.4.5.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-core-1.3.5.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-core-1.4.5.jar similarity index 69% rename from mobsf/StaticAnalyzer/tools/jadx/lib/jadx-core-1.3.5.jar rename to mobsf/StaticAnalyzer/tools/jadx/lib/jadx-core-1.4.5.jar index e61cbf84..8c0b41ca 100644 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-core-1.3.5.jar and b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-core-1.4.5.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-dex-input-1.3.5.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-dex-input-1.4.5.jar similarity index 79% rename from mobsf/StaticAnalyzer/tools/jadx/lib/jadx-dex-input-1.3.5.jar rename to mobsf/StaticAnalyzer/tools/jadx/lib/jadx-dex-input-1.4.5.jar index 15616207..a62a8621 100644 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-dex-input-1.3.5.jar and b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-dex-input-1.4.5.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-gui-1.3.5.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-gui-1.3.5.jar deleted file mode 100644 index c2ad1e8d..00000000 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-gui-1.3.5.jar and /dev/null differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-gui-1.4.5.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-gui-1.4.5.jar new file mode 100644 index 00000000..0395f31f Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-gui-1.4.5.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-java-convert-1.3.5.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-java-convert-1.4.5.jar similarity index 75% rename from mobsf/StaticAnalyzer/tools/jadx/lib/jadx-java-convert-1.3.5.jar rename to mobsf/StaticAnalyzer/tools/jadx/lib/jadx-java-convert-1.4.5.jar index ab06fc26..2fd9c745 100644 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-java-convert-1.3.5.jar and b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-java-convert-1.4.5.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-java-input-1.3.5.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-java-input-1.4.5.jar similarity index 80% rename from mobsf/StaticAnalyzer/tools/jadx/lib/jadx-java-input-1.3.5.jar rename to mobsf/StaticAnalyzer/tools/jadx/lib/jadx-java-input-1.4.5.jar index fe1406f4..e4a7a0bc 100644 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-java-input-1.3.5.jar and b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-java-input-1.4.5.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-plugins-api-1.3.5.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-plugins-api-1.4.5.jar similarity index 78% rename from mobsf/StaticAnalyzer/tools/jadx/lib/jadx-plugins-api-1.3.5.jar rename to mobsf/StaticAnalyzer/tools/jadx/lib/jadx-plugins-api-1.4.5.jar index 6706f512..50c3a02b 100644 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-plugins-api-1.3.5.jar and b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-plugins-api-1.4.5.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-smali-input-1.3.5.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-smali-input-1.4.5.jar similarity index 78% rename from mobsf/StaticAnalyzer/tools/jadx/lib/jadx-smali-input-1.3.5.jar rename to mobsf/StaticAnalyzer/tools/jadx/lib/jadx-smali-input-1.4.5.jar index 862917be..58ea2f08 100644 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-smali-input-1.3.5.jar and b/mobsf/StaticAnalyzer/tools/jadx/lib/jadx-smali-input-1.4.5.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/javax.mail-1.6.2.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/javax.mail-1.6.2.jar new file mode 100644 index 00000000..0cd05289 Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/javax.mail-1.6.2.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/jdwp-1.0.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/jdwp-1.0.jar deleted file mode 100644 index 60917a87..00000000 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/jdwp-1.0.jar and /dev/null differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/jdwp-2.0.0.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/jdwp-2.0.0.jar new file mode 100644 index 00000000..53c5289c Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/jdwp-2.0.0.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/logback-classic-1.2.11.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/logback-classic-1.2.11.jar deleted file mode 100644 index b70c0e6a..00000000 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/logback-classic-1.2.11.jar and /dev/null differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/logback-classic-1.3.4.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/logback-classic-1.3.4.jar new file mode 100644 index 00000000..bf0a33dd Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/logback-classic-1.3.4.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/logback-core-1.2.11.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/logback-core-1.2.11.jar deleted file mode 100644 index e3038da2..00000000 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/logback-core-1.2.11.jar and /dev/null differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/logback-core-1.3.4.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/logback-core-1.3.4.jar new file mode 100644 index 00000000..e95b3854 Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/logback-core-1.3.4.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/mapping-io-0.4.0-SNAPSHOT.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/mapping-io-0.4.0-SNAPSHOT.jar new file mode 100644 index 00000000..d06bcd83 Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/mapping-io-0.4.0-SNAPSHOT.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/protobuf-java-3.11.4.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/protobuf-java-3.11.4.jar deleted file mode 100644 index 7224d23d..00000000 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/protobuf-java-3.11.4.jar and /dev/null differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/protobuf-java-3.21.8.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/protobuf-java-3.21.8.jar new file mode 100644 index 00000000..b1cc6616 Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/protobuf-java-3.21.8.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/r8-3.3.28.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/r8-3.3.75.jar similarity index 55% rename from mobsf/StaticAnalyzer/tools/jadx/lib/r8-3.3.28.jar rename to mobsf/StaticAnalyzer/tools/jadx/lib/r8-3.3.75.jar index e4535bc2..3e777ebd 100644 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/r8-3.3.28.jar and b/mobsf/StaticAnalyzer/tools/jadx/lib/r8-3.3.75.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/rsyntaxtextarea-3.2.0.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/rsyntaxtextarea-3.3.0.jar similarity index 78% rename from mobsf/StaticAnalyzer/tools/jadx/lib/rsyntaxtextarea-3.2.0.jar rename to mobsf/StaticAnalyzer/tools/jadx/lib/rsyntaxtextarea-3.3.0.jar index fce14e0e..b1e27cd8 100644 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/rsyntaxtextarea-3.2.0.jar and b/mobsf/StaticAnalyzer/tools/jadx/lib/rsyntaxtextarea-3.3.0.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/slf4j-api-1.7.36.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/slf4j-api-1.7.36.jar deleted file mode 100644 index 7d3ce68d..00000000 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/slf4j-api-1.7.36.jar and /dev/null differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/slf4j-api-2.0.3.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/slf4j-api-2.0.3.jar new file mode 100644 index 00000000..c0b00662 Binary files /dev/null and b/mobsf/StaticAnalyzer/tools/jadx/lib/slf4j-api-2.0.3.jar differ diff --git a/mobsf/StaticAnalyzer/tools/jadx/lib/svgSalamander-1.1.3.jar b/mobsf/StaticAnalyzer/tools/jadx/lib/svgSalamander-1.1.4.jar similarity index 70% rename from mobsf/StaticAnalyzer/tools/jadx/lib/svgSalamander-1.1.3.jar rename to mobsf/StaticAnalyzer/tools/jadx/lib/svgSalamander-1.1.4.jar index 3a4d29a2..24c7827d 100644 Binary files a/mobsf/StaticAnalyzer/tools/jadx/lib/svgSalamander-1.1.3.jar and b/mobsf/StaticAnalyzer/tools/jadx/lib/svgSalamander-1.1.4.jar differ