diff --git a/android/src/main/java/com/cryptorsa/CryptoRsa.kt b/android/src/main/java/com/cryptorsa/CryptoRsa.kt index 8ebddb1..795a763 100644 --- a/android/src/main/java/com/cryptorsa/CryptoRsa.kt +++ b/android/src/main/java/com/cryptorsa/CryptoRsa.kt @@ -55,9 +55,9 @@ class CryptoRsa(originReactContext: ReactApplicationContext, originKeySize:Int?) val keyStore = KeyStore.getInstance(KEY_STORE_TYPE) keyStore.load(null) -// if (keyStore.containsAlias(PRIVATE_KEY_ALIAS)) { -// keyStore.deleteEntry(PRIVATE_KEY_ALIAS); -// } + if (keyStore.containsAlias(PRIVATE_KEY_ALIAS)) { + keyStore.deleteEntry(PRIVATE_KEY_ALIAS); + } return keyStore } private fun getEncryptedSharedPreferences(): SharedPreferences { @@ -249,8 +249,8 @@ class CryptoRsa(originReactContext: ReactApplicationContext, originKeySize:Int?) fun decrypt(encryptedDataString: String): String? { val decryptedData = Base64.decode(encryptedDataString,Base64.DEFAULT) val privateKey = getPrivateKey() ?: return null - Log.w(TAG,"decrypt privateKey : $privateKey") - Log.w(TAG,"decrypt decryptedData : $decryptedData") + Log.d(TAG,"decrypt privateKey : $privateKey") + Log.d(TAG,"decrypt decryptedData : $decryptedData") val cipher = getCipher() cipher.init(Cipher.DECRYPT_MODE, privateKey) return String(cipher.doFinal(decryptedData), Charsets.UTF_8) diff --git a/android/src/main/java/com/cryptorsa/CryptoRsaModule.kt b/android/src/main/java/com/cryptorsa/CryptoRsaModule.kt index 9566454..ebbbe79 100644 --- a/android/src/main/java/com/cryptorsa/CryptoRsaModule.kt +++ b/android/src/main/java/com/cryptorsa/CryptoRsaModule.kt @@ -46,7 +46,6 @@ class CryptoRsaModule(reactContext: ReactApplicationContext) : runBlocking { launch { promise.resolve(cryptoRsa.privateKeyToPemString(cryptoRsa.getPrivateKey()!!)) } } - // decrypt https://stackoverflow.com/questions/22900570/key-from-string-in-java-rsa } @ReactMethod @@ -54,7 +53,6 @@ class CryptoRsaModule(reactContext: ReactApplicationContext) : runBlocking { launch { promise.resolve(cryptoRsa.publicKeyToPemString(cryptoRsa.getPublicKey()!!)) } } - // decrypt https://stackoverflow.com/questions/22900570/key-from-string-in-java-rsa } @ReactMethod @@ -62,7 +60,6 @@ class CryptoRsaModule(reactContext: ReactApplicationContext) : runBlocking { launch { promise.resolve(cryptoRsa.getSha512Text(pemString)) } } - // decrypt https://stackoverflow.com/questions/22900570/key-from-string-in-java-rsa } @RequiresApi(Build.VERSION_CODES.M)