Fix keystore null (m2049r#308)

* avoid crash if input to large * avoid NPE if wallet key not found
evocodes · Jun 28, 2018 · b5d73b2 · b5d73b2
1 parent 97a95fa
commit b5d73b2
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/KeyStoreHelper.java b/app/src/main/java/com/m2049r/xmrwallet/util/KeyStoreHelper.java
@@ -284,7 +284,9 @@ private static byte[] encrypt(String alias, byte[] data) {
 
     private static byte[] decrypt(String alias, byte[] data) {
         try {
-            PrivateKey privateKey = getPrivateKeyEntry(alias).getPrivateKey();
+            KeyStore.PrivateKeyEntry pke = getPrivateKeyEntry(alias);
+            if (pke == null) return null;
+            PrivateKey privateKey = pke.getPrivateKey();
             Cipher cipher = Cipher.getInstance(SecurityConstants.CIPHER_RSA_ECB_PKCS1);
 
             cipher.init(Cipher.DECRYPT_MODE, privateKey);
@@ -305,7 +307,8 @@ private static byte[] decrypt(String alias, byte[] data) {
      */
     private static byte[] signData(String alias, byte[] data) throws NoSuchAlgorithmException,
             InvalidKeyException, SignatureException {
-
+        KeyStore.PrivateKeyEntry pke = getPrivateKeyEntry(alias);
+        if (pke == null) return null;
         PrivateKey privateKey = getPrivateKeyEntry(alias).getPrivateKey();
         Signature s = Signature.getInstance(SecurityConstants.SIGNATURE_SHA256withRSA);
         s.initSign(privateKey);