OpenPGPKeyGenerator: Allow for empty UserIDs, prevent newlines/CRs

vanitasvitae · vanitasvitae · commit 782cc3bbda99 · 2025-07-15T20:56:44.000+02:00
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKeyGenerator.java b/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKeyGenerator.java
@@ -380,9 +380,13 @@ public WithPrimaryKey addUserId(
             throws PGPException
         {
             // care - needs to run with Java 5.
-            if (userId == null || userId.trim().length() == 0)
+            if (userId == null)
             {
-                throw new IllegalArgumentException("User-ID cannot be null or empty.");
+                throw new IllegalArgumentException("User-ID cannot be null.");
+            }
+            if (userId.contains("\n") || userId.contains("\r"))
+            {
+                throw new IllegalArgumentException("User-ID cannot contain newlines and/or carriage returns.");
             }
 
             SignatureParameters parameters = Utils.applySignatureParameters(signatureParameters,

Original file line number	Diff line number	Diff line change
`@@ -380,9 +380,13 @@ public WithPrimaryKey addUserId(`
`380`	`380`	`throws PGPException`
`381`	`381`	`{`
`382`	`382`	`// care - needs to run with Java 5.`
`383`		`- if (userId == null \|\| userId.trim().length() == 0)`
	`383`	`+ if (userId == null)`
`384`	`384`	`{`
`385`		`- throw new IllegalArgumentException("User-ID cannot be null or empty.");`
	`385`	`+ throw new IllegalArgumentException("User-ID cannot be null.");`
	`386`	`+ }`
	`387`	`+ if (userId.contains("\n") \|\| userId.contains("\r"))`
	`388`	`+ {`
	`389`	`+ throw new IllegalArgumentException("User-ID cannot contain newlines and/or carriage returns.");`
`386`	`390`	`}`
`387`	`391`
`388`	`392`	`SignatureParameters parameters = Utils.applySignatureParameters(signatureParameters,`