Skip to content

Fix encryption mode of MessageEncryptionMechanism.unencrypted() to null #2395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hubot merged 1 commit into from
Aug 14, 2026
+22 −1
Merged

Fix encryption mode of MessageEncryptionMechanism.unencrypted() to null #2395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pg/src/main/java/org/bouncycastle/openpgp/api/MessageEncryptionMechanism.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public int getAeadAlgorithm()
public static MessageEncryptionMechanism unencrypted()
{
int none = 0;
return new MessageEncryptionMechanism(EncryptedDataPacketType.SEIPDv1,
return new MessageEncryptionMechanism(null,
SymmetricKeyAlgorithmTags.NULL, none);
}

Expand Down
21 changes: 21 additions & 0 deletions pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPMessageProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ protected void performTestWith(OpenPGPApi api)

verifyMessageByRevokedKey(api);
incompleteMessageProcessing(api);
processUnencryptedMessage(api);
}

private void roundtripUnarmoredPlaintextMessage(OpenPGPApi api)
Expand Down Expand Up @@ -712,6 +713,26 @@ private void incompleteMessageProcessing(OpenPGPApi api)
isFalse(sig.isValid());
}

private void processUnencryptedMessage(OpenPGPApi api)
throws PGPException, IOException
{
ByteArrayOutputStream bOut = new ByteArrayOutputStream();
OpenPGPMessageOutputStream mOut = api.signAndOrEncryptMessage()
.open(bOut);
mOut.write(PLAINTEXT);
mOut.close();

ByteArrayInputStream bIn = new ByteArrayInputStream(bOut.toByteArray());
OpenPGPMessageInputStream mIn = api.decryptAndOrVerifyMessage().process(bIn);
byte[] plain = Streams.readAll(mIn);
mIn.close();
isEncodingEqual(PLAINTEXT, plain);

OpenPGPMessageInputStream.Result result = mIn.getResult();
isTrue(result.getEncryptionMethod().equals(MessageEncryptionMechanism.unencrypted()));
isNull(result.getEncryptionMethod().getMode());
}

private void testVerificationOfSEIPD1MessageWithTamperedCiphertext(OpenPGPApi api)
throws IOException, PGPException
{
Expand Down
Loading