PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-23 12:52:07 +01:00
Code Issues Releases Wiki Activity

UnlockSecretKey: Do not try to get decryptor for unencrypted keys

Browse source
This commit is contained in:
Paul Schaub 2021-05-31 15:38:47 +02:00
parent 73f6c54fa2
commit ce4869e15a
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pgpainless-core/src/main/java/org/pgpainless/key/protection/UnlockSecretKey.java
View file

@ -20,6 +20,7 @@ import org.bouncycastle.openpgp.PGPPrivateKey;
import org.bouncycastle.openpgp.PGPSecretKey; import org.bouncycastle.openpgp.PGPSecretKey;
import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
import org.pgpainless.exception.WrongPassphraseException; import org.pgpainless.exception.WrongPassphraseException;
import org.pgpainless.key.info.KeyInfo;
import org.pgpainless.util.Passphrase; import org.pgpainless.util.Passphrase;
public class UnlockSecretKey { public class UnlockSecretKey {
@ -27,7 +28,10 @@ public class UnlockSecretKey {
public static PGPPrivateKey unlockSecretKey(PGPSecretKey secretKey, SecretKeyRingProtector protector) public static PGPPrivateKey unlockSecretKey(PGPSecretKey secretKey, SecretKeyRingProtector protector)
throws WrongPassphraseException { throws WrongPassphraseException {
try { try {
PBESecretKeyDecryptor decryptor = protector.getDecryptor(secretKey.getKeyID()); PBESecretKeyDecryptor decryptor = null;
if (KeyInfo.isEncrypted(secretKey)) {
decryptor = protector.getDecryptor(secretKey.getKeyID());
}
return secretKey.extractPrivateKey(decryptor); return secretKey.extractPrivateKey(decryptor);
} catch (PGPException e) { } catch (PGPException e) {
throw new WrongPassphraseException(secretKey.getKeyID(), e); throw new WrongPassphraseException(secretKey.getKeyID(), e);