rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Force twofish padding compatibility #955

Browse Source
This commit is contained in:
J-Jamet
2021-04-08 12:55:23 +02:00
parent 949905f6e2
commit 346b517c9d
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt
View File

@@ -38,8 +38,12 @@ object CipherFactory {
}
@Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, InvalidKeyException::class, InvalidAlgorithmParameterException::class)
fun getTwofish(opmode: Int, key: ByteArray, IV: ByteArray): Cipher {
val cipher: Cipher = Cipher.getInstance("Twofish/CBC/PKCS7PADDING")
fun getTwofish(opmode: Int, key: ByteArray, IV: ByteArray, forceCompatibility: Boolean = false): Cipher {
val cipher: Cipher = if (forceCompatibility) {
Cipher.getInstance("Twofish/CBC/NoPadding")
} else {
Cipher.getInstance("Twofish/CBC/PKCS7PADDING")
}
cipher.init(opmode, SecretKeySpec(key, "AES"), IvParameterSpec(IV))
return cipher
}