From b69a7c585d5f67f7bd1d6258c6c3f19ecca83543 Mon Sep 17 00:00:00 2001 From: Christian Hagau Date: Wed, 17 Feb 2021 00:00:00 +0000 Subject: [PATCH 1/2] Fix parameter names for KdfParameters setters --- .../keychain/securitytoken/KdfParameters.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/KdfParameters.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/KdfParameters.java index 0d04f828c..d3a4a0326 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/KdfParameters.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/KdfParameters.java @@ -64,8 +64,8 @@ public abstract class KdfParameters { abstract Builder digestAlgorithm(HashType digestAlgorithm); abstract Builder iterations(int iterations); abstract Builder saltPw1(byte[] saltPw1); - abstract Builder saltPw2(byte[] saltPw1); - abstract Builder saltPw3(byte[] saltPw1); + abstract Builder saltPw2(byte[] saltPw2); + abstract Builder saltPw3(byte[] saltPw3); abstract Builder hashUser(byte[] hashUser); abstract Builder hashAdmin(byte[] hashAdmin); From 7dc0c5e18426e9ad696b22ca3491c236639a8dd5 Mon Sep 17 00:00:00 2001 From: Christian Hagau Date: Wed, 17 Feb 2021 00:00:00 +0000 Subject: [PATCH 2/2] Initialize all members of KdfParameters with default values --- .../keychain/securitytoken/KdfParameters.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/KdfParameters.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/KdfParameters.java index d3a4a0326..b81e7035a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/KdfParameters.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/KdfParameters.java @@ -75,6 +75,13 @@ public abstract class KdfParameters { public Builder() { hasUsesKdf(false); + digestAlgorithm(HashType.SHA256); + iterations(0); + saltPw1(new byte[0]); + saltPw2(new byte[0]); + saltPw3(new byte[0]); + hashUser(new byte[0]); + hashAdmin(new byte[0]); } Builder parseKdfTLVs(Iso7816TLV[] tlvs) throws IOException {