@dynamic-labs/legacy-react-native-extension 5.9.6 → 5.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/KeyStoreKeyManager.kt +28 -12
- package/android/dynamic/keychain/KeyStoreKeyManager.kt +28 -12
- package/android/java/xyz/dynamic/keychain/KeyStoreKeyManager.kt +28 -12
- package/android/keychain/KeyStoreKeyManager.kt +28 -12
- package/android/main/java/xyz/dynamic/keychain/KeyStoreKeyManager.kt +28 -12
- package/android/src/main/java/xyz/dynamic/keychain/KeyStoreKeyManager.kt +28 -12
- package/android/xyz/dynamic/keychain/KeyStoreKeyManager.kt +28 -12
- package/index.cjs +1 -1
- package/index.js +1 -1
- package/package.json +6 -6
|
@@ -5,9 +5,11 @@ import android.content.pm.PackageManager
|
|
|
5
5
|
import android.os.Build
|
|
6
6
|
import android.security.keystore.KeyGenParameterSpec
|
|
7
7
|
import android.security.keystore.KeyProperties
|
|
8
|
-
import android.
|
|
8
|
+
import android.util.Log
|
|
9
|
+
import java.security.KeyPair
|
|
9
10
|
import java.security.KeyPairGenerator
|
|
10
11
|
import java.security.KeyStore
|
|
12
|
+
import java.security.ProviderException
|
|
11
13
|
import java.security.Signature
|
|
12
14
|
import java.security.spec.ECGenParameterSpec
|
|
13
15
|
|
|
@@ -61,19 +63,26 @@ class KeyStoreKeyManager {
|
|
|
61
63
|
}
|
|
62
64
|
|
|
63
65
|
val keyPair = try {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && e is StrongBoxUnavailableException) {
|
|
69
|
-
// Retry without StrongBox
|
|
70
|
-
specBuilder.setIsStrongBoxBacked(false)
|
|
71
|
-
val kpg = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE)
|
|
72
|
-
kpg.initialize(specBuilder.build())
|
|
73
|
-
kpg.generateKeyPair()
|
|
74
|
-
} else {
|
|
66
|
+
generateKeyPairWithSpec(specBuilder.build())
|
|
67
|
+
} catch (e: ProviderException) {
|
|
68
|
+
// Without StrongBox requested there is nothing to fall back from.
|
|
69
|
+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
|
|
75
70
|
throw e
|
|
76
71
|
}
|
|
72
|
+
|
|
73
|
+
// StrongBoxUnavailableException is a ProviderException, but some StrongBox
|
|
74
|
+
// HALs fail with a plain ProviderException instead.
|
|
75
|
+
Log.w(TAG, "StrongBox key generation failed for \"$alias\"; retrying with a TEE-backed key", e)
|
|
76
|
+
|
|
77
|
+
try {
|
|
78
|
+
// A failed attempt may have left a partial entry under the alias.
|
|
79
|
+
loadKeyStore().deleteEntry(alias)
|
|
80
|
+
specBuilder.setIsStrongBoxBacked(false)
|
|
81
|
+
generateKeyPairWithSpec(specBuilder.build())
|
|
82
|
+
} catch (retryError: Exception) {
|
|
83
|
+
retryError.addSuppressed(e)
|
|
84
|
+
throw retryError
|
|
85
|
+
}
|
|
77
86
|
}
|
|
78
87
|
|
|
79
88
|
val publicKeyBytes = extractUncompressedPublicKey(keyPair.public.encoded)
|
|
@@ -137,6 +146,12 @@ class KeyStoreKeyManager {
|
|
|
137
146
|
|
|
138
147
|
// region Private helpers
|
|
139
148
|
|
|
149
|
+
private fun generateKeyPairWithSpec(spec: KeyGenParameterSpec): KeyPair {
|
|
150
|
+
val kpg = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE)
|
|
151
|
+
kpg.initialize(spec)
|
|
152
|
+
return kpg.generateKeyPair()
|
|
153
|
+
}
|
|
154
|
+
|
|
140
155
|
private fun loadKeyStore(): KeyStore {
|
|
141
156
|
val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE)
|
|
142
157
|
keyStore.load(null)
|
|
@@ -209,6 +224,7 @@ class KeyStoreKeyManager {
|
|
|
209
224
|
|
|
210
225
|
companion object {
|
|
211
226
|
private const val ANDROID_KEYSTORE = "AndroidKeyStore"
|
|
227
|
+
private const val TAG = "KeyStoreKeyManager"
|
|
212
228
|
|
|
213
229
|
fun base64urlDecode(input: String): ByteArray {
|
|
214
230
|
return android.util.Base64.decode(
|
|
@@ -5,9 +5,11 @@ import android.content.pm.PackageManager
|
|
|
5
5
|
import android.os.Build
|
|
6
6
|
import android.security.keystore.KeyGenParameterSpec
|
|
7
7
|
import android.security.keystore.KeyProperties
|
|
8
|
-
import android.
|
|
8
|
+
import android.util.Log
|
|
9
|
+
import java.security.KeyPair
|
|
9
10
|
import java.security.KeyPairGenerator
|
|
10
11
|
import java.security.KeyStore
|
|
12
|
+
import java.security.ProviderException
|
|
11
13
|
import java.security.Signature
|
|
12
14
|
import java.security.spec.ECGenParameterSpec
|
|
13
15
|
|
|
@@ -61,19 +63,26 @@ class KeyStoreKeyManager {
|
|
|
61
63
|
}
|
|
62
64
|
|
|
63
65
|
val keyPair = try {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && e is StrongBoxUnavailableException) {
|
|
69
|
-
// Retry without StrongBox
|
|
70
|
-
specBuilder.setIsStrongBoxBacked(false)
|
|
71
|
-
val kpg = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE)
|
|
72
|
-
kpg.initialize(specBuilder.build())
|
|
73
|
-
kpg.generateKeyPair()
|
|
74
|
-
} else {
|
|
66
|
+
generateKeyPairWithSpec(specBuilder.build())
|
|
67
|
+
} catch (e: ProviderException) {
|
|
68
|
+
// Without StrongBox requested there is nothing to fall back from.
|
|
69
|
+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
|
|
75
70
|
throw e
|
|
76
71
|
}
|
|
72
|
+
|
|
73
|
+
// StrongBoxUnavailableException is a ProviderException, but some StrongBox
|
|
74
|
+
// HALs fail with a plain ProviderException instead.
|
|
75
|
+
Log.w(TAG, "StrongBox key generation failed for \"$alias\"; retrying with a TEE-backed key", e)
|
|
76
|
+
|
|
77
|
+
try {
|
|
78
|
+
// A failed attempt may have left a partial entry under the alias.
|
|
79
|
+
loadKeyStore().deleteEntry(alias)
|
|
80
|
+
specBuilder.setIsStrongBoxBacked(false)
|
|
81
|
+
generateKeyPairWithSpec(specBuilder.build())
|
|
82
|
+
} catch (retryError: Exception) {
|
|
83
|
+
retryError.addSuppressed(e)
|
|
84
|
+
throw retryError
|
|
85
|
+
}
|
|
77
86
|
}
|
|
78
87
|
|
|
79
88
|
val publicKeyBytes = extractUncompressedPublicKey(keyPair.public.encoded)
|
|
@@ -137,6 +146,12 @@ class KeyStoreKeyManager {
|
|
|
137
146
|
|
|
138
147
|
// region Private helpers
|
|
139
148
|
|
|
149
|
+
private fun generateKeyPairWithSpec(spec: KeyGenParameterSpec): KeyPair {
|
|
150
|
+
val kpg = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE)
|
|
151
|
+
kpg.initialize(spec)
|
|
152
|
+
return kpg.generateKeyPair()
|
|
153
|
+
}
|
|
154
|
+
|
|
140
155
|
private fun loadKeyStore(): KeyStore {
|
|
141
156
|
val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE)
|
|
142
157
|
keyStore.load(null)
|
|
@@ -209,6 +224,7 @@ class KeyStoreKeyManager {
|
|
|
209
224
|
|
|
210
225
|
companion object {
|
|
211
226
|
private const val ANDROID_KEYSTORE = "AndroidKeyStore"
|
|
227
|
+
private const val TAG = "KeyStoreKeyManager"
|
|
212
228
|
|
|
213
229
|
fun base64urlDecode(input: String): ByteArray {
|
|
214
230
|
return android.util.Base64.decode(
|
|
@@ -5,9 +5,11 @@ import android.content.pm.PackageManager
|
|
|
5
5
|
import android.os.Build
|
|
6
6
|
import android.security.keystore.KeyGenParameterSpec
|
|
7
7
|
import android.security.keystore.KeyProperties
|
|
8
|
-
import android.
|
|
8
|
+
import android.util.Log
|
|
9
|
+
import java.security.KeyPair
|
|
9
10
|
import java.security.KeyPairGenerator
|
|
10
11
|
import java.security.KeyStore
|
|
12
|
+
import java.security.ProviderException
|
|
11
13
|
import java.security.Signature
|
|
12
14
|
import java.security.spec.ECGenParameterSpec
|
|
13
15
|
|
|
@@ -61,19 +63,26 @@ class KeyStoreKeyManager {
|
|
|
61
63
|
}
|
|
62
64
|
|
|
63
65
|
val keyPair = try {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && e is StrongBoxUnavailableException) {
|
|
69
|
-
// Retry without StrongBox
|
|
70
|
-
specBuilder.setIsStrongBoxBacked(false)
|
|
71
|
-
val kpg = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE)
|
|
72
|
-
kpg.initialize(specBuilder.build())
|
|
73
|
-
kpg.generateKeyPair()
|
|
74
|
-
} else {
|
|
66
|
+
generateKeyPairWithSpec(specBuilder.build())
|
|
67
|
+
} catch (e: ProviderException) {
|
|
68
|
+
// Without StrongBox requested there is nothing to fall back from.
|
|
69
|
+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
|
|
75
70
|
throw e
|
|
76
71
|
}
|
|
72
|
+
|
|
73
|
+
// StrongBoxUnavailableException is a ProviderException, but some StrongBox
|
|
74
|
+
// HALs fail with a plain ProviderException instead.
|
|
75
|
+
Log.w(TAG, "StrongBox key generation failed for \"$alias\"; retrying with a TEE-backed key", e)
|
|
76
|
+
|
|
77
|
+
try {
|
|
78
|
+
// A failed attempt may have left a partial entry under the alias.
|
|
79
|
+
loadKeyStore().deleteEntry(alias)
|
|
80
|
+
specBuilder.setIsStrongBoxBacked(false)
|
|
81
|
+
generateKeyPairWithSpec(specBuilder.build())
|
|
82
|
+
} catch (retryError: Exception) {
|
|
83
|
+
retryError.addSuppressed(e)
|
|
84
|
+
throw retryError
|
|
85
|
+
}
|
|
77
86
|
}
|
|
78
87
|
|
|
79
88
|
val publicKeyBytes = extractUncompressedPublicKey(keyPair.public.encoded)
|
|
@@ -137,6 +146,12 @@ class KeyStoreKeyManager {
|
|
|
137
146
|
|
|
138
147
|
// region Private helpers
|
|
139
148
|
|
|
149
|
+
private fun generateKeyPairWithSpec(spec: KeyGenParameterSpec): KeyPair {
|
|
150
|
+
val kpg = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE)
|
|
151
|
+
kpg.initialize(spec)
|
|
152
|
+
return kpg.generateKeyPair()
|
|
153
|
+
}
|
|
154
|
+
|
|
140
155
|
private fun loadKeyStore(): KeyStore {
|
|
141
156
|
val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE)
|
|
142
157
|
keyStore.load(null)
|
|
@@ -209,6 +224,7 @@ class KeyStoreKeyManager {
|
|
|
209
224
|
|
|
210
225
|
companion object {
|
|
211
226
|
private const val ANDROID_KEYSTORE = "AndroidKeyStore"
|
|
227
|
+
private const val TAG = "KeyStoreKeyManager"
|
|
212
228
|
|
|
213
229
|
fun base64urlDecode(input: String): ByteArray {
|
|
214
230
|
return android.util.Base64.decode(
|
|
@@ -5,9 +5,11 @@ import android.content.pm.PackageManager
|
|
|
5
5
|
import android.os.Build
|
|
6
6
|
import android.security.keystore.KeyGenParameterSpec
|
|
7
7
|
import android.security.keystore.KeyProperties
|
|
8
|
-
import android.
|
|
8
|
+
import android.util.Log
|
|
9
|
+
import java.security.KeyPair
|
|
9
10
|
import java.security.KeyPairGenerator
|
|
10
11
|
import java.security.KeyStore
|
|
12
|
+
import java.security.ProviderException
|
|
11
13
|
import java.security.Signature
|
|
12
14
|
import java.security.spec.ECGenParameterSpec
|
|
13
15
|
|
|
@@ -61,19 +63,26 @@ class KeyStoreKeyManager {
|
|
|
61
63
|
}
|
|
62
64
|
|
|
63
65
|
val keyPair = try {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && e is StrongBoxUnavailableException) {
|
|
69
|
-
// Retry without StrongBox
|
|
70
|
-
specBuilder.setIsStrongBoxBacked(false)
|
|
71
|
-
val kpg = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE)
|
|
72
|
-
kpg.initialize(specBuilder.build())
|
|
73
|
-
kpg.generateKeyPair()
|
|
74
|
-
} else {
|
|
66
|
+
generateKeyPairWithSpec(specBuilder.build())
|
|
67
|
+
} catch (e: ProviderException) {
|
|
68
|
+
// Without StrongBox requested there is nothing to fall back from.
|
|
69
|
+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
|
|
75
70
|
throw e
|
|
76
71
|
}
|
|
72
|
+
|
|
73
|
+
// StrongBoxUnavailableException is a ProviderException, but some StrongBox
|
|
74
|
+
// HALs fail with a plain ProviderException instead.
|
|
75
|
+
Log.w(TAG, "StrongBox key generation failed for \"$alias\"; retrying with a TEE-backed key", e)
|
|
76
|
+
|
|
77
|
+
try {
|
|
78
|
+
// A failed attempt may have left a partial entry under the alias.
|
|
79
|
+
loadKeyStore().deleteEntry(alias)
|
|
80
|
+
specBuilder.setIsStrongBoxBacked(false)
|
|
81
|
+
generateKeyPairWithSpec(specBuilder.build())
|
|
82
|
+
} catch (retryError: Exception) {
|
|
83
|
+
retryError.addSuppressed(e)
|
|
84
|
+
throw retryError
|
|
85
|
+
}
|
|
77
86
|
}
|
|
78
87
|
|
|
79
88
|
val publicKeyBytes = extractUncompressedPublicKey(keyPair.public.encoded)
|
|
@@ -137,6 +146,12 @@ class KeyStoreKeyManager {
|
|
|
137
146
|
|
|
138
147
|
// region Private helpers
|
|
139
148
|
|
|
149
|
+
private fun generateKeyPairWithSpec(spec: KeyGenParameterSpec): KeyPair {
|
|
150
|
+
val kpg = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE)
|
|
151
|
+
kpg.initialize(spec)
|
|
152
|
+
return kpg.generateKeyPair()
|
|
153
|
+
}
|
|
154
|
+
|
|
140
155
|
private fun loadKeyStore(): KeyStore {
|
|
141
156
|
val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE)
|
|
142
157
|
keyStore.load(null)
|
|
@@ -209,6 +224,7 @@ class KeyStoreKeyManager {
|
|
|
209
224
|
|
|
210
225
|
companion object {
|
|
211
226
|
private const val ANDROID_KEYSTORE = "AndroidKeyStore"
|
|
227
|
+
private const val TAG = "KeyStoreKeyManager"
|
|
212
228
|
|
|
213
229
|
fun base64urlDecode(input: String): ByteArray {
|
|
214
230
|
return android.util.Base64.decode(
|
|
@@ -5,9 +5,11 @@ import android.content.pm.PackageManager
|
|
|
5
5
|
import android.os.Build
|
|
6
6
|
import android.security.keystore.KeyGenParameterSpec
|
|
7
7
|
import android.security.keystore.KeyProperties
|
|
8
|
-
import android.
|
|
8
|
+
import android.util.Log
|
|
9
|
+
import java.security.KeyPair
|
|
9
10
|
import java.security.KeyPairGenerator
|
|
10
11
|
import java.security.KeyStore
|
|
12
|
+
import java.security.ProviderException
|
|
11
13
|
import java.security.Signature
|
|
12
14
|
import java.security.spec.ECGenParameterSpec
|
|
13
15
|
|
|
@@ -61,19 +63,26 @@ class KeyStoreKeyManager {
|
|
|
61
63
|
}
|
|
62
64
|
|
|
63
65
|
val keyPair = try {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && e is StrongBoxUnavailableException) {
|
|
69
|
-
// Retry without StrongBox
|
|
70
|
-
specBuilder.setIsStrongBoxBacked(false)
|
|
71
|
-
val kpg = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE)
|
|
72
|
-
kpg.initialize(specBuilder.build())
|
|
73
|
-
kpg.generateKeyPair()
|
|
74
|
-
} else {
|
|
66
|
+
generateKeyPairWithSpec(specBuilder.build())
|
|
67
|
+
} catch (e: ProviderException) {
|
|
68
|
+
// Without StrongBox requested there is nothing to fall back from.
|
|
69
|
+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
|
|
75
70
|
throw e
|
|
76
71
|
}
|
|
72
|
+
|
|
73
|
+
// StrongBoxUnavailableException is a ProviderException, but some StrongBox
|
|
74
|
+
// HALs fail with a plain ProviderException instead.
|
|
75
|
+
Log.w(TAG, "StrongBox key generation failed for \"$alias\"; retrying with a TEE-backed key", e)
|
|
76
|
+
|
|
77
|
+
try {
|
|
78
|
+
// A failed attempt may have left a partial entry under the alias.
|
|
79
|
+
loadKeyStore().deleteEntry(alias)
|
|
80
|
+
specBuilder.setIsStrongBoxBacked(false)
|
|
81
|
+
generateKeyPairWithSpec(specBuilder.build())
|
|
82
|
+
} catch (retryError: Exception) {
|
|
83
|
+
retryError.addSuppressed(e)
|
|
84
|
+
throw retryError
|
|
85
|
+
}
|
|
77
86
|
}
|
|
78
87
|
|
|
79
88
|
val publicKeyBytes = extractUncompressedPublicKey(keyPair.public.encoded)
|
|
@@ -137,6 +146,12 @@ class KeyStoreKeyManager {
|
|
|
137
146
|
|
|
138
147
|
// region Private helpers
|
|
139
148
|
|
|
149
|
+
private fun generateKeyPairWithSpec(spec: KeyGenParameterSpec): KeyPair {
|
|
150
|
+
val kpg = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE)
|
|
151
|
+
kpg.initialize(spec)
|
|
152
|
+
return kpg.generateKeyPair()
|
|
153
|
+
}
|
|
154
|
+
|
|
140
155
|
private fun loadKeyStore(): KeyStore {
|
|
141
156
|
val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE)
|
|
142
157
|
keyStore.load(null)
|
|
@@ -209,6 +224,7 @@ class KeyStoreKeyManager {
|
|
|
209
224
|
|
|
210
225
|
companion object {
|
|
211
226
|
private const val ANDROID_KEYSTORE = "AndroidKeyStore"
|
|
227
|
+
private const val TAG = "KeyStoreKeyManager"
|
|
212
228
|
|
|
213
229
|
fun base64urlDecode(input: String): ByteArray {
|
|
214
230
|
return android.util.Base64.decode(
|
|
@@ -5,9 +5,11 @@ import android.content.pm.PackageManager
|
|
|
5
5
|
import android.os.Build
|
|
6
6
|
import android.security.keystore.KeyGenParameterSpec
|
|
7
7
|
import android.security.keystore.KeyProperties
|
|
8
|
-
import android.
|
|
8
|
+
import android.util.Log
|
|
9
|
+
import java.security.KeyPair
|
|
9
10
|
import java.security.KeyPairGenerator
|
|
10
11
|
import java.security.KeyStore
|
|
12
|
+
import java.security.ProviderException
|
|
11
13
|
import java.security.Signature
|
|
12
14
|
import java.security.spec.ECGenParameterSpec
|
|
13
15
|
|
|
@@ -61,19 +63,26 @@ class KeyStoreKeyManager {
|
|
|
61
63
|
}
|
|
62
64
|
|
|
63
65
|
val keyPair = try {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && e is StrongBoxUnavailableException) {
|
|
69
|
-
// Retry without StrongBox
|
|
70
|
-
specBuilder.setIsStrongBoxBacked(false)
|
|
71
|
-
val kpg = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE)
|
|
72
|
-
kpg.initialize(specBuilder.build())
|
|
73
|
-
kpg.generateKeyPair()
|
|
74
|
-
} else {
|
|
66
|
+
generateKeyPairWithSpec(specBuilder.build())
|
|
67
|
+
} catch (e: ProviderException) {
|
|
68
|
+
// Without StrongBox requested there is nothing to fall back from.
|
|
69
|
+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
|
|
75
70
|
throw e
|
|
76
71
|
}
|
|
72
|
+
|
|
73
|
+
// StrongBoxUnavailableException is a ProviderException, but some StrongBox
|
|
74
|
+
// HALs fail with a plain ProviderException instead.
|
|
75
|
+
Log.w(TAG, "StrongBox key generation failed for \"$alias\"; retrying with a TEE-backed key", e)
|
|
76
|
+
|
|
77
|
+
try {
|
|
78
|
+
// A failed attempt may have left a partial entry under the alias.
|
|
79
|
+
loadKeyStore().deleteEntry(alias)
|
|
80
|
+
specBuilder.setIsStrongBoxBacked(false)
|
|
81
|
+
generateKeyPairWithSpec(specBuilder.build())
|
|
82
|
+
} catch (retryError: Exception) {
|
|
83
|
+
retryError.addSuppressed(e)
|
|
84
|
+
throw retryError
|
|
85
|
+
}
|
|
77
86
|
}
|
|
78
87
|
|
|
79
88
|
val publicKeyBytes = extractUncompressedPublicKey(keyPair.public.encoded)
|
|
@@ -137,6 +146,12 @@ class KeyStoreKeyManager {
|
|
|
137
146
|
|
|
138
147
|
// region Private helpers
|
|
139
148
|
|
|
149
|
+
private fun generateKeyPairWithSpec(spec: KeyGenParameterSpec): KeyPair {
|
|
150
|
+
val kpg = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE)
|
|
151
|
+
kpg.initialize(spec)
|
|
152
|
+
return kpg.generateKeyPair()
|
|
153
|
+
}
|
|
154
|
+
|
|
140
155
|
private fun loadKeyStore(): KeyStore {
|
|
141
156
|
val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE)
|
|
142
157
|
keyStore.load(null)
|
|
@@ -209,6 +224,7 @@ class KeyStoreKeyManager {
|
|
|
209
224
|
|
|
210
225
|
companion object {
|
|
211
226
|
private const val ANDROID_KEYSTORE = "AndroidKeyStore"
|
|
227
|
+
private const val TAG = "KeyStoreKeyManager"
|
|
212
228
|
|
|
213
229
|
fun base64urlDecode(input: String): ByteArray {
|
|
214
230
|
return android.util.Base64.decode(
|
|
@@ -5,9 +5,11 @@ import android.content.pm.PackageManager
|
|
|
5
5
|
import android.os.Build
|
|
6
6
|
import android.security.keystore.KeyGenParameterSpec
|
|
7
7
|
import android.security.keystore.KeyProperties
|
|
8
|
-
import android.
|
|
8
|
+
import android.util.Log
|
|
9
|
+
import java.security.KeyPair
|
|
9
10
|
import java.security.KeyPairGenerator
|
|
10
11
|
import java.security.KeyStore
|
|
12
|
+
import java.security.ProviderException
|
|
11
13
|
import java.security.Signature
|
|
12
14
|
import java.security.spec.ECGenParameterSpec
|
|
13
15
|
|
|
@@ -61,19 +63,26 @@ class KeyStoreKeyManager {
|
|
|
61
63
|
}
|
|
62
64
|
|
|
63
65
|
val keyPair = try {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && e is StrongBoxUnavailableException) {
|
|
69
|
-
// Retry without StrongBox
|
|
70
|
-
specBuilder.setIsStrongBoxBacked(false)
|
|
71
|
-
val kpg = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE)
|
|
72
|
-
kpg.initialize(specBuilder.build())
|
|
73
|
-
kpg.generateKeyPair()
|
|
74
|
-
} else {
|
|
66
|
+
generateKeyPairWithSpec(specBuilder.build())
|
|
67
|
+
} catch (e: ProviderException) {
|
|
68
|
+
// Without StrongBox requested there is nothing to fall back from.
|
|
69
|
+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
|
|
75
70
|
throw e
|
|
76
71
|
}
|
|
72
|
+
|
|
73
|
+
// StrongBoxUnavailableException is a ProviderException, but some StrongBox
|
|
74
|
+
// HALs fail with a plain ProviderException instead.
|
|
75
|
+
Log.w(TAG, "StrongBox key generation failed for \"$alias\"; retrying with a TEE-backed key", e)
|
|
76
|
+
|
|
77
|
+
try {
|
|
78
|
+
// A failed attempt may have left a partial entry under the alias.
|
|
79
|
+
loadKeyStore().deleteEntry(alias)
|
|
80
|
+
specBuilder.setIsStrongBoxBacked(false)
|
|
81
|
+
generateKeyPairWithSpec(specBuilder.build())
|
|
82
|
+
} catch (retryError: Exception) {
|
|
83
|
+
retryError.addSuppressed(e)
|
|
84
|
+
throw retryError
|
|
85
|
+
}
|
|
77
86
|
}
|
|
78
87
|
|
|
79
88
|
val publicKeyBytes = extractUncompressedPublicKey(keyPair.public.encoded)
|
|
@@ -137,6 +146,12 @@ class KeyStoreKeyManager {
|
|
|
137
146
|
|
|
138
147
|
// region Private helpers
|
|
139
148
|
|
|
149
|
+
private fun generateKeyPairWithSpec(spec: KeyGenParameterSpec): KeyPair {
|
|
150
|
+
val kpg = KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE)
|
|
151
|
+
kpg.initialize(spec)
|
|
152
|
+
return kpg.generateKeyPair()
|
|
153
|
+
}
|
|
154
|
+
|
|
140
155
|
private fun loadKeyStore(): KeyStore {
|
|
141
156
|
val keyStore = KeyStore.getInstance(ANDROID_KEYSTORE)
|
|
142
157
|
keyStore.load(null)
|
|
@@ -209,6 +224,7 @@ class KeyStoreKeyManager {
|
|
|
209
224
|
|
|
210
225
|
companion object {
|
|
211
226
|
private const val ANDROID_KEYSTORE = "AndroidKeyStore"
|
|
227
|
+
private const val TAG = "KeyStoreKeyManager"
|
|
212
228
|
|
|
213
229
|
fun base64urlDecode(input: String): ByteArray {
|
|
214
230
|
return android.util.Base64.decode(
|
package/index.cjs
CHANGED
package/index.js
CHANGED
|
@@ -14,7 +14,7 @@ import { openAuthSessionAsync } from 'expo-web-browser';
|
|
|
14
14
|
import { resetGenericPassword, getGenericPassword, setGenericPassword } from 'react-native-keychain';
|
|
15
15
|
import { createPasskey, PasskeyStamper } from '@turnkey/react-native-passkey-stamper';
|
|
16
16
|
|
|
17
|
-
var version = "5.
|
|
17
|
+
var version = "5.11.0";
|
|
18
18
|
|
|
19
19
|
function _extends() {
|
|
20
20
|
return _extends = Object.assign ? Object.assign.bind() : function (n) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dynamic-labs/legacy-react-native-extension",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.11.0",
|
|
4
4
|
"main": "./index.cjs",
|
|
5
5
|
"module": "./index.js",
|
|
6
6
|
"types": "./src/index.d.ts",
|
|
@@ -18,11 +18,11 @@
|
|
|
18
18
|
"@turnkey/react-native-passkey-stamper": "1.2.7",
|
|
19
19
|
"@react-native-documents/picker": "^11.0.0",
|
|
20
20
|
"react-native-fs": ">=2.20.0",
|
|
21
|
-
"@dynamic-labs/assert-package-version": "5.
|
|
22
|
-
"@dynamic-labs/legacy-client": "5.
|
|
23
|
-
"@dynamic-labs/logger": "5.
|
|
24
|
-
"@dynamic-labs/message-transport": "5.
|
|
25
|
-
"@dynamic-labs/webview-messages": "5.
|
|
21
|
+
"@dynamic-labs/assert-package-version": "5.11.0",
|
|
22
|
+
"@dynamic-labs/legacy-client": "5.11.0",
|
|
23
|
+
"@dynamic-labs/logger": "5.11.0",
|
|
24
|
+
"@dynamic-labs/message-transport": "5.11.0",
|
|
25
|
+
"@dynamic-labs/webview-messages": "5.11.0"
|
|
26
26
|
},
|
|
27
27
|
"peerDependencies": {
|
|
28
28
|
"react": ">=18.0.0 <20.0.0",
|