PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-01-09 11:48:00 +01:00
Code Issues Releases Wiki Activity

return null-cryptors for unprotected keys

Browse source
This commit is contained in:
Paul Schaub 2020-01-14 22:10:07 +01:00
parent 4b61745c46
commit 9c1f6fc812
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pgpainless-core/src/main/java/org/pgpainless/key/protection/PasswordBasedSecretKeyRingProtector.java
View file

@ -55,18 +55,20 @@ public class PasswordBasedSecretKeyRingProtector implements SecretKeyRingProtect
@Nullable @Nullable
public PBESecretKeyDecryptor getDecryptor(Long keyId) { public PBESecretKeyDecryptor getDecryptor(Long keyId) {
Passphrase passphrase = passphraseProvider.getPassphraseFor(keyId); Passphrase passphrase = passphraseProvider.getPassphraseFor(keyId);
return new BcPBESecretKeyDecryptorBuilder(calculatorProvider) return passphrase == null ? null :
.build(passphrase != null ? passphrase.getChars() : null); new BcPBESecretKeyDecryptorBuilder(calculatorProvider)
.build(passphrase.getChars());
} }
@Override @Override
@Nullable @Nullable
public PBESecretKeyEncryptor getEncryptor(Long keyId) throws PGPException { public PBESecretKeyEncryptor getEncryptor(Long keyId) throws PGPException {
Passphrase passphrase = passphraseProvider.getPassphraseFor(keyId); Passphrase passphrase = passphraseProvider.getPassphraseFor(keyId);
return new BcPBESecretKeyEncryptorBuilder( return passphrase == null ? null :
protectionSettings.getEncryptionAlgorithm().getAlgorithmId(), new BcPBESecretKeyEncryptorBuilder(
calculatorProvider.get(protectionSettings.getHashAlgorithm().getAlgorithmId()), protectionSettings.getEncryptionAlgorithm().getAlgorithmId(),
protectionSettings.getS2kCount()) calculatorProvider.get(protectionSettings.getHashAlgorithm().getAlgorithmId()),
.build(passphrase != null ? passphrase.getChars() : null); protectionSettings.getS2kCount())
.build(passphrase.getChars());
} }
} }