From fe81af4702939cb75a1032c2f653abb0cb31d1a7 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 30 May 2025 12:48:24 +0200
Subject: [PATCH 1/2] Add Profile.withAliases() utility function

---
 sop-java/src/main/kotlin/sop/Profile.kt     | 10 ++++++++++
 sop-java/src/test/java/sop/ProfileTest.java | 14 ++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/sop-java/src/main/kotlin/sop/Profile.kt b/sop-java/src/main/kotlin/sop/Profile.kt
index 725bbe5..fd58c63 100644
--- a/sop-java/src/main/kotlin/sop/Profile.kt
+++ b/sop-java/src/main/kotlin/sop/Profile.kt
@@ -50,6 +50,16 @@ data class Profile(
 
     fun hasDescription() = description.isPresent
 
+    /**
+     * Return a copy of this [Profile] with the aliases set to the given strings.
+     *
+     * @param alias one or more alias names
+     * @return profile with aliases
+     */
+    fun withAliases(vararg alias: String): Profile {
+        return Profile(name, description, alias.toList())
+    }
+
     /**
      * Convert the profile into a String for displaying.
      *
diff --git a/sop-java/src/test/java/sop/ProfileTest.java b/sop-java/src/test/java/sop/ProfileTest.java
index 41b4a2f..f418672 100644
--- a/sop-java/src/test/java/sop/ProfileTest.java
+++ b/sop-java/src/test/java/sop/ProfileTest.java
@@ -39,6 +39,20 @@ public class ProfileTest {
         assertEquals(Arrays.asList("Bar", "Baz"), profile.getAliases());
     }
 
+    @Test
+    public void changeAliasesWithWithAliases() {
+        Profile p = new Profile("Foo", "Bar any Baz", Arrays.asList("tinitus", "particle"));
+        p = p.withAliases("fnord", "qbit");
+
+        assertEquals("Foo", p.getName());
+        assertEquals("Bar any Baz", p.getDescription().get());
+
+        assertTrue(p.getAliases().contains("fnord"));
+        assertTrue(p.getAliases().contains("qbit"));
+        assertFalse(p.getAliases().contains("tinitus"));
+        assertFalse(p.getAliases().contains("particle"));
+    }
+
     @Test
     public void toStringNameOnly() {
         Profile profile = new Profile("default");

From c2114dcd5a1308e40a05ae8fea62d562c5a31a8d Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 30 May 2025 15:05:44 +0200
Subject: [PATCH 2/2] Add test for encrypt-decrypt using all available
 generate-key profiles

---
 .../operation/EncryptDecryptTest.java         | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/sop-java-testfixtures/src/main/java/sop/testsuite/operation/EncryptDecryptTest.java b/sop-java-testfixtures/src/main/java/sop/testsuite/operation/EncryptDecryptTest.java
index df824ca..330ca90 100644
--- a/sop-java-testfixtures/src/main/java/sop/testsuite/operation/EncryptDecryptTest.java
+++ b/sop-java-testfixtures/src/main/java/sop/testsuite/operation/EncryptDecryptTest.java
@@ -11,12 +11,15 @@ import org.junit.jupiter.params.provider.MethodSource;
 import sop.ByteArrayAndResult;
 import sop.DecryptionResult;
 import sop.EncryptionResult;
+import sop.Profile;
 import sop.SOP;
 import sop.SessionKey;
 import sop.Verification;
 import sop.enums.EncryptAs;
 import sop.enums.SignatureMode;
 import sop.exception.SOPGPException;
+import sop.operation.Decrypt;
+import sop.operation.Encrypt;
 import sop.testsuite.TestData;
 import sop.testsuite.assertions.VerificationListAssert;
 import sop.util.Optional;
@@ -25,6 +28,7 @@ import sop.util.UTCUtil;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Stream;
@@ -338,4 +342,55 @@ public class EncryptDecryptTest extends AbstractSOPTest {
                         .toByteArrayAndResult()
                         .getBytes());
     }
+
+    @ParameterizedTest
+    @MethodSource("provideInstances")
+    public void encryptDecryptWithAllSupportedKeyGenerationProfiles(SOP sop) throws IOException {
+        List<Profile> profiles = sop.listProfiles().generateKey();
+
+        List<byte[]> keys = new ArrayList<>();
+        List<byte[]> certs = new ArrayList<>();
+        for (Profile p : profiles) {
+            byte[] k = sop.generateKey()
+                    .profile(p)
+                    .userId(p.getName())
+                    .generate()
+                    .getBytes();
+            keys.add(k);
+
+            byte[] c = sop.extractCert()
+                    .key(k)
+                    .getBytes();
+            certs.add(c);
+        }
+
+        byte[] plaintext = "Hello, World!\n".getBytes();
+
+        Encrypt encrypt = sop.encrypt();
+        for (byte[] c : certs) {
+            encrypt.withCert(c);
+        }
+        for (byte[] k : keys) {
+            encrypt.signWith(k);
+        }
+
+        ByteArrayAndResult<EncryptionResult> encRes = encrypt.plaintext(plaintext)
+                .toByteArrayAndResult();
+        EncryptionResult eResult = encRes.getResult();
+        byte[] ciphertext = encRes.getBytes();
+
+        for (byte[] k : keys) {
+            Decrypt decrypt = sop.decrypt()
+                    .withKey(k);
+            for (byte[] c : certs) {
+                decrypt.verifyWithCert(c);
+            }
+            ByteArrayAndResult<DecryptionResult> decRes = decrypt.ciphertext(ciphertext)
+                    .toByteArrayAndResult();
+            DecryptionResult dResult = decRes.getResult();
+            byte[] decPlaintext = decRes.getBytes();
+            assertArrayEquals(plaintext, decPlaintext);
+            assertEquals(certs.size(), dResult.getVerifications().size());
+        }
+    }
 }