diff --git a/app/build.gradle b/app/build.gradle index 47e29cc..feb92ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "com.rareventure.gps2" minSdkVersion 19 targetSdkVersion 26 - versionCode 84 - versionName "1.1.41" + versionCode 85 + versionName "1.1.42" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/java/com/rareventure/android/Crypt.java b/app/src/main/java/com/rareventure/android/Crypt.java index 2ac4508..86a4aa2 100644 --- a/app/src/main/java/com/rareventure/android/Crypt.java +++ b/app/src/main/java/com/rareventure/android/Crypt.java @@ -47,7 +47,7 @@ public class Crypt { private static final int IV_LENGTH = 16; public static final int SECRET_KEY_ROUNDS = 2048; private static final String SECRET_KEY_FACTORY_IMPL = "PBKDF2WithHmacSHA1"; - + private SecretKeySpec skeySpec; private SecureRandom sr = new SecureRandom(); diff --git a/app/src/main/java/com/rareventure/gps2/GpsTrailerCrypt.java b/app/src/main/java/com/rareventure/gps2/GpsTrailerCrypt.java index 81f403c..8d257e9 100644 --- a/app/src/main/java/com/rareventure/gps2/GpsTrailerCrypt.java +++ b/app/src/main/java/com/rareventure/gps2/GpsTrailerCrypt.java @@ -229,7 +229,7 @@ private static PrivateKey decryptPrivateKey(String password) System.arraycopy(output, 0, output2, 0, keyLength); // Private keys are encoded with PKCS#8 (or so they say) - PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(output); + PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(output2); KeyFactory keyFactory = KeyFactory.getInstance("RSA"); return keyFactory.generatePrivate(keySpec);