Fix the java version check, remove deprecated getStackTraceElement, update README

Author: tatulea

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.0.1 (27/10/2022)
+### Changed
+- Fix the java version check
+- Remove deprecated usage of getStackTraceElement in LoggingUtils.java
+
 ## 2.0.0 (25/10/2022)
 ### Added
 - Print execution time

README.md

@@ -1,6 +1,6 @@
 # SIMTester
 
-SIMtester assess SIM card security in two dimensions:
+SIMTester assess SIM card security in two dimensions:
 
 - **Cryptanalytic attack surface**: Collect cryptographic signatures and encryptions of known plaintexts
 - **Application attack surface**: Generate a list of all application identifiers (TAR) and find "unprotected" (MSL=0) applications
@@ -19,7 +19,7 @@ SIMtester assess SIM card security in two dimensions:
 java -jar SIMTester.jar <arguments>
 ```
 
-In case Java has problems to find the libpcsclite shared object, just submit the path manually:
+In case Java has problems to find the libpcsclite shared object, just submit the path manually (adjust it to your system):
 
 ```bash
 java -Dsun.security.smartcardio.library=/lib/x86_64-linux-gnu/libpcsclite.so.1 -jar SIMTester.jar <arguments>

SIMLibrary/src/de/srlabs/simlib/ChannelHandler.java

@@ -44,13 +44,9 @@ public static void initReset() {
 
             version = m.group(1);
 
-            if (m.groupCount() == 1) { // got version only
-                patchversion = 0;
-            } else { // got version and patch
-                patchversion = Integer.valueOf(m.group(2));
-            }
+            patchversion = m.group(2) == null ? 0: Integer.parseInt(m.group(2));
 
-            trueCardReset = (Helpers.versionCompare(version, "1.8.0") >= 0 && patchversion >= 20); // Java 1.8.0_20 and above have the correct behavior by default
+            trueCardReset = (Helpers.versionCompare(version, "1.8.0") > 0 || (Helpers.versionCompare(version, "1.8.0") == 0 && patchversion >= 20)); // Java 1.8.0_20 and above have the correct behavior by default
         } else {
             System.err.println("Unable to detect Java version correctly, setting invertCardReset to TRUE and trying to continue, do not be surprised if card resets won't work!");
             System.setProperty("sun.security.smartcardio.invertCardReset", "true");

SIMLibrary/src/de/srlabs/simlib/LoggingUtils.java

@@ -1,43 +1,18 @@
 package de.srlabs.simlib;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 public class LoggingUtils {
 
-    private static Method m;
-
-    static {
-        try {
-            m = Throwable.class.getDeclaredMethod("getStackTraceElement", int.class);
-            m.setAccessible(true);
-        } catch (NoSuchMethodException e) { // this should never happen really
-            e.printStackTrace(System.err);
-        }
-    }
-    
     public static String formatDebugMessage(String message) {
-            String result = "[" + getClassName(1) + ", " + getMethodName(1) + "] " + message;
-            return result;
+        return "[" + getClassName(1) + ", " + getMethodName(1) + "] " + message;
     }
 
     private static String getMethodName(final int depth) {
-        try {
-            StackTraceElement element = (StackTraceElement) m.invoke(new Throwable(), depth + 1);
-            return element.getMethodName();
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace(System.err);
-            return null;
-        }
+        StackTraceElement element = (new Throwable()).getStackTrace()[depth+ 1];
+        return element.getMethodName();
     }
 
     private static String getClassName(final int depth) {
-        try {
-            StackTraceElement element = (StackTraceElement) m.invoke(new Throwable(), depth + 1);
-            return element.getClassName();
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace(System.err);
-            return null;
-        }
+        StackTraceElement element = (new Throwable()).getStackTrace()[depth+ 1];
+        return element.getClassName();
     }
 }