WIP

pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeyRingBuilder.kt

@@ -45,6 +45,9 @@ class KeyRingBuilder : KeyRingBuilderInterface<KeyRingBuilder> {
     }
 
     override fun addUserId(userId: CharSequence): KeyRingBuilder = apply {
+        require(!userId.contains("\n") && !userId.contains("\r")) {
+            "User-ID cannot contain newlines and/or carriage returns."
+        }
         userIds[userId.toString()] = null
     }
 

pgpainless-core/src/main/kotlin/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditor.kt

@@ -569,10 +569,11 @@ class SecretKeyRingEditor(
     }
 
     private fun sanitizeUserId(userId: CharSequence): CharSequence =
-        // I'm not sure, what kind of sanitization is needed.
+        userId.toString().also {
-        // Newlines are allowed, they just need to be escaped when emitted in an ASCII armor header
+            require(!it.contains("\n") && !it.contains("\r")) {
-        // Trailing/Leading whitespace is also fine.
+                "UserId cannot contain newlines and/or carriage returns."
-        userId.toString()
+            }
+        }
 
     private fun callbackFromRevocationAttributes(attributes: RevocationAttributes?) =
         object : RevocationSignatureSubpackets.Callback {

pgpainless-core/src/main/kotlin/org/pgpainless/util/ArmorUtils.kt

@@ -247,8 +247,7 @@ class ArmorUtils {
                 .add(OpenPgpFingerprint.of(publicKey).prettyPrint())
             // Primary / First User ID
             (primary ?: first)?.let {
-                headerMap.getOrPut(HEADER_COMMENT) { mutableSetOf() }
+                headerMap.getOrPut(HEADER_COMMENT) { mutableSetOf() }.add(it)
-                    .add(it.replace("\n", "\\n").replace("\r", "\\r"))
             }
             // X-1 further identities
             when (userIds.size) {

pgpainless-core/src/main/kotlin/org/pgpainless/util/Passphrase.kt

@@ -11,9 +11,14 @@ import org.bouncycastle.util.Arrays
  *
  * @param chars may be null for empty passwords.
  */
-class Passphrase(private val chars: CharArray?) {
+class Passphrase(chars: CharArray?) {
     private val lock = Any()
     private var valid = true
+    private val chars: CharArray?
+
+    init {
+        this.chars = chars;//trimWhitespace(chars)
+    }
 
     /**
      * Return a copy of the underlying char array. A return value of null represents an empty
@@ -62,11 +67,6 @@ class Passphrase(private val chars: CharArray?) {
 
     override fun hashCode(): Int = getChars()?.let { String(it) }.hashCode()
 
-    /**
-     * Return a copy of this [Passphrase], but with whitespace characters trimmed off.
-     *
-     * @return copy with trimmed whitespace
-     */
     fun withTrimmedWhitespace(): Passphrase = Passphrase(trimWhitespace(chars))
 
     companion object {

pgpainless-sop/src/test/java/org/pgpainless/sop/GenerateKeyTest.java

@@ -100,14 +100,4 @@ public class GenerateKeyTest {
         assertThrows(SOPGPException.UnsupportedProfile.class, () ->
                 sop.generateKey().profile("invalid"));
     }
-
-    @Test
-    public void generateKeyWithNewlinesInUserId() throws IOException {
-        byte[] keyBytes = sop.generateKey()
-                .userId("Foo\n\nBar")
-                .generate()
-                .getBytes();
-
-        assertTrue(new String(keyBytes).contains("Foo\\n\\nBar"));
-    }
 }