Merge pull request #2653 from open-keychain/fix_KdfParameters_builder
Fix KdfParameters builder
This commit is contained in:
commit
c288448c12
|
@ -64,8 +64,8 @@ public abstract class KdfParameters {
|
||||||
abstract Builder digestAlgorithm(HashType digestAlgorithm);
|
abstract Builder digestAlgorithm(HashType digestAlgorithm);
|
||||||
abstract Builder iterations(int iterations);
|
abstract Builder iterations(int iterations);
|
||||||
abstract Builder saltPw1(byte[] saltPw1);
|
abstract Builder saltPw1(byte[] saltPw1);
|
||||||
abstract Builder saltPw2(byte[] saltPw1);
|
abstract Builder saltPw2(byte[] saltPw2);
|
||||||
abstract Builder saltPw3(byte[] saltPw1);
|
abstract Builder saltPw3(byte[] saltPw3);
|
||||||
abstract Builder hashUser(byte[] hashUser);
|
abstract Builder hashUser(byte[] hashUser);
|
||||||
abstract Builder hashAdmin(byte[] hashAdmin);
|
abstract Builder hashAdmin(byte[] hashAdmin);
|
||||||
|
|
||||||
|
@ -75,6 +75,13 @@ public abstract class KdfParameters {
|
||||||
|
|
||||||
public Builder() {
|
public Builder() {
|
||||||
hasUsesKdf(false);
|
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 {
|
Builder parseKdfTLVs(Iso7816TLV[] tlvs) throws IOException {
|
||||||
|
|
Loading…
Reference in a new issue