From 2af60454f56fcac55a8ed970acf20cbab5267bde Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Mon, 31 Aug 2020 12:37:34 +0200
Subject: [PATCH] Add KeyRingProtectionSettings.secureDefaultSettings() factory
 method

---
 .../pgpainless/key/protection/KeyRingProtectionSettings.java  | 4 ++++
 .../key/protection/PasswordBasedSecretKeyRingProtector.java   | 2 +-
 .../pgpainless/key/protection/PassphraseProtectedKeyTest.java | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

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 61d09576..9ac0356c 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
@@ -39,6 +39,10 @@ public class KeyRingProtectionSettings {
         this.s2kCount = s2kCount;
     }
 
+    public static KeyRingProtectionSettings secureDefaultSettings() {
+        return new KeyRingProtectionSettings(SymmetricKeyAlgorithm.AES_256);
+    }
+
     public @Nonnull SymmetricKeyAlgorithm getEncryptionAlgorithm() {
         return encryptionAlgorithm;
     }
diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/protection/PasswordBasedSecretKeyRingProtector.java b/pgpainless-core/src/main/java/org/pgpainless/key/protection/PasswordBasedSecretKeyRingProtector.java
index 9232b1e4..3938e036 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/protection/PasswordBasedSecretKeyRingProtector.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/protection/PasswordBasedSecretKeyRingProtector.java
@@ -54,7 +54,7 @@ public class PasswordBasedSecretKeyRingProtector implements SecretKeyRingProtect
     }
 
     public static PasswordBasedSecretKeyRingProtector forKey(PGPKeyRing keyRing, Passphrase passphrase) {
-        KeyRingProtectionSettings protectionSettings = new KeyRingProtectionSettings(SymmetricKeyAlgorithm.AES_256);
+        KeyRingProtectionSettings protectionSettings = KeyRingProtectionSettings.secureDefaultSettings();
         SecretKeyPassphraseProvider passphraseProvider = new SecretKeyPassphraseProvider() {
             @Override
             @Nullable
diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/protection/PassphraseProtectedKeyTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/protection/PassphraseProtectedKeyTest.java
index 9c72f0ce..db7d3f91 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/key/protection/PassphraseProtectedKeyTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/key/protection/PassphraseProtectedKeyTest.java
@@ -32,7 +32,7 @@ public class PassphraseProtectedKeyTest {
      * Protector that holds only the password of cryptie.
      */
     private final PasswordBasedSecretKeyRingProtector protector = new PasswordBasedSecretKeyRingProtector(
-            new KeyRingProtectionSettings(SymmetricKeyAlgorithm.AES_256),
+            KeyRingProtectionSettings.secureDefaultSettings(),
             new SecretKeyPassphraseProvider() {
                 @Nullable
                 @Override