expo-device-crypto 0.1.1 → 0.2.1

package/README.md

@@ -2,7 +2,7 @@
 
 > ⚠️ This module is currently in beta and is not suitable for production use.
 
-🔒 Hardware-backed cryptography for Expo apps using [Android Keystore](https://developer.android.com/privacy-and-security/keystore) and Apple [Secure Enclave](https://developer.apple.com/documentation/security/protecting-keys-with-the-secure-enclave)/Keychain where available.
+🔒 Hardware-backed cryptography for Expo apps using [Android Keystore](https://developer.android.com/privacy-and-security/keystore) and Apple [Secure Enclave](https://developer.apple.com/documentation/security/protecting-keys-with-the-secure-enclave)/[Keychain](https://developer.apple.com/documentation/security/keychain-services).
 
 ## Installation
 
@@ -42,7 +42,13 @@ If you want to allow Face ID on iOS, add this to your app config:
 **Padding:** PKCS#1 v1.5. </br>
 **Use it for:** Encrypting small secrets that only the private key holder should decrypt.
 
-More coming soon 
+- #### `RSA_2048_OAEP_SHA1`
+
+**Key size:** 2048 bits. </br>
+**Padding:** OAEP with SHA-1 and MGF1. </br>
+**Use it for:** Encrypting small secrets with stronger padding than PKCS#1 v1.5 when interoperating with OAEP SHA-1 systems.
+
+**More coming soon...**
 
 ## Example: ECDSA with Biometric
 
@@ -170,4 +176,10 @@ const decrypted = await DeviceCrypto.decrypt(alias, encrypted ?? "", {
   - Decrypts Base64 `data` with private key.
   - Defaults: `algorithmType = RSA_2048_PKCS1`, `promptTitle = "Unlock"`, `promptSubtitle = "Enter your PIN to continue"`, `authMethod = PASSCODE_OR_BIOMETRIC`.
 
-> ✅ JSDoc type definitions are available in `./src/DeviceCryptoModule.ts`.
+> ✅ JSDoc type definitions are available in `./src/DeviceCryptoModule.ts`.
+
+## Important
+
+### RSA algorithms on iOS
+
+Please note that RSA private-key operations are not performed in the [Secure Enclave processor](https://developer.apple.com/documentation/security/ksecattrtokenidsecureenclave?utm_source=chatgpt.com#Discussion). Instead, they are software-backed and handled by Apple’s system cryptographic services, which still provide strong isolation and protection.

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'expo.modules.devicecrypto'
-version = '0.1.1'
+version = '0.2.1'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -35,7 +35,7 @@ android {
   namespace "expo.modules.devicecrypto"
   defaultConfig {
     versionCode 1
-    versionName "0.1.1"
+    versionName "0.2.1"
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/devicecrypto/DeviceCryptoModule.kt

@@ -1,26 +1,41 @@
 package expo.modules.devicecrypto
 
+import android.content.Context
 import android.content.pm.PackageManager
 import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyInfo
-import android.security.keystore.KeyProperties
-import expo.modules.kotlin.modules.Module
-import expo.modules.kotlin.modules.ModuleDefinition
-import java.security.KeyPairGenerator
-import java.security.KeyStore
+import android.security.keystore.KeyProperties.AUTH_BIOMETRIC_STRONG
+import android.security.keystore.KeyProperties.AUTH_DEVICE_CREDENTIAL
+import android.security.keystore.KeyProperties.DIGEST_SHA1
+import android.security.keystore.KeyProperties.DIGEST_SHA256
+import android.security.keystore.KeyProperties.ENCRYPTION_PADDING_RSA_OAEP
+import android.security.keystore.KeyProperties.ENCRYPTION_PADDING_RSA_PKCS1
+import android.security.keystore.KeyProperties.KEY_ALGORITHM_EC
+import android.security.keystore.KeyProperties.KEY_ALGORITHM_RSA
+import android.security.keystore.KeyProperties.PURPOSE_DECRYPT
+import android.security.keystore.KeyProperties.PURPOSE_ENCRYPT
+import android.security.keystore.KeyProperties.PURPOSE_SIGN
+import android.security.keystore.KeyProperties.PURPOSE_VERIFY
 import android.util.Base64
 import androidx.biometric.BiometricManager
-import androidx.biometric.BiometricPrompt
 import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG
 import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL
+import androidx.biometric.BiometricPrompt
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import expo.modules.kotlin.Promise
-import java.security.Signature
-import android.widget.Toast
-import android.content.Context
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
 import java.security.KeyFactory
+import java.security.KeyPairGenerator
+import java.security.KeyStore
+import java.security.Signature
+import java.security.spec.AlgorithmParameterSpec
+import java.security.spec.MGF1ParameterSpec
 import javax.crypto.Cipher
+import javax.crypto.spec.OAEPParameterSpec
+import javax.crypto.spec.PSource
+
 
 enum class GenerateKeyPairResult {
   KEY_PAIR_GENERATED,
@@ -42,6 +57,7 @@ enum class AuthMethod {
 enum class AlgorithmType {
   ECDSA_SECP256R1_SHA256,
   RSA_2048_PKCS1,
+  RSA_2048_OAEP_SHA1,
 }
 
 class DeviceCryptoModule : Module() {
@@ -49,16 +65,19 @@ class DeviceCryptoModule : Module() {
     return when (algorithm) {
       AlgorithmType.ECDSA_SECP256R1_SHA256 -> "SHA256withECDSA"
       AlgorithmType.RSA_2048_PKCS1 -> "RSA/ECB/PKCS1Padding"
+      AlgorithmType.RSA_2048_OAEP_SHA1 -> "RSA/ECB/OAEPwithSHA-1AndMGF1Padding"
     }
   }
 
-  private fun isAuthCheckAvailable(): AuthCheckResult {
-    val biometricManager = BiometricManager.from(appContext.reactContext as Context)
-    return when (biometricManager.canAuthenticate(BIOMETRIC_STRONG or DEVICE_CREDENTIAL)) {
-      BiometricManager.BIOMETRIC_SUCCESS -> AuthCheckResult.AVAILABLE
-      BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> AuthCheckResult.NO_HARDWARE
-      BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE -> AuthCheckResult.UNAVAILABLE
-      else -> AuthCheckResult.UNAVAILABLE
+  private fun getOaepSpec(algoType: AlgorithmType): AlgorithmParameterSpec? {
+    return when (algoType) {
+      AlgorithmType.RSA_2048_OAEP_SHA1 -> OAEPParameterSpec(
+        "SHA-1",
+        "MGF1",
+        MGF1ParameterSpec.SHA1,
+        PSource.PSpecified.DEFAULT
+      )
+      else -> null
     }
   }
 
@@ -66,7 +85,7 @@ class DeviceCryptoModule : Module() {
     val pm = appContext.reactContext?.packageManager ?: return false
     val appAttestKeystore = pm.hasSystemFeature(PackageManager.FEATURE_KEYSTORE_APP_ATTEST_KEY)
     val hardwareKeystore = pm.hasSystemFeature(PackageManager.FEATURE_HARDWARE_KEYSTORE)
-    return appAttestKeystore && hardwareKeystore
+    return appAttestKeystore || hardwareKeystore
   }
 
   private fun isStrongBoxAvailable(): Boolean {
@@ -75,10 +94,6 @@ class DeviceCryptoModule : Module() {
     return strongboxKeystore
   }
 
-  private fun getAliases() = KeyStore.getInstance("AndroidKeyStore").apply {
-    load(null)
-  }.aliases().toList()
-
   private fun isKeyStoreRequireAuthentication(entry: KeyStore.PrivateKeyEntry): Boolean {
     val keyFactory = KeyFactory.getInstance(entry.privateKey.algorithm, "AndroidKeyStore")
     val keyInfo = keyFactory.getKeySpec(entry.privateKey, KeyInfo::class.java)
@@ -91,40 +106,26 @@ class DeviceCryptoModule : Module() {
     }.getEntry(alias, null)
   }
 
-  private fun retrievePublicKey(ks: KeyStore.Entry?): String? {
-    if (ks !is KeyStore.PrivateKeyEntry) return null
-    
-    val publicKeyBytes: ByteArray = ks.certificate?.publicKey?.encoded ?: return null
-    return Base64.encodeToString(publicKeyBytes, Base64.NO_WRAP)
-  }
-
-  private fun removeKeyStoreEntry(alias: String): Boolean {
-    val ks = KeyStore.getInstance("AndroidKeyStore").apply {
-      load(null)
-    }
-    if (ks.getEntry(alias, null) == null) return false
-
-    ks.deleteEntry(alias)
-    return true
-  }
-
-  private fun buildECDSA_SECP256R1_SHA256(alias: String, reqAuth: Boolean): KeyPairGenerator {
+  private fun buildECDSA(
+    alias: String, 
+    digest: String,
+    reqAuth: Boolean): KeyPairGenerator {
     val kpg: KeyPairGenerator = KeyPairGenerator.getInstance(
-      KeyProperties.KEY_ALGORITHM_EC,
+      KEY_ALGORITHM_EC,
       "AndroidKeyStore"
     )
 
     val parameterSpec: KeyGenParameterSpec = KeyGenParameterSpec.Builder(
       alias,
-      KeyProperties.PURPOSE_SIGN or KeyProperties.PURPOSE_VERIFY
+      PURPOSE_SIGN or PURPOSE_VERIFY
     ).run {
-      setDigests(KeyProperties.DIGEST_SHA256)
+      setDigests(digest)
       setIsStrongBoxBacked(false) // TODO: Prefer strong box if available
       setUserAuthenticationRequired(reqAuth)
       if (reqAuth) {
         setUserAuthenticationParameters(
           30, // 30 seconds
-          KeyProperties.AUTH_BIOMETRIC_STRONG or KeyProperties.AUTH_DEVICE_CREDENTIAL
+          AUTH_BIOMETRIC_STRONG or AUTH_DEVICE_CREDENTIAL
         )
       }
       build()
@@ -133,23 +134,30 @@ class DeviceCryptoModule : Module() {
     return kpg
   }
 
-  private fun buildRSA_2048_PKCS1(alias: String, reqAuth: Boolean): KeyPairGenerator {
+  private fun buildRSA(
+    alias: String, 
+    digest: String?,
+    padding: String,
+    reqAuth: Boolean): KeyPairGenerator {
     val kpg: KeyPairGenerator = KeyPairGenerator.getInstance(
-      KeyProperties.KEY_ALGORITHM_RSA,
+      KEY_ALGORITHM_RSA,
       "AndroidKeyStore"
     )
 
     val parameterSpec: KeyGenParameterSpec = KeyGenParameterSpec.Builder(
       alias,
-      KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT
+      PURPOSE_ENCRYPT or PURPOSE_DECRYPT
     ).run {
-      setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_RSA_PKCS1)
+      if (digest != null) {
+        setDigests(digest)
+      }
+      setEncryptionPaddings(padding)
       setIsStrongBoxBacked(false) // TODO: Prefer strong box if available
       setUserAuthenticationRequired(reqAuth)
       if (reqAuth) {
         setUserAuthenticationParameters(
           30, // 30 seconds
-          KeyProperties.AUTH_BIOMETRIC_STRONG or KeyProperties.AUTH_DEVICE_CREDENTIAL
+          AUTH_BIOMETRIC_STRONG or AUTH_DEVICE_CREDENTIAL
         )
       }
       build()
@@ -200,8 +208,8 @@ class DeviceCryptoModule : Module() {
         .setSubtitle(subtitle)
         .setAllowedAuthenticators(
           when (authMethod) {
-            AuthMethod.PASSCODE -> BiometricManager.Authenticators.DEVICE_CREDENTIAL
-            AuthMethod.PASSCODE_OR_BIOMETRIC -> BiometricManager.Authenticators.BIOMETRIC_STRONG or BiometricManager.Authenticators.DEVICE_CREDENTIAL
+            AuthMethod.PASSCODE -> DEVICE_CREDENTIAL
+            AuthMethod.PASSCODE_OR_BIOMETRIC -> BIOMETRIC_STRONG or DEVICE_CREDENTIAL
           }
         )
         .build()
@@ -210,176 +218,229 @@ class DeviceCryptoModule : Module() {
     }
   }
 
-  override fun definition() = ModuleDefinition {
-    Name("DeviceCrypto")
+  private fun isAuthCheckAvailable(): AuthCheckResult {
+    val biometricManager = BiometricManager.from(appContext.reactContext as Context)
+    return when (biometricManager.canAuthenticate(BIOMETRIC_STRONG or DEVICE_CREDENTIAL)) {
+      BiometricManager.BIOMETRIC_SUCCESS -> AuthCheckResult.AVAILABLE
+      BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> AuthCheckResult.NO_HARDWARE
+      BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE -> AuthCheckResult.UNAVAILABLE
+      else -> AuthCheckResult.UNAVAILABLE
+    }
+  }
 
-    Function("isAuthCheckAvailable") { ->
-      return@Function isAuthCheckAvailable()
+  private fun generateKeyPair(alias: String, o: Map<String, Any?>): GenerateKeyPairResult {
+    val reqAuth = o["reqAuth"] as Boolean
+    if (reqAuth && isAuthCheckAvailable() != AuthCheckResult.AVAILABLE) {
+      throw Exception("NO_AUTH_AVAILABLE")
+    }
+    if (!isKeyStoreAvailable()) {
+      return GenerateKeyPairResult.NOT_AVAILABLE
+    }
+    if (getKeyStoreEntry(alias) != null) {
+      return GenerateKeyPairResult.KEY_PAIR_ALREADY_EXISTS
     }
 
-    Function("generateKeyPair") { alias: String, o: Map<String, Any?> ->
-      val reqAuth = o["reqAuth"] as Boolean
-      if (reqAuth && isAuthCheckAvailable() != AuthCheckResult.AVAILABLE) {
-        throw Exception("NO_AUTH_AVAILABLE")
-      }
-      if (!isKeyStoreAvailable()) {
-        return@Function GenerateKeyPairResult.NOT_AVAILABLE
-      }
-      if (getKeyStoreEntry(alias) != null) {
-        return@Function GenerateKeyPairResult.KEY_PAIR_ALREADY_EXISTS
-      }
+    val algoType = AlgorithmType.valueOf(o["algoType"] as String)
+    val kpg = when (algoType) {
+      AlgorithmType.ECDSA_SECP256R1_SHA256 -> buildECDSA(alias, DIGEST_SHA256, reqAuth)
+      AlgorithmType.RSA_2048_PKCS1 -> buildRSA(alias, null, ENCRYPTION_PADDING_RSA_PKCS1, reqAuth)
+      AlgorithmType.RSA_2048_OAEP_SHA1 -> buildRSA(alias, DIGEST_SHA1, ENCRYPTION_PADDING_RSA_OAEP, reqAuth)
+      else -> throw Exception("INVALID_ALGORITHM_TYPE")
+    }
 
-      val algoType = AlgorithmType.valueOf(o["algoType"] as String)
-      val kpg = when (algoType) {
-        AlgorithmType.ECDSA_SECP256R1_SHA256 -> buildECDSA_SECP256R1_SHA256(alias, reqAuth)
-        AlgorithmType.RSA_2048_PKCS1 -> buildRSA_2048_PKCS1(alias, reqAuth)
-        else -> throw Exception("INVALID_ALGORITHM_TYPE")
-      }
+    kpg.generateKeyPair()
 
-      kpg.generateKeyPair()
+    return GenerateKeyPairResult.KEY_PAIR_GENERATED
+  }
 
-      return@Function GenerateKeyPairResult.KEY_PAIR_GENERATED
+  private fun removeKeyStoreEntry(alias: String): Boolean {
+    val ks = KeyStore.getInstance("AndroidKeyStore").apply {
+      load(null)
     }
+    if (ks.getEntry(alias, null) == null) return false
 
-    Function("removeKeyPair") { alias: String ->
-      return@Function removeKeyStoreEntry(alias)
-    }
+    ks.deleteEntry(alias)
+    return true
+  }
 
-    Function("aliases") {
-      return@Function getAliases()
-    }
+  private fun getAliases() = KeyStore.getInstance("AndroidKeyStore").apply {
+    load(null)
+  }.aliases().toList()
 
-    Function("getPublicKey") { alias: String ->
-      val entry = getKeyStoreEntry(alias)
-      return@Function retrievePublicKey(entry)
+  private fun getPublicKey(alias: String): String? {
+    val ks = getKeyStoreEntry(alias)
+    if (ks !is KeyStore.PrivateKeyEntry) return null
+    
+    val publicKeyBytes: ByteArray = ks.certificate?.publicKey?.encoded ?: return null
+    return Base64.encodeToString(publicKeyBytes, Base64.NO_WRAP)
+  }
+
+  private fun sign(alias: String, data: String, o: Map<String, Any?>, promise: Promise) {
+    val entry = getKeyStoreEntry(alias)
+    if (entry !is KeyStore.PrivateKeyEntry) {
+      promise.resolve(null)
+      return
     }
 
-    AsyncFunction("sign") { alias: String,
-      data: String,
-      o:  Map<String, Any?>,
-      promise: Promise ->
-      val entry = getKeyStoreEntry(alias)
-      if (entry !is KeyStore.PrivateKeyEntry) {
-        promise.resolve(null)
-        return@AsyncFunction
-      }
+    val reqAuth = isKeyStoreRequireAuthentication(entry)
 
-      val reqAuth = isKeyStoreRequireAuthentication(entry);
-
-      val title = o["title"] as String
-      val subtitle = o["subtitle"] as String
-      val authMethod = AuthMethod.valueOf(o["authMethod"] as String)
-      val algoType = AlgorithmType.valueOf(o["algoType"] as String)
-      val algo = toAndroidAlgo(algoType)
-
-      if (!reqAuth) {
-        val signature: ByteArray = Signature.getInstance(algo).apply {
-          initSign(entry.privateKey)
-          update(data.toByteArray(Charsets.UTF_8))
-        }.sign()
-        promise.resolve(Base64.encodeToString(signature, Base64.NO_WRAP))
-        return@AsyncFunction
-      } else {
-        showAuthPrompt(
-          onSuccess = {
-            val signature: ByteArray = Signature.getInstance(algo).apply {
-              initSign(entry.privateKey)
-              update(data.toByteArray(Charsets.UTF_8))
-            }.sign()
-            promise.resolve(Base64.encodeToString(signature, Base64.NO_WRAP))
-          },
-          onError = { error ->
-            promise.reject("ERR_AUTH_FAILED", error, null)
-          },
-          title = title,
-          subtitle = subtitle,
-          authMethod = authMethod
-        )
-      }
-    }
+    val title = o["title"] as String
+    val subtitle = o["subtitle"] as String
+    val authMethod = AuthMethod.valueOf(o["authMethod"] as String)
+    val algoType = AlgorithmType.valueOf(o["algoType"] as String)
+    val algo = toAndroidAlgo(algoType)
 
-    Function("verify") { alias: String, 
-      data: String, 
-      signature: String, 
-      o: Map<String, Any?> ->
-      val entry = getKeyStoreEntry(alias)
-      if (entry !is KeyStore.PrivateKeyEntry) return@Function null
-
-      val algoType = AlgorithmType.valueOf(o["algoType"] as String)
-      val algo = toAndroidAlgo(algoType)
-      
-      val valid: Boolean = Signature.getInstance(algo).apply {
-        initVerify(entry.certificate)
+    if (!reqAuth) {
+      val signature: ByteArray = Signature.getInstance(algo).apply {
+        initSign(entry.privateKey)
         update(data.toByteArray(Charsets.UTF_8))
-      }.verify(Base64.decode(signature, Base64.NO_WRAP))
-      return@Function true
+      }.sign()
+      promise.resolve(Base64.encodeToString(signature, Base64.NO_WRAP))
+      return
+    } else {
+      showAuthPrompt(
+        onSuccess = {
+          val signature: ByteArray = Signature.getInstance(algo).apply {
+            initSign(entry.privateKey)
+            update(data.toByteArray(Charsets.UTF_8))
+          }.sign()
+          promise.resolve(Base64.encodeToString(signature, Base64.NO_WRAP))
+        },
+        onError = { error ->
+          promise.reject("ERR_AUTH_FAILED", error, null)
+        },
+        title = title,
+        subtitle = subtitle,
+        authMethod = authMethod
+      )
     }
+  }
 
+  private fun verify(alias: String, data: String, signature: String, o: Map<String, Any?>): Boolean? {
+    val entry = getKeyStoreEntry(alias)
+    if (entry !is KeyStore.PrivateKeyEntry) return null
 
-    AsyncFunction("encrypt") { alias: String, 
-      data: String, 
-      o: Map<String, Any?>,
-      promise: Promise ->
-      val entry = getKeyStoreEntry(alias)
-      if (entry !is KeyStore.PrivateKeyEntry) {
-        promise.resolve(null)
-        return@AsyncFunction
-      }
+    val algoType = AlgorithmType.valueOf(o["algoType"] as String)
+    val algo = toAndroidAlgo(algoType)
+
+    val valid: Boolean = Signature.getInstance(algo).apply {
+      initVerify(entry.certificate)
+      update(data.toByteArray(Charsets.UTF_8))
+    }.verify(Base64.decode(signature, Base64.NO_WRAP))
+    return valid
+  }
 
-      val algoType = AlgorithmType.valueOf(o["algoType"] as String)
-      val algo = toAndroidAlgo(algoType)
+  private fun encrypt(alias: String, data: String, o: Map<String, Any?>, promise: Promise) {
+    val entry = getKeyStoreEntry(alias)
+    if (entry !is KeyStore.PrivateKeyEntry) {
+      promise.resolve(null)
+      return
+    }
+
+    val algoType = AlgorithmType.valueOf(o["algoType"] as String)
+    val algo = toAndroidAlgo(algoType)
+    val oaepSpec = getOaepSpec(algoType)
 
-      val cipher = Cipher.getInstance(algo)
+    val cipher = Cipher.getInstance(algo)
+    if (oaepSpec != null) {
+      cipher.init(Cipher.ENCRYPT_MODE, entry.certificate.publicKey, oaepSpec)
+    } else {
       cipher.init(Cipher.ENCRYPT_MODE, entry.certificate.publicKey)
-      val encrypted: ByteArray = cipher.doFinal(data.toByteArray(Charsets.UTF_8))
-      promise.resolve(Base64.encodeToString(encrypted, Base64.NO_WRAP))
     }
+    val encrypted: ByteArray = cipher.doFinal(data.toByteArray(Charsets.UTF_8))
+    promise.resolve(Base64.encodeToString(encrypted, Base64.NO_WRAP))
+  }
 
-    AsyncFunction("decrypt") { alias: String, 
-      data: String, 
-      o: Map<String, Any?>, 
-      promise: Promise ->
-      val entry = getKeyStoreEntry(alias)
-      if (entry !is KeyStore.PrivateKeyEntry) {
-        promise.resolve(null)
-        return@AsyncFunction
-      }
+  private fun decrypt(alias: String, data: String, o: Map<String, Any?>, promise: Promise) {
+    val entry = getKeyStoreEntry(alias)
+    if (entry !is KeyStore.PrivateKeyEntry) {
+      promise.resolve(null)
+      return
+    }
 
-      val reqAuth = isKeyStoreRequireAuthentication(entry)
+    val reqAuth = isKeyStoreRequireAuthentication(entry)
 
-      val title = o["title"] as String
-      val subtitle = o["subtitle"] as String
-      val authMethod = o["authMethod"] as String
-      val algoType = AlgorithmType.valueOf(o["algoType"] as String)
-      val algo = toAndroidAlgo(algoType)
+    val title = o["title"] as String
+    val subtitle = o["subtitle"] as String
+    val authMethod = o["authMethod"] as String
+    val algoType = AlgorithmType.valueOf(o["algoType"] as String)
+    val algo = toAndroidAlgo(algoType)
+    val oaepSpec = getOaepSpec(algoType)
 
-      val cipher = Cipher.getInstance(algo)
-      val ciphertext = Base64.decode(data, Base64.NO_WRAP)
+    val cipher = Cipher.getInstance(algo)
+    val ciphertext = Base64.decode(data, Base64.NO_WRAP)
 
-      if (!reqAuth) {
-        cipher.init(Cipher.DECRYPT_MODE, entry.privateKey)
-        val decrypted: ByteArray = cipher.doFinal(ciphertext)
-        promise.resolve(String(decrypted, Charsets.UTF_8))
-        return@AsyncFunction
+    if (!reqAuth) {
+      if (oaepSpec != null) {
+        cipher.init(Cipher.DECRYPT_MODE, entry.privateKey, oaepSpec)
       } else {
-        showAuthPrompt(
-          onSuccess = {
+        cipher.init(Cipher.DECRYPT_MODE, entry.privateKey)
+      }
+      val decrypted: ByteArray = cipher.doFinal(ciphertext)
+      promise.resolve(String(decrypted, Charsets.UTF_8))
+      return
+    } else {
+      showAuthPrompt(
+        onSuccess = {
+          if (oaepSpec != null) {
+            cipher.init(Cipher.DECRYPT_MODE, entry.privateKey, oaepSpec)
+          } else {
             cipher.init(Cipher.DECRYPT_MODE, entry.privateKey)
-            val decrypted: ByteArray = cipher.doFinal(ciphertext)
-            promise.resolve(String(decrypted, Charsets.UTF_8))
-          },
-          onError = { error ->
-            promise.reject("ERR_AUTH_FAILED", error, null)
-          },
-          title = title,
-          subtitle = subtitle,
-          authMethod = when (authMethod) {
-            "PASSCODE" -> AuthMethod.PASSCODE
-            "PASSCODE_OR_BIOMETRIC" -> AuthMethod.PASSCODE_OR_BIOMETRIC
-            else -> AuthMethod.PASSCODE_OR_BIOMETRIC
           }
-        )
-      }
+          val decrypted: ByteArray = cipher.doFinal(ciphertext)
+          promise.resolve(String(decrypted, Charsets.UTF_8))
+        },
+        onError = { error ->
+          promise.reject("ERR_AUTH_FAILED", error, null)
+        },
+        title = title,
+        subtitle = subtitle,
+        authMethod = when (authMethod) {
+          "PASSCODE" -> AuthMethod.PASSCODE
+          "PASSCODE_OR_BIOMETRIC" -> AuthMethod.PASSCODE_OR_BIOMETRIC
+          else -> AuthMethod.PASSCODE_OR_BIOMETRIC
+        }
+      )
+    }
+  }
+
+  override fun definition() = ModuleDefinition {
+    Name("DeviceCrypto")
+
+    Function("isAuthCheckAvailable") { ->
+      return@Function isAuthCheckAvailable()
+    }
+
+    Function("generateKeyPair") { alias: String, o: Map<String, Any?> ->
+      return@Function generateKeyPair(alias, o)
+    }
+
+    Function("removeKeyPair") { alias: String ->
+      return@Function removeKeyStoreEntry(alias)
+    }
+
+    Function("aliases") {
+      return@Function getAliases()
+    }
+
+    Function("getPublicKey") { alias: String ->
+      return@Function getPublicKey(alias)
+    }
+
+    AsyncFunction("sign") { alias: String, data: String, o: Map<String, Any?>, promise: Promise ->
+      return@AsyncFunction sign(alias, data, o, promise)
+    }
+
+    Function("verify") { alias: String, data: String, signature: String, o: Map<String, Any?> ->
+      return@Function verify(alias, data, signature, o)
+    }
+
+    AsyncFunction("encrypt") { alias: String, data: String, o: Map<String, Any?>, promise: Promise ->
+      return@AsyncFunction encrypt(alias, data, o, promise)
+    }
+
+    AsyncFunction("decrypt") { alias: String, data: String, o: Map<String, Any?>, promise: Promise ->
+      return@AsyncFunction decrypt(alias, data, o, promise)
     }
   }
 }

package/build/DeviceCrypto.types.d.ts

@@ -16,7 +16,8 @@ export declare enum SigningAlgorithm {
     ECDSA_SECP256R1_SHA256 = "ECDSA_SECP256R1_SHA256"
 }
 export declare enum EncryptionAlgorithm {
-    RSA_2048_PKCS1 = "RSA_2048_PKCS1"
+    RSA_2048_PKCS1 = "RSA_2048_PKCS1",
+    RSA_2048_OAEP_SHA1 = "RSA_2048_OAEP_SHA1"
 }
 export interface GenerateKeyPairOptions {
     /**

package/build/DeviceCrypto.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceCrypto.types.d.ts","sourceRoot":"","sources":["../src/DeviceCrypto.types.ts"],"names":[],"mappings":"AAAA,oBAAY,qBAAqB;IAC/B,kBAAkB,uBAAuB;IACzC,uBAAuB,4BAA4B;IACnD,aAAa,kBAAkB;CAChC;AAED,oBAAY,eAAe;IACzB,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B,WAAW,gBAAgB;CAC5B;AAED,oBAAY,UAAU;IACpB,QAAQ,aAAa;IACrB,qBAAqB,0BAA0B;CAChD;AAED,oBAAY,gBAAgB;IAC1B,sBAAsB,2BAA2B;CAClD;AAED,oBAAY,mBAAmB;IAC7B,cAAc,mBAAmB;CAClC;AAED,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,aAAa,EAAE,gBAAgB,GAAG,mBAAmB,CAAC;IACtD;;;;;;;OAOG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;;;;;;;;;;OAcG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,UAAU,sBAAsB;IAC9B;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,UAAU,kBAAkB;IAC1B;;OAEG;IACH,aAAa,CAAC,EAAE,gBAAgB,CAAC;CAClC;AAED,UAAU,qBAAqB;IAC7B;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAC;CACrC;AAED,MAAM,WAAW,WAAY,SAAQ,sBAAsB,EAAE,kBAAkB;CAAG;AAClF,MAAM,WAAW,aAAc,SAAQ,kBAAkB;CAAG;AAE5D,MAAM,WAAW,cAAe,SAAQ,sBAAsB,EAAE,qBAAqB;CAAG;AACxF,MAAM,WAAW,cAAe,SAAQ,qBAAqB;CAAG;AAEhE,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB"}
+{"version":3,"file":"DeviceCrypto.types.d.ts","sourceRoot":"","sources":["../src/DeviceCrypto.types.ts"],"names":[],"mappings":"AAAA,oBAAY,qBAAqB;IAC/B,kBAAkB,uBAAuB;IACzC,uBAAuB,4BAA4B;IACnD,aAAa,kBAAkB;CAChC;AAED,oBAAY,eAAe;IACzB,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B,WAAW,gBAAgB;CAC5B;AAED,oBAAY,UAAU;IACpB,QAAQ,aAAa;IACrB,qBAAqB,0BAA0B;CAChD;AAED,oBAAY,gBAAgB;IAC1B,sBAAsB,2BAA2B;CAClD;AAED,oBAAY,mBAAmB;IAC7B,cAAc,mBAAmB;IACjC,kBAAkB,uBAAuB;CAC1C;AAED,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,aAAa,EAAE,gBAAgB,GAAG,mBAAmB,CAAC;IACtD;;;;;;;OAOG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;;;;;;;;;;OAcG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,UAAU,sBAAsB;IAC9B;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,UAAU,kBAAkB;IAC1B;;OAEG;IACH,aAAa,CAAC,EAAE,gBAAgB,CAAC;CAClC;AAED,UAAU,qBAAqB;IAC7B;;OAEG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAC;CACrC;AAED,MAAM,WAAW,WAAY,SAAQ,sBAAsB,EAAE,kBAAkB;CAAG;AAClF,MAAM,WAAW,aAAc,SAAQ,kBAAkB;CAAG;AAE5D,MAAM,WAAW,cAAe,SAAQ,sBAAsB,EAAE,qBAAqB;CAAG;AACxF,MAAM,WAAW,cAAe,SAAQ,qBAAqB;CAAG;AAEhE,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB"}

package/build/DeviceCrypto.types.js

@@ -22,5 +22,6 @@ export var SigningAlgorithm;
 export var EncryptionAlgorithm;
 (function (EncryptionAlgorithm) {
     EncryptionAlgorithm["RSA_2048_PKCS1"] = "RSA_2048_PKCS1";
+    EncryptionAlgorithm["RSA_2048_OAEP_SHA1"] = "RSA_2048_OAEP_SHA1";
 })(EncryptionAlgorithm || (EncryptionAlgorithm = {}));
 //# sourceMappingURL=DeviceCrypto.types.js.map

package/build/DeviceCrypto.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceCrypto.types.js","sourceRoot":"","sources":["../src/DeviceCrypto.types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,qBAIX;AAJD,WAAY,qBAAqB;IAC/B,kEAAyC,CAAA;IACzC,4EAAmD,CAAA;IACnD,wDAA+B,CAAA;AACjC,CAAC,EAJW,qBAAqB,KAArB,qBAAqB,QAIhC;AAED,MAAM,CAAN,IAAY,eAIX;AAJD,WAAY,eAAe;IACzB,0CAAuB,CAAA;IACvB,8CAA2B,CAAA;IAC3B,8CAA2B,CAAA;AAC7B,CAAC,EAJW,eAAe,KAAf,eAAe,QAI1B;AAED,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,mCAAqB,CAAA;IACrB,6DAA+C,CAAA;AACjD,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB;AAED,MAAM,CAAN,IAAY,gBAEX;AAFD,WAAY,gBAAgB;IAC1B,qEAAiD,CAAA;AACnD,CAAC,EAFW,gBAAgB,KAAhB,gBAAgB,QAE3B;AAED,MAAM,CAAN,IAAY,mBAEX;AAFD,WAAY,mBAAmB;IAC7B,wDAAiC,CAAA;AACnC,CAAC,EAFW,mBAAmB,KAAnB,mBAAmB,QAE9B","sourcesContent":["export enum GenerateKeyPairResult {\n  KEY_PAIR_GENERATED = \"KEY_PAIR_GENERATED\",\n  KEY_PAIR_ALREADY_EXISTS = \"KEY_PAIR_ALREADY_EXISTS\",\n  NOT_AVAILABLE = \"NOT_AVAILABLE\",\n}\n\nexport enum AuthCheckResult {\n  AVAILABLE = \"AVAILABLE\",\n  NO_HARDWARE = \"NO_HARDWARE\",\n  UNAVAILABLE = \"UNAVAILABLE\",\n}\n\nexport enum AuthMethod {\n  PASSCODE = \"PASSCODE\",\n  PASSCODE_OR_BIOMETRIC = \"PASSCODE_OR_BIOMETRIC\",\n}\n\nexport enum SigningAlgorithm {\n  ECDSA_SECP256R1_SHA256 = \"ECDSA_SECP256R1_SHA256\",\n}\n\nexport enum EncryptionAlgorithm {\n  RSA_2048_PKCS1 = \"RSA_2048_PKCS1\",\n}\n\nexport interface GenerateKeyPairOptions {\n  /**\n   * The algorithm type of the key to generate.\n   */\n  algorithmType: SigningAlgorithm | EncryptionAlgorithm;\n  /**\n   * Whether to require authentication to sign.\n   * Setting this to true will prompt biometric or passcode authentication before signing.\n   *\n   * Please check the *`isAuthCheckAvailable`* function to see if authentication is available.\n   * If authentication is not available, generating a key pair will throw an error.\n   * @default false\n   */\n  requireAuthentication?: boolean;\n  /**\n   * The method of authentication to use.\n   * Note that on Android you have to define it when signing.\n   *\n   * If you want to allow to use Face ID, you need to add the following to your app.json config file:\n   * ```json\n   * \"ios\": {\n   *   \"infoPlist\": {\n   *     \"NSFaceIDUsageDescription\": \"We use Face ID to secure your data.\",\n   *   }\n   * }\n   * ```\n   * @default AuthMethod.PASSCODE_OR_BIOMETRIC\n   * @platform ios\n   */\n  authMethod?: AuthMethod;\n}\n\ninterface BaseSignDecryptOptions {\n  /**\n   * The title of the prompt to show when authentication is required.\n   * @default \"Unlock\"\n   * @platform android\n   */\n  promptTitle?: string;\n  /**\n   * The subtitle of the prompt to show when authentication is required.\n   * @default \"Enter your PIN to continue\"\n   * @platform android\n   */\n  promptSubtitle?: string;\n  /**\n   * The method of authentication to use.\n   * Note that on iOS you have to define it when generating the key pair.\n   * @default AuthMethod.PASSCODE_OR_BIOMETRIC\n   * @platform android\n   */\n  authMethod?: AuthMethod;\n}\n\ninterface BaseSigningOptions {\n  /**\n   * The algorithm type of the key to use for signing.\n   */\n  algorithmType?: SigningAlgorithm;\n}\n\ninterface BaseEncryptionOptions {\n  /**\n   * The algorithm type of the key to use for encrypting.\n   */\n  algorithmType?: EncryptionAlgorithm;\n}\n\nexport interface SignOptions extends BaseSignDecryptOptions, BaseSigningOptions {}\nexport interface VerifyOptions extends BaseSigningOptions {}\n\nexport interface DecryptOptions extends BaseSignDecryptOptions, BaseEncryptionOptions {}\nexport interface EncryptOptions extends BaseEncryptionOptions {}\n\nexport interface GetPublicKeyOptions {\n  /**\n   * The format of the public key to return.\n   * @default \"PEM\" (Base64 of PEM-encoded SubjectPublicKeyInfo (SPKI) for P‑256)\n   */\n  format?: \"PEM\";\n}\n"]}
+{"version":3,"file":"DeviceCrypto.types.js","sourceRoot":"","sources":["../src/DeviceCrypto.types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,qBAIX;AAJD,WAAY,qBAAqB;IAC/B,kEAAyC,CAAA;IACzC,4EAAmD,CAAA;IACnD,wDAA+B,CAAA;AACjC,CAAC,EAJW,qBAAqB,KAArB,qBAAqB,QAIhC;AAED,MAAM,CAAN,IAAY,eAIX;AAJD,WAAY,eAAe;IACzB,0CAAuB,CAAA;IACvB,8CAA2B,CAAA;IAC3B,8CAA2B,CAAA;AAC7B,CAAC,EAJW,eAAe,KAAf,eAAe,QAI1B;AAED,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,mCAAqB,CAAA;IACrB,6DAA+C,CAAA;AACjD,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB;AAED,MAAM,CAAN,IAAY,gBAEX;AAFD,WAAY,gBAAgB;IAC1B,qEAAiD,CAAA;AACnD,CAAC,EAFW,gBAAgB,KAAhB,gBAAgB,QAE3B;AAED,MAAM,CAAN,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,wDAAiC,CAAA;IACjC,gEAAyC,CAAA;AAC3C,CAAC,EAHW,mBAAmB,KAAnB,mBAAmB,QAG9B","sourcesContent":["export enum GenerateKeyPairResult {\n  KEY_PAIR_GENERATED = \"KEY_PAIR_GENERATED\",\n  KEY_PAIR_ALREADY_EXISTS = \"KEY_PAIR_ALREADY_EXISTS\",\n  NOT_AVAILABLE = \"NOT_AVAILABLE\",\n}\n\nexport enum AuthCheckResult {\n  AVAILABLE = \"AVAILABLE\",\n  NO_HARDWARE = \"NO_HARDWARE\",\n  UNAVAILABLE = \"UNAVAILABLE\",\n}\n\nexport enum AuthMethod {\n  PASSCODE = \"PASSCODE\",\n  PASSCODE_OR_BIOMETRIC = \"PASSCODE_OR_BIOMETRIC\",\n}\n\nexport enum SigningAlgorithm {\n  ECDSA_SECP256R1_SHA256 = \"ECDSA_SECP256R1_SHA256\",\n}\n\nexport enum EncryptionAlgorithm {\n  RSA_2048_PKCS1 = \"RSA_2048_PKCS1\",\n  RSA_2048_OAEP_SHA1 = \"RSA_2048_OAEP_SHA1\",\n}\n\nexport interface GenerateKeyPairOptions {\n  /**\n   * The algorithm type of the key to generate.\n   */\n  algorithmType: SigningAlgorithm | EncryptionAlgorithm;\n  /**\n   * Whether to require authentication to sign.\n   * Setting this to true will prompt biometric or passcode authentication before signing.\n   *\n   * Please check the *`isAuthCheckAvailable`* function to see if authentication is available.\n   * If authentication is not available, generating a key pair will throw an error.\n   * @default false\n   */\n  requireAuthentication?: boolean;\n  /**\n   * The method of authentication to use.\n   * Note that on Android you have to define it when signing.\n   *\n   * If you want to allow to use Face ID, you need to add the following to your app.json config file:\n   * ```json\n   * \"ios\": {\n   *   \"infoPlist\": {\n   *     \"NSFaceIDUsageDescription\": \"We use Face ID to secure your data.\",\n   *   }\n   * }\n   * ```\n   * @default AuthMethod.PASSCODE_OR_BIOMETRIC\n   * @platform ios\n   */\n  authMethod?: AuthMethod;\n}\n\ninterface BaseSignDecryptOptions {\n  /**\n   * The title of the prompt to show when authentication is required.\n   * @default \"Unlock\"\n   * @platform android\n   */\n  promptTitle?: string;\n  /**\n   * The subtitle of the prompt to show when authentication is required.\n   * @default \"Enter your PIN to continue\"\n   * @platform android\n   */\n  promptSubtitle?: string;\n  /**\n   * The method of authentication to use.\n   * Note that on iOS you have to define it when generating the key pair.\n   * @default AuthMethod.PASSCODE_OR_BIOMETRIC\n   * @platform android\n   */\n  authMethod?: AuthMethod;\n}\n\ninterface BaseSigningOptions {\n  /**\n   * The algorithm type of the key to use for signing.\n   */\n  algorithmType?: SigningAlgorithm;\n}\n\ninterface BaseEncryptionOptions {\n  /**\n   * The algorithm type of the key to use for encrypting.\n   */\n  algorithmType?: EncryptionAlgorithm;\n}\n\nexport interface SignOptions extends BaseSignDecryptOptions, BaseSigningOptions {}\nexport interface VerifyOptions extends BaseSigningOptions {}\n\nexport interface DecryptOptions extends BaseSignDecryptOptions, BaseEncryptionOptions {}\nexport interface EncryptOptions extends BaseEncryptionOptions {}\n\nexport interface GetPublicKeyOptions {\n  /**\n   * The format of the public key to return.\n   * @default \"PEM\" (Base64 of PEM-encoded SubjectPublicKeyInfo (SPKI) for P‑256)\n   */\n  format?: \"PEM\";\n}\n"]}

package/ios/DeviceCrypto.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name           = 'DeviceCrypto'
-  s.version        = '0.1.1'
+  s.version        = '0.2.1'
   s.summary        = 'Device crypto'
   s.description    = 'Device crypto for Expo using device hardware capabilities'
   s.author         = 'Piotr Pietras'

package/ios/DeviceCrypto.swift

@@ -34,7 +34,7 @@ public class DeviceCryptoModule: Module {
     case .RSA_2048_PKCS1:
       return .rsaEncryptionPKCS1
     case .RSA_2048_OAEP_SHA1:
-      return .rsaEncryptionOAEP
+      return .rsaEncryptionOAEPSHA1
     }
   }
 
@@ -103,38 +103,6 @@ public class DeviceCryptoModule: Module {
     return Data([0x80 | UInt8(bytes.count)]) + Data(bytes)
   }
 
-  private func isAuthCheckAvailable() -> String {
-    let context = LAContext()
-    let available = context.canEvaluatePolicy(.deviceOwnerAuthentication, error: nil)
-    if available {
-      return AuthCheckResult.AVAILABLE.rawValue
-    } else {
-      return AuthCheckResult.UNAVAILABLE.rawValue
-    }
-  }
-
-  private func getAliases() -> [String] {
-    let query: [String: Any] = [
-      kSecClass as String: kSecClassKey,
-      kSecAttrKeyClass as String: kSecAttrKeyClassPublic,
-      kSecMatchLimit as String: kSecMatchLimitAll,
-      kSecReturnAttributes as String: true,
-    ]
-
-    var result: CFTypeRef?
-    let status = SecItemCopyMatching(query as CFDictionary, &result)
-    guard status == errSecSuccess else { return [] }
-
-    let items = (result as? [[String: Any]]) ?? []
-    return items.compactMap { attrs in
-      let tagKey = kSecAttrApplicationTag as String
-      if let tagString = attrs[tagKey] as? String {
-        return tagString
-      }
-      return nil
-    }
-  }
-
   private func getSecKeyQuery(_ alias: String, keyClass: CFString, returnRef: Bool = true) -> [String: Any] {
     var query: [String: Any] = [
       kSecClass as String: kSecClassKey,
@@ -155,40 +123,6 @@ public class DeviceCryptoModule: Module {
     return (item as! SecKey)
   }
 
-  private func retrievePublicKey(_ secKey: SecKey) -> String? {
-    let publicKey = SecKeyCopyPublicKey(secKey)!
-
-    guard
-      let attrs = SecKeyCopyAttributes(publicKey) as? [String: Any],
-      let keyType = attrs[kSecAttrKeyType as String] as? String
-    else {
-      return nil
-    }
-
-    if keyType == (kSecAttrKeyTypeECSECPrimeRandom as String) {
-      return x962ECPointToP256SPKI(publicKey)?.base64EncodedString()
-    }
-
-    if keyType == (kSecAttrKeyTypeRSA as String) {
-      return rsaPKCS1ToSPKI(publicKey)?.base64EncodedString()
-    }
-
-    guard let publicKeyData = SecKeyCopyExternalRepresentation(publicKey, nil) as Data? else {
-      return nil
-    }
-    return publicKeyData.base64EncodedString()
-  }
-
-  private func removeKeyStoreEntry(_ alias: String) -> Bool {
-    let privateQuery = self.getSecKeyQuery(alias, keyClass: kSecAttrKeyClassPrivate, returnRef: false)
-    let privateStatus = SecItemDelete(privateQuery as CFDictionary)
-
-    let publicQuery = self.getSecKeyQuery(alias, keyClass: kSecAttrKeyClassPublic, returnRef: false)
-    let publicStatus = SecItemDelete(publicQuery as CFDictionary)
-
-    return privateStatus == errSecSuccess || publicStatus == errSecSuccess
-  }
-
   private func buildECDSA(alias: String, reqAuth: Bool, authMethod: AuthMethod) -> SecKey? {
     let accessFlags: SecAccessControlCreateFlags
     if reqAuth {
@@ -264,46 +198,205 @@ public class DeviceCryptoModule: Module {
     return SecKeyCreateRandomKey(attributes, nil)
   }
 
-  public func definition() -> ModuleDefinition {
+  private func isAuthCheckAvailable() -> String {
+    let context = LAContext()
+    let available = context.canEvaluatePolicy(.deviceOwnerAuthentication, error: nil)
+    if available {
+      return AuthCheckResult.AVAILABLE.rawValue
+    } else {
+      return AuthCheckResult.UNAVAILABLE.rawValue
+    }
+  }
 
-    Name("DeviceCrypto")
+  private func generateKeyPair(alias: String, o: [String: Any]) throws -> String {
+    let reqAuth = o["reqAuth"] as! Bool
+    let authMethod = AuthMethod(rawValue: o["authMethod"] as! String)
+    let algoType = AlgorithmType(rawValue: o["algoType"] as! String)
 
-    Function("isAuthCheckAvailable") { () -> String in
-      return self.isAuthCheckAvailable()
+    if reqAuth && self.isAuthCheckAvailable() != AuthCheckResult.AVAILABLE.rawValue {
+      throw NSError(
+        domain: "DeviceCrypto",
+        code: 1,
+        userInfo: [NSLocalizedDescriptionKey: "NO_AUTH_AVAILABLE"]
+      )
     }
 
-    Function("generateKeyPair") { (alias: String, o: [String: Any]) -> String in
-      let reqAuth = o["reqAuth"] as! Bool
-      let authMethod = AuthMethod(rawValue: o["authMethod"] as! String)
-      let algoType = AlgorithmType(rawValue: o["algoType"] as! String)
+    let secKey = self.getSecKeyByAlias(alias, keyClass: kSecAttrKeyClassPrivate)
+    if secKey != nil {
+      return SecureSigningModuleResult.KEY_PAIR_ALREADY_EXISTS.rawValue
+    }
 
-      if reqAuth && self.isAuthCheckAvailable() != AuthCheckResult.AVAILABLE.rawValue {
+    switch algoType {
+      case .ECDSA_SECP256R1_SHA256:
+        self.buildECDSA(alias: alias, reqAuth: reqAuth, authMethod: authMethod!)
+      case .RSA_2048_PKCS1:
+        self.buildRSA(alias: alias, reqAuth: reqAuth, authMethod: authMethod!)
+      case .RSA_2048_OAEP_SHA1:
+        self.buildRSA(alias: alias, reqAuth: reqAuth, authMethod: authMethod!)
+      default:
         throw NSError(
           domain: "DeviceCrypto",
           code: 1,
-          userInfo: [NSLocalizedDescriptionKey: "NO_AUTH_AVAILABLE"]
+          userInfo: [NSLocalizedDescriptionKey: "INVALID_ALGORITHM_TYPE"]
         )
-      }
+    }
 
-      let secKey = self.getSecKeyByAlias(alias, keyClass: kSecAttrKeyClassPrivate)
-      if secKey != nil {
-        return SecureSigningModuleResult.KEY_PAIR_ALREADY_EXISTS.rawValue
-      }
+    return SecureSigningModuleResult.KEY_PAIR_GENERATED.rawValue
+  }
+
+  private func removeKeyStoreEntry(_ alias: String) -> Bool {
+    let privateQuery = self.getSecKeyQuery(alias, keyClass: kSecAttrKeyClassPrivate, returnRef: false)
+    let privateStatus = SecItemDelete(privateQuery as CFDictionary)
+
+    let publicQuery = self.getSecKeyQuery(alias, keyClass: kSecAttrKeyClassPublic, returnRef: false)
+    let publicStatus = SecItemDelete(publicQuery as CFDictionary)
+
+    return privateStatus == errSecSuccess || publicStatus == errSecSuccess
+  }
 
-      switch algoType {
-        case .ECDSA_SECP256R1_SHA256:
-          self.buildECDSA(alias: alias, reqAuth: reqAuth, authMethod: authMethod!)
-        case .RSA_2048_PKCS1:
-          self.buildRSA(alias: alias, reqAuth: reqAuth, authMethod: authMethod!)
-        default:
-          throw NSError(
-            domain: "DeviceCrypto",
-            code: 1,
-            userInfo: [NSLocalizedDescriptionKey: "INVALID_ALGORITHM_TYPE"]
-          )
+  private func getAliases() -> [String] {
+    let query: [String: Any] = [
+      kSecClass as String: kSecClassKey,
+      kSecAttrKeyClass as String: kSecAttrKeyClassPublic,
+      kSecMatchLimit as String: kSecMatchLimitAll,
+      kSecReturnAttributes as String: true,
+    ]
+
+    var result: CFTypeRef?
+    let status = SecItemCopyMatching(query as CFDictionary, &result)
+    guard status == errSecSuccess else { return [] }
+
+    let items = (result as? [[String: Any]]) ?? []
+    return items.compactMap { attrs in
+      let tagKey = kSecAttrApplicationTag as String
+      if let tagString = attrs[tagKey] as? String {
+        return tagString
       }
+      return nil
+    }
+  }
+
+  private func getPublicKey(alias: String) -> String? {
+    let secKey = self.getSecKeyByAlias(alias, keyClass: kSecAttrKeyClassPublic)
+    guard let secKey else { return nil }
+
+    let publicKey = SecKeyCopyPublicKey(secKey)!
+
+    guard
+      let attrs = SecKeyCopyAttributes(publicKey) as? [String: Any],
+      let keyType = attrs[kSecAttrKeyType as String] as? String
+    else {
+      return nil
+    }
+
+    if keyType == (kSecAttrKeyTypeECSECPrimeRandom as String) {
+      return x962ECPointToP256SPKI(publicKey)?.base64EncodedString()
+    }
+
+    if keyType == (kSecAttrKeyTypeRSA as String) {
+      return rsaPKCS1ToSPKI(publicKey)?.base64EncodedString()
+    }
+
+    guard let publicKeyData = SecKeyCopyExternalRepresentation(publicKey, nil) as Data? else {
+      return nil
+    }
+    return publicKeyData.base64EncodedString()
+  }
+
+  private func sign(alias: String, data: String, o: [String: Any]) throws -> String? {
+    let secKey = self.getSecKeyByAlias(alias, keyClass: kSecAttrKeyClassPrivate)
+    guard let secKey else { return nil }
 
-      return SecureSigningModuleResult.KEY_PAIR_GENERATED.rawValue
+    let algoType = AlgorithmType(rawValue: o["algoType"] as! String)
+    let algo = self.toiOSAlgo(algorithm: algoType!)
+
+    var signingError: Unmanaged<CFError>?
+    let signatureCF = SecKeyCreateSignature(
+      secKey,
+      algo,
+      Data(data.utf8) as CFData,
+      &signingError
+    )
+
+    if let error = signingError?.takeRetainedValue() {
+      throw error as Error
+    }
+
+    guard let signatureCF else { return nil }
+    let signature = signatureCF as Data
+    return signature.base64EncodedString()
+  }
+
+  private func verify(alias: String, data: String, signature: String, o: [String: Any]) -> Bool? {
+    let secKey = self.getSecKeyByAlias(alias, keyClass: kSecAttrKeyClassPrivate)
+    guard let secKey else { return nil }
+
+    guard let publicKey = SecKeyCopyPublicKey(secKey) else { return nil }
+    guard let signatureData = Data(base64Encoded: signature) else { return nil }
+
+    let algoType = AlgorithmType(rawValue: o["algoType"] as! String)
+    let algo = self.toiOSAlgo(algorithm: algoType!)
+
+    let valid = SecKeyVerifySignature(
+      publicKey,
+      algo,
+      Data(data.utf8) as CFData,
+      signatureData as CFData,
+      nil
+    )
+    return valid
+  }
+
+  private func encrypt(alias: String, data: String, o: [String: Any]) -> String? {
+    let secKey = self.getSecKeyByAlias(alias, keyClass: kSecAttrKeyClassPublic)
+    guard let secKey else { return nil }
+    let publicKey = SecKeyCopyPublicKey(secKey)!
+
+    let algoType = AlgorithmType(rawValue: o["algoType"] as! String)
+    let algo = self.toiOSAlgo(algorithm: algoType!)
+
+    guard let encrypted = SecKeyCreateEncryptedData(
+      publicKey,
+      algo,
+      Data(data.utf8) as CFData,
+      nil
+    ) as Data? else {
+      return nil
+    }
+
+    return encrypted.base64EncodedString()
+  }
+
+  private func decrypt(alias: String, data: String, o: [String: Any]) -> String? {
+    let secKey = self.getSecKeyByAlias(alias, keyClass: kSecAttrKeyClassPrivate)
+    guard let secKey else { return nil }
+    guard let encryptedData = Data(base64Encoded: data) else { return nil }
+
+    let algoType = AlgorithmType(rawValue: o["algoType"] as! String)
+    let algo = self.toiOSAlgo(algorithm: algoType!)
+
+    guard let decrypted = SecKeyCreateDecryptedData(
+      secKey,
+      algo,
+      encryptedData as CFData,
+      nil
+    ) as Data? else {
+      return nil
+    }
+
+    return String(data: decrypted, encoding: .utf8)
+  }
+
+  public func definition() -> ModuleDefinition {
+
+    Name("DeviceCrypto")
+
+    Function("isAuthCheckAvailable") { () -> String in
+      return self.isAuthCheckAvailable()
+    }
+
+    Function("generateKeyPair") { (alias: String, o: [String: Any]) -> String in
+      return try self.generateKeyPair(alias: alias, o: o)
     }
 
     Function("removeKeyPair") { (alias: String) -> Bool in
@@ -315,93 +408,23 @@ public class DeviceCryptoModule: Module {
     }
 
     Function("getPublicKey") { (alias: String) -> String? in
-      let secKey = self.getSecKeyByAlias(alias, keyClass: kSecAttrKeyClassPublic)
-      guard let secKey else { return nil }
-      return self.retrievePublicKey(secKey)
+      return self.getPublicKey(alias:alias)
     }
 
     AsyncFunction("sign") { (alias: String, data: String, o: [String: Any]) -> String? in
-      let secKey = self.getSecKeyByAlias(alias, keyClass: kSecAttrKeyClassPrivate)
-      guard let secKey else { return nil }
-
-      let algoType = AlgorithmType(rawValue: o["algoType"] as! String)
-      let algo = self.toiOSAlgo(algorithm: algoType!)
-
-      var signingError: Unmanaged<CFError>?
-      let signatureCF = SecKeyCreateSignature(
-        secKey,
-        algo,
-        Data(data.utf8) as CFData,
-        &signingError
-      )
-
-      if let error = signingError?.takeRetainedValue() {
-        throw error as Error
-      }
-
-      guard let signatureCF else { return nil }
-      let signature = signatureCF as Data
-      return signature.base64EncodedString()
+      return try self.sign(alias: alias, data: data, o: o)
     }
 
     Function("verify") { (alias: String, data: String, signature: String, o: [String: Any]) -> Bool? in
-      let secKey = self.getSecKeyByAlias(alias, keyClass: kSecAttrKeyClassPrivate)
-      guard let secKey else { return nil }
-
-      guard let publicKey = SecKeyCopyPublicKey(secKey) else { return nil }
-      guard let signatureData = Data(base64Encoded: signature) else { return nil }
-
-      let algoType = AlgorithmType(rawValue: o["algoType"] as! String)
-      let algo = self.toiOSAlgo(algorithm: algoType!)
-
-      let valid = SecKeyVerifySignature(
-        publicKey,
-        algo,
-        Data(data.utf8) as CFData,
-        signatureData as CFData,
-        nil
-      )
-      return valid
+      return self.verify(alias: alias, data: data, signature: signature, o: o)
     }
 
     AsyncFunction("encrypt") { (alias: String, data: String, o: [String: Any]) -> String? in
-      let secKey = self.getSecKeyByAlias(alias, keyClass: kSecAttrKeyClassPublic)
-      guard let secKey else { return nil }
-      let publicKey = SecKeyCopyPublicKey(secKey)!
-
-      let algoType = AlgorithmType(rawValue: o["algoType"] as! String)
-      let algo = self.toiOSAlgo(algorithm: algoType!)
-
-      guard let encrypted = SecKeyCreateEncryptedData(
-        publicKey,
-        algo,
-        Data(data.utf8) as CFData,
-        nil
-      ) as Data? else {
-        return nil
-      }
-
-      return encrypted.base64EncodedString()
+      return self.encrypt(alias: alias, data: data, o: o)
     }
 
     AsyncFunction("decrypt") { (alias: String, data: String, o: [String: Any]) -> String? in
-      let secKey = self.getSecKeyByAlias(alias, keyClass: kSecAttrKeyClassPrivate)
-      guard let secKey else { return nil }
-      guard let encryptedData = Data(base64Encoded: data) else { return nil }
-
-      let algoType = AlgorithmType(rawValue: o["algoType"] as! String)
-      let algo = self.toiOSAlgo(algorithm: algoType!)
-
-      guard let decrypted = SecKeyCreateDecryptedData(
-        secKey,
-        algo,
-        encryptedData as CFData,
-        nil
-      ) as Data? else {
-        return nil
-      }
-
-      return String(data: decrypted, encoding: .utf8)
+      return self.decrypt(alias: alias, data: data, o: o)
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-device-crypto",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "Crypto for Expo using device hardware capabilities",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/DeviceCrypto.types.ts

@@ -21,6 +21,7 @@ export enum SigningAlgorithm {
 
 export enum EncryptionAlgorithm {
   RSA_2048_PKCS1 = "RSA_2048_PKCS1",
+  RSA_2048_OAEP_SHA1 = "RSA_2048_OAEP_SHA1",
 }
 
 export interface GenerateKeyPairOptions {