Fix key-id derivation in PKESKv6 packets

vanitasvitae · vanitasvitae · commit c4fe47831ea8 · 2024-08-10T12:23:02.000+02:00
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/PublicKeyEncSessionPacket.java b/pg/src/main/java/org/bouncycastle/bcpg/PublicKeyEncSessionPacket.java
@@ -60,12 +60,23 @@ else if (version == VERSION_6)
                 // anon recipient
                 keyVersion = 0;
                 keyFingerprint = new byte[0];
+                keyID = 0L;
             }
             else
             {
                 keyVersion = in.read();
                 keyFingerprint = new byte[keyInfoLen - 1];
                 in.readFully(keyFingerprint);
+                // Derived key-ID from fingerprint
+                // TODO: Replace with getKeyIdentifier
+                if (keyVersion == PublicKeyPacket.VERSION_4)
+                {
+                    keyID = FingerprintUtil.keyIdFromV4Fingerprint(keyFingerprint);
+                }
+                else
+                {
+                    keyID = FingerprintUtil.keyIdFromV6Fingerprint(keyFingerprint);
+                }
             }
         }
         else

Original file line number	Diff line number	Diff line change
`@@ -60,12 +60,23 @@ else if (version == VERSION_6)`
`60`	`60`	`// anon recipient`
`61`	`61`	`keyVersion = 0;`
`62`	`62`	`keyFingerprint = new byte[0];`
	`63`	`+ keyID = 0L;`
`63`	`64`	`}`
`64`	`65`	`else`
`65`	`66`	`{`
`66`	`67`	`keyVersion = in.read();`
`67`	`68`	`keyFingerprint = new byte[keyInfoLen - 1];`
`68`	`69`	`in.readFully(keyFingerprint);`
	`70`	`+ // Derived key-ID from fingerprint`
	`71`	`+ // TODO: Replace with getKeyIdentifier`
	`72`	`+ if (keyVersion == PublicKeyPacket.VERSION_4)`
	`73`	`+ {`
	`74`	`+ keyID = FingerprintUtil.keyIdFromV4Fingerprint(keyFingerprint);`
	`75`	`+ }`
	`76`	`+ else`
	`77`	`+ {`
	`78`	`+ keyID = FingerprintUtil.keyIdFromV6Fingerprint(keyFingerprint);`
	`79`	`+ }`
`69`	`80`	`}`
`70`	`81`	`}`
`71`	`82`	`else`