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

Merge branch 'feature/Encrypt_Module' into feature/Dynamic_Memory_And_Encrypt_Module

Browse Source
This commit is contained in:
J-Jamet
2021-03-23 20:25:49 +01:00
parent 0c6b2a13eb b444a13285
commit ea60645247
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/kunzisoft/keepass/database/crypto/EncryptionAlgorithm.kt
View File

@@ -44,7 +44,6 @@ enum class EncryptionAlgorithm {
AESRijndael -> AES_UUID
Twofish -> TWOFISH_UUID
ChaCha20 -> CHACHA20_UUID
else -> throw NoSuchAlgorithmException("UUID unrecognized.")
}
}

4
app/src/main/java/com/kunzisoft/keepass/database/crypto/kdf/Argon2Kdf.kt
View File

@@ -59,8 +59,8 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
val version = kdfParameters.getUInt32(PARAM_VERSION)?.toKotlinInt() ?: MAX_VERSION
// Not used
val secretKey = kdfParameters.getByteArray(PARAM_SECRET_KEY)
val assocData = kdfParameters.getByteArray(PARAM_ASSOC_DATA)
// val secretKey = kdfParameters.getByteArray(PARAM_SECRET_KEY)
// val assocData = kdfParameters.getByteArray(PARAM_ASSOC_DATA)
val argonType = if (type == Type.ARGON2_ID) Argon2Type.ARGON2_ID else Argon2Type.ARGON2_D