PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-12-05 03:41:07 +01:00
Code Issues Releases Wiki Activity

sop encrypt: Use SEIPDv1 for symmetric-only encryption by default

Browse source
This commit is contained in:
Paul Schaub 2025-11-04 20:04:53 +01:00
parent 5faf04ae4b
commit 2cb41ae2e8
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pgpainless-core/src/main/kotlin/org/pgpainless/algorithm/negotiation/EncryptionMechanismNegotiator.kt
View file

@ -41,6 +41,10 @@ fun interface EncryptionMechanismNegotiator {
return override return override
} }
if (features.isEmpty()) {
return policy.messageEncryptionAlgorithmPolicy.symmetricFallbackMechanism
}
// If all support SEIPD2, use SEIPD2 // If all support SEIPD2, use SEIPD2
if (features.all { it.contains(Feature.MODIFICATION_DETECTION_2) }) { if (features.all { it.contains(Feature.MODIFICATION_DETECTION_2) }) {
// Find best supported algorithm combination // Find best supported algorithm combination

32
pgpainless-sop/src/test/java/org/pgpainless/sop/EncryptDecryptRoundTripTest.java
View file

@ -9,14 +9,24 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags;
import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.api.MessageEncryptionMechanism;
import org.bouncycastle.util.io.Streams; import org.bouncycastle.util.io.Streams;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.pgpainless.PGPainless;
import org.pgpainless.decryption_verification.ConsumerOptions;
import org.pgpainless.decryption_verification.DecryptionStream;
import org.pgpainless.decryption_verification.MessageMetadata;
import org.pgpainless.encryption_signing.EncryptionStream;
import org.pgpainless.util.Passphrase;
import sop.ByteArrayAndResult; import sop.ByteArrayAndResult;
import sop.DecryptionResult; import sop.DecryptionResult;
import sop.SOP; import sop.SOP;
@ -116,7 +126,7 @@ public class EncryptDecryptRoundTripTest {
} }
@Test @Test
public void basicRoundTripWithPassword() throws IOException { public void basicRoundTripWithPassword() throws IOException, PGPException {
byte[] encrypted = sop.encrypt() byte[] encrypted = sop.encrypt()
.withPassword("passphr4s3") .withPassword("passphr4s3")
.plaintext(message) .plaintext(message)
@ -136,6 +146,26 @@ public class EncryptDecryptRoundTripTest {
.isEmpty(); .isEmpty();
} }
@Test
public void verifySymmetricMessageEncryptionUsesSEIPDv1WithAES128() throws IOException, PGPException {
byte[] encrypted = sop.encrypt()
.withPassword("passphr4s3")
.plaintext(message)
.toByteArrayAndResult()
.getBytes();
// Verify encryption mechanism
DecryptionStream decIn = PGPainless.getInstance().processMessage()
.onInputStream(new ByteArrayInputStream(encrypted))
.withOptions(ConsumerOptions.get().addMessagePassphrase(Passphrase.fromPassword("passphr4s3")));
Streams.drain(decIn);
decIn.close();
MessageMetadata metadata = decIn.getMetadata();
assertEquals(
MessageEncryptionMechanism.integrityProtected(SymmetricKeyAlgorithmTags.AES_128),
metadata.getEncryptionMechanism());
}
@Test @Test
public void roundTripWithDecryptionPasswordContainingWhitespace() throws IOException { public void roundTripWithDecryptionPasswordContainingWhitespace() throws IOException {
ByteArrayAndResult<DecryptionResult> bytesAndResult = sop.decrypt() ByteArrayAndResult<DecryptionResult> bytesAndResult = sop.decrypt()