From 4b61745c46109890bd888a29d7e734a1e84dad3a Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Tue, 14 Jan 2020 22:09:13 +0100 Subject: [PATCH] Add default constructor and fix condition --- .../key/protection/KeyRingProtectionSettings.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/protection/KeyRingProtectionSettings.java b/pgpainless-core/src/main/java/org/pgpainless/key/protection/KeyRingProtectionSettings.java index c34577cc..61d09576 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/key/protection/KeyRingProtectionSettings.java +++ b/pgpainless-core/src/main/java/org/pgpainless/key/protection/KeyRingProtectionSettings.java @@ -26,10 +26,14 @@ public class KeyRingProtectionSettings { private final HashAlgorithm hashAlgorithm; private final int s2kCount; + public KeyRingProtectionSettings(@Nonnull SymmetricKeyAlgorithm encryptionAlgorithm) { + this(encryptionAlgorithm, HashAlgorithm.SHA1, 0x60); // Same s2kCount as used in BC. + } + public KeyRingProtectionSettings(@Nonnull SymmetricKeyAlgorithm encryptionAlgorithm, @Nonnull HashAlgorithm hashAlgorithm, int s2kCount) { this.encryptionAlgorithm = encryptionAlgorithm; this.hashAlgorithm = hashAlgorithm; - if (s2kCount > 1) { + if (s2kCount < 1) { throw new IllegalArgumentException("s2kCount cannot be less than 1."); } this.s2kCount = s2kCount;