Skip to content

fix: add error handling in decryptBytes to throw CryptoFailedException for AEADBadTagException #739

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
DorianMazur merged 1 commit into from
Mar 22, 2025
Merged

fix: add error handling in decryptBytes to throw CryptoFailedException for AEADBadTagException #739

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
11 changes: 9 additions & 2 deletions android/src/main/java/com/oblador/keychain/cipherStorage/CipherStorageBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ abstract class CipherStorageBase(protected val applicationContext: Context) : Ci

/** Decrypt provided bytes to a string. */
@SuppressLint("NewApi")
@Throws(GeneralSecurityException::class, IOException::class)
@Throws(GeneralSecurityException::class, IOException::class, CryptoFailedException::class)
protected open fun decryptBytes(
key: Key,
bytes: ByteArray,
Expand All @@ -361,7 +361,14 @@ abstract class CipherStorageBase(protected val applicationContext: Context) : Ci
e.cause?.message?.contains("Key user not authenticated") == true -> {
throw UserNotAuthenticatedException()
}

e is javax.crypto.AEADBadTagException -> {
throw CryptoFailedException(
"Decryption failed: Authentication tag verification failed. " +
"This usually indicates that the encrypted data was modified, corrupted, " +
"or is being decrypted with the wrong key.",
e
)
}
else -> throw e
}
}
Expand Down
Loading