@onekeyfe/react-native-pbkdf2 3.0.7 → 3.0.9

package/android/build.gradle

@@ -74,4 +74,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  implementation "com.madgag.spongycastle:core:1.58.0.0"
+  implementation "com.madgag.spongycastle:prov:1.54.0.0"
+  implementation "com.madgag.spongycastle:pg:1.54.0.0"
 }

package/android/src/main/java/com/pbkdf2/Pbkdf2Module.kt

@@ -4,9 +4,17 @@ import android.util.Base64
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModule
-import javax.crypto.SecretKeyFactory
-import javax.crypto.spec.PBEKeySpec
+import org.spongycastle.crypto.Digest
+import org.spongycastle.crypto.digests.SHA1Digest
+import org.spongycastle.crypto.digests.SHA256Digest
+import org.spongycastle.crypto.digests.SHA512Digest
+import org.spongycastle.crypto.generators.PKCS5S2ParametersGenerator
+import org.spongycastle.crypto.params.KeyParameter
 
+/**
+ * Ported from upstream react-native-fast-pbkdf2 Pbkdf2Module.java.
+ * Adapted to extend NativePbkdf2Spec (TurboModule).
+ */
 @ReactModule(name = Pbkdf2Module.NAME)
 class Pbkdf2Module(reactContext: ReactApplicationContext) :
     NativePbkdf2Spec(reactContext) {
@@ -25,31 +33,23 @@ class Pbkdf2Module(reactContext: ReactApplicationContext) :
         hash: String,
         promise: Promise
     ) {
-        Thread {
-            try {
-                val passwordBytes = Base64.decode(password, Base64.DEFAULT)
-                val saltBytes = Base64.decode(salt, Base64.DEFAULT)
-                val iterationCount = rounds.toInt()
-                val keyLengthBits = keyLength.toInt() * 8
+        try {
+            val decodedPassword = Base64.decode(password, Base64.DEFAULT)
+            val decodedSalt = Base64.decode(salt, Base64.DEFAULT)
 
-                val algorithm = when (hash.uppercase()) {
-                    "SHA256", "SHA-256" -> "PBKDF2WithHmacSHA256"
-                    "SHA512", "SHA-512" -> "PBKDF2WithHmacSHA512"
-                    else -> "PBKDF2WithHmacSHA256"
-                }
-
-                val spec = PBEKeySpec(
-                    String(passwordBytes, Charsets.UTF_8).toCharArray(),
-                    saltBytes,
-                    iterationCount,
-                    keyLengthBits
-                )
-                val factory = SecretKeyFactory.getInstance(algorithm)
-                val derivedKey = factory.generateSecret(spec).encoded
-                promise.resolve(Base64.encodeToString(derivedKey, Base64.NO_WRAP))
-            } catch (e: Exception) {
-                promise.reject("PBKDF2_ERROR", e.message, e)
+            // Default to SHA1 (matching upstream original)
+            val digest: Digest = when (hash) {
+                "sha-256" -> SHA256Digest()
+                "sha-512" -> SHA512Digest()
+                else -> SHA1Digest()
             }
-        }.start()
+
+            val gen = PKCS5S2ParametersGenerator(digest)
+            gen.init(decodedPassword, decodedSalt, rounds.toInt())
+            val key = (gen.generateDerivedParameters(keyLength.toInt() * 8) as KeyParameter).key
+            promise.resolve(Base64.encodeToString(key, Base64.DEFAULT))
+        } catch (e: Exception) {
+            promise.reject("PBKDF2_ERROR", e.message, e)
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-pbkdf2",
-  "version": "3.0.7",
+  "version": "3.0.9",
   "description": "react-native-pbkdf2",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",