Skip to content

Fix CodeQL security warnings in biometric #705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
urikdev merged 1 commit into from
Mar 21, 2026
+7 −4
Merged

Fix CodeQL security warnings in biometric #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/main/java/com/urik/keyboard/data/database/DatabaseSecurityManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ class DatabaseSecurityManager(private val context: Context) {
setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
setKeySize(256)
setUserAuthenticationRequired(false)
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
setUnlockedDeviceRequired(true)
}
}.build()

keyGenerator.init(keyGenParameterSpec)
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/urik/keyboard/settings/privacydata/PrivacyDataFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ class PrivacyDataFragment : PreferenceFragmentCompat() {
} catch (_: KeyPermanentlyInvalidatedException) {
regenerateKeyAndCreateCryptoObject()
} catch (_: Exception) {
null
regenerateKeyAndCreateCryptoObject()
}

private fun regenerateKeyAndCreateCryptoObject(): BiometricPrompt.CryptoObject? = try {
Expand All @@ -369,8 +369,8 @@ class PrivacyDataFragment : PreferenceFragmentCompat() {
BIOMETRIC_KEY_ALIAS,
KeyProperties.PURPOSE_ENCRYPT
)
.setBlockModes(KeyProperties.BLOCK_MODE_CBC)
.setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7)
.setBlockModes(KeyProperties.BLOCK_MODE_GCM)
.setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
.setUserAuthenticationRequired(true)
.setInvalidatedByBiometricEnrollment(true)
.build()
Expand All @@ -388,7 +388,7 @@ class PrivacyDataFragment : PreferenceFragmentCompat() {

companion object {
private const val BIOMETRIC_KEY_ALIAS = "urik_learned_words_biometric_key"
private const val CIPHER_TRANSFORMATION = "AES/CBC/PKCS7Padding"
private const val CIPHER_TRANSFORMATION = "AES/GCM/NoPadding"
private val BIOMETRIC_CHALLENGE = byteArrayOf(0)
}
}