Properly encode anonymous PKESKv6 packets

vanitasvitae · vanitasvitae · commit f310da4f5e67 · 2024-12-09T15:13:34.000+01:00
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/PublicKeyEncSessionPacket.java b/pg/src/main/java/org/bouncycastle/bcpg/PublicKeyEncSessionPacket.java
@@ -276,9 +276,16 @@ public void encode(
         }
         else if (version == VERSION_6)
         {
-            pOut.write(keyFingerprint.length + 1);
-            pOut.write(keyVersion);
-            pOut.write(keyFingerprint);
+            if (keyFingerprint.length != 0)
+            {
+                pOut.write(keyFingerprint.length + 1);
+                pOut.write(keyVersion);
+                pOut.write(keyFingerprint);
+            }
+            else
+            {
+                pOut.write(0);
+            }
         }
 
         pOut.write(algorithm);

Original file line number	Diff line number	Diff line change
`@@ -276,9 +276,16 @@ public void encode(`
`276`	`276`	`}`
`277`	`277`	`else if (version == VERSION_6)`
`278`	`278`	`{`
`279`		`- pOut.write(keyFingerprint.length + 1);`
`280`		`- pOut.write(keyVersion);`
`281`		`- pOut.write(keyFingerprint);`
	`279`	`+ if (keyFingerprint.length != 0)`
	`280`	`+ {`
	`281`	`+ pOut.write(keyFingerprint.length + 1);`
	`282`	`+ pOut.write(keyVersion);`
	`283`	`+ pOut.write(keyFingerprint);`
	`284`	`+ }`
	`285`	`+ else`
	`286`	`+ {`
	`287`	`+ pOut.write(0);`
	`288`	`+ }`
`282`	`289`	`}`
`283`	`290`
`284`	`291`	`pOut.write(algorithm);`