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

Add ConsumerOptions.setRequireValidDecryptionKey()

This commit is contained in:
Paul Schaub 2023-04-07 13:37:37 +02:00
parent ed2c53f5d6
commit 76b365a506
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pgpainless-core/src/main/java/org/pgpainless/decryption_verification/ConsumerOptions.java
View File

@ -37,6 +37,7 @@ import org.pgpainless.util.SessionKey;
public class ConsumerOptions {
private boolean ignoreMDCErrors = false;
private boolean requireValidDecryptionKey = true;
private boolean forceNonOpenPgpData = false;
private Date verifyNotBefore = null;
@ -391,6 +392,15 @@ public class ConsumerOptions {
return ignoreMDCErrors;
}
public ConsumerOptions setRequireValidDecryptionKey(boolean requireValidDecryptionKey) {
this.requireValidDecryptionKey = requireValidDecryptionKey;
return this;
}
boolean isRequireValidDecryptionKey() {
return requireValidDecryptionKey;
}
/**
* Force PGPainless to handle the data provided by the {@link InputStream} as non-OpenPGP data.
* This workaround might come in handy if PGPainless accidentally mistakes the data for binary OpenPGP data.

16
pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java
View File

@ -691,15 +691,19 @@ public class OpenPgpMessageInputStream extends DecryptionStream {
continue;
}
KeyRingInfo info = new KeyRingInfo(secretKeys, policy, new Date());
List<PGPPublicKey> encryptionKeys = info.getEncryptionSubkeys(EncryptionPurpose.ANY);
for (PGPPublicKey key : encryptionKeys) {
if (key.getKeyID() == keyID) {
return secretKeys;
if (options.isRequireValidDecryptionKey()) {
KeyRingInfo info = new KeyRingInfo(secretKeys, policy, new Date());
List<PGPPublicKey> encryptionKeys = info.getEncryptionSubkeys(EncryptionPurpose.ANY);
for (PGPPublicKey key : encryptionKeys) {
if (key.getKeyID() == keyID) {
return secretKeys;
}
}
LOGGER.debug("Subkey " + Long.toHexString(keyID) + " cannot be used for decryption.");
} else {
return secretKeys;
}
LOGGER.debug("Subkey " + Long.toHexString(keyID) + " cannot be used for decryption.");
}
return null;
}