Yubico/yubioath-flutter
1
1
Fork 0
mirror of https://github.com/Yubico/yubioath-flutter.git synced 2024-11-23 09:56:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #187.

Browse Source
This commit is contained in:
Adam Velebil 2022-08-29 14:11:44 +02:00
commit 3cea6a3b2d
No known key found for this signature in database
GPG Key ID: AC6D6B9D715FC084
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
android/app/src/main/kotlin/com/yubico/authenticator/oath/keystore/KeyStoreProvider.kt
View File

@ -14,7 +14,7 @@ class KeyStoreProvider : KeyProvider {
keystore.load(null)
}
override fun hasKey(deviceId: String): Boolean = keystore.containsAlias(deviceId)
override fun hasKey(deviceId: String): Boolean = keystore.containsAlias(getAlias(deviceId))
override fun getKey(deviceId: String): AccessKey? =
if (hasKey(deviceId)) {
@ -25,7 +25,7 @@ class KeyStoreProvider : KeyProvider {
override fun putKey(deviceId: String, secret: ByteArray) {
keystore.setEntry(
deviceId,
getAlias(deviceId),
KeyStore.SecretKeyEntry(
SecretKeySpec(secret, KeyProperties.KEY_ALGORITHM_HMAC_SHA1)
),
@ -35,7 +35,7 @@ class KeyStoreProvider : KeyProvider {
override fun removeKey(deviceId: String) {
keystore.deleteEntry(deviceId)
keystore.deleteEntry(getAlias(deviceId))
}
override fun clearAll() {
@ -45,9 +45,13 @@ class KeyStoreProvider : KeyProvider {
private inner class KeyStoreStoredSigner(val deviceId: String) :
AccessKey {
val mac: Mac = Mac.getInstance(KeyProperties.KEY_ALGORITHM_HMAC_SHA1).apply {
init(keystore.getKey(deviceId, null))
init(keystore.getKey(getAlias(deviceId), null))
}
override fun calculateResponse(challenge: ByteArray): ByteArray = mac.doFinal(challenge)
}
// return key alias used in legacy app
private fun getAlias(deviceId: String) = "$deviceId,0"
}