PGPainless/pgpainless
PGPainless
/
pgpainless
mirror of https://github.com/pgpainless/pgpainless.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add KeyRingProtectionSettings.secureDefaultSettings() factory method

This commit is contained in:
Paul Schaub 2020-08-31 12:37:34 +02:00
parent 20f32926bb
commit 2af60454f5
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pgpainless-core/src/main/java/org/pgpainless/key/protection/KeyRingProtectionSettings.java
View File

@ -39,6 +39,10 @@ public class KeyRingProtectionSettings {
this.s2kCount = s2kCount; this.s2kCount = s2kCount;
} }
public static KeyRingProtectionSettings secureDefaultSettings() {
return new KeyRingProtectionSettings(SymmetricKeyAlgorithm.AES_256);
}
public @Nonnull SymmetricKeyAlgorithm getEncryptionAlgorithm() { public @Nonnull SymmetricKeyAlgorithm getEncryptionAlgorithm() {
return encryptionAlgorithm; return encryptionAlgorithm;
} }

2
pgpainless-core/src/main/java/org/pgpainless/key/protection/PasswordBasedSecretKeyRingProtector.java
View File

@ -54,7 +54,7 @@ public class PasswordBasedSecretKeyRingProtector implements SecretKeyRingProtect
} }
public static PasswordBasedSecretKeyRingProtector forKey(PGPKeyRing keyRing, Passphrase passphrase) { public static PasswordBasedSecretKeyRingProtector forKey(PGPKeyRing keyRing, Passphrase passphrase) {
KeyRingProtectionSettings protectionSettings = new KeyRingProtectionSettings(SymmetricKeyAlgorithm.AES_256); KeyRingProtectionSettings protectionSettings = KeyRingProtectionSettings.secureDefaultSettings();
SecretKeyPassphraseProvider passphraseProvider = new SecretKeyPassphraseProvider() { SecretKeyPassphraseProvider passphraseProvider = new SecretKeyPassphraseProvider() {
@Override @Override
@Nullable @Nullable

2
pgpainless-core/src/test/java/org/pgpainless/key/protection/PassphraseProtectedKeyTest.java
View File

@ -32,7 +32,7 @@ public class PassphraseProtectedKeyTest {
* Protector that holds only the password of cryptie. * Protector that holds only the password of cryptie.
*/ */
private final PasswordBasedSecretKeyRingProtector protector = new PasswordBasedSecretKeyRingProtector( private final PasswordBasedSecretKeyRingProtector protector = new PasswordBasedSecretKeyRingProtector(
new KeyRingProtectionSettings(SymmetricKeyAlgorithm.AES_256), KeyRingProtectionSettings.secureDefaultSettings(),
new SecretKeyPassphraseProvider() { new SecretKeyPassphraseProvider() {
@Nullable @Nullable
@Override @Override