fix 普通 KeyStore 导入 OOM

QuincySx · Jul 16, 2018 · c31e8d8 · c31e8d8
1 parent f047f8a
commit c31e8d8
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 2 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -30,4 +30,6 @@ dependencies {
     api "com.fasterxml.jackson.core:jackson-databind:2.8.5"
     api 'com.madgag.spongycastle:core:1.58.0.0'
     api 'com.madgag.spongycastle:prov:1.58.0.0'
+    api 'com.lambdaworks:scrypt:1.4.0'
+
 }
diff --git a/library/src/main/java/com/quincysx/crypto/ethereum/keystore/KeyStore.java b/library/src/main/java/com/quincysx/crypto/ethereum/keystore/KeyStore.java
@@ -190,8 +190,9 @@ public static EthECKeyPair decrypt(String password, KeyStoreFile walletFile)
             int p = scryptKdfParams.getP();
             int r = scryptKdfParams.getR();
             byte[] salt = HexUtils.fromHex(scryptKdfParams.getSalt());
-            derivedKey = generateDerivedScryptKey(password.getBytes(Charset.forName("UTF-8")),
-                    salt, n, r, p, dklen);
+//            derivedKey = generateDerivedScryptKey(password.getBytes(Charset.forName("UTF-8")),
+//                    salt, n, r, p, dklen);
+            derivedKey = com.lambdaworks.crypto.SCrypt.scryptN(password.getBytes(Charset.forName("UTF-8")), salt, n, r, p, dklen);
         } else if (kdfParams instanceof KeyStoreFile.Aes128CtrKdfParams) {
             KeyStoreFile.Aes128CtrKdfParams aes128CtrKdfParams =
                     (KeyStoreFile.Aes128CtrKdfParams) crypto.getKdfparams();

diff --git a/library/src/main/jniLibs/armeabi-v7a/libscrypt.so b/library/src/main/jniLibs/armeabi-v7a/libscrypt.so
diff --git a/library/src/main/jniLibs/armeabi/libscrypt.so b/library/src/main/jniLibs/armeabi/libscrypt.so
diff --git a/library/src/main/jniLibs/mips/libscrypt.so b/library/src/main/jniLibs/mips/libscrypt.so
diff --git a/library/src/main/jniLibs/x86/libscrypt.so b/library/src/main/jniLibs/x86/libscrypt.so
diff --git a/library/src/main/jniLibs/x86_64/libscrypt.so b/library/src/main/jniLibs/x86_64/libscrypt.so