PeterCxy
/
open-keychain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #2653 from open-keychain/fix_KdfParameters_builder 

Fix KdfParameters builder
This commit is contained in:
Vincent Breitmoser 2021-02-17 16:42:07 +01:00 committed by GitHub
parent 94ebbf52b0 7dc0c5e184
commit c288448c12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/KdfParameters.java
View File

@ -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);
@ -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 {