check for encoded pw (#280)

m2049r · May 10, 2018 · f50629f · f50629f
1 parent cb12d64
commit f50629f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/KeyStoreHelper.java b/app/src/main/java/com/m2049r/xmrwallet/util/KeyStoreHelper.java
@@ -70,12 +70,12 @@ public static String getCrazyPass(Context context, String password) {
         try {
             KeyStoreHelper.createKeys(context, RSA_ALIAS);
             sig = KeyStoreHelper.signData(RSA_ALIAS, data);
+            return CrazyPassEncoder.encode(cnSlowHash(sig));
         } catch (NoSuchProviderException | NoSuchAlgorithmException |
                 InvalidAlgorithmParameterException | KeyStoreException |
                 InvalidKeyException | SignatureException ex) {
             throw new IllegalStateException(ex);
         }
-        return CrazyPassEncoder.encode(cnSlowHash(sig));
     }
 
     public static boolean saveWalletUserPass(@NonNull Context context, String wallet, String password) {
@@ -110,6 +110,7 @@ public static String loadWalletUserPass(@NonNull Context context, String wallet)
         String walletKeyAlias = SecurityConstants.WALLET_PASS_KEY_PREFIX + wallet;
         String encoded = context.getSharedPreferences(SecurityConstants.WALLET_PASS_PREFS_NAME, Context.MODE_PRIVATE)
                 .getString(wallet, "");
+        if (encoded.isEmpty()) throw new BrokenPasswordStoreException();
         byte[] data = Base64.decode(encoded, Base64.DEFAULT);
         byte[] decrypted = KeyStoreHelper.decrypt(walletKeyAlias, data);
         if (decrypted == null) throw new BrokenPasswordStoreException();