PGPSecretKey: Properly initialize PGPSignatureGenerator, adding support for v6

vanitasvitae · vanitasvitae · commit 16aeb76c584c · 2025-06-16T12:45:10.000+02:00
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKey.java b/pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKey.java
@@ -293,7 +293,7 @@ public PGPSecretKey(
         //
         // generate the certification
         //
-        PGPSignatureGenerator sGen = new PGPSignatureGenerator(certificationSignerBuilder);
+        PGPSignatureGenerator sGen = new PGPSignatureGenerator(certificationSignerBuilder, masterKeyPair.getPublicKey());
 
         sGen.init(PGPSignature.SUBKEY_BINDING, masterKeyPair.getPrivateKey());
 
@@ -302,7 +302,7 @@ public PGPSecretKey(
         {
             if (hashedPcks == null)
             {
-                PGPSignatureGenerator signatureGenerator = new PGPSignatureGenerator(certificationSignerBuilder);
+                PGPSignatureGenerator signatureGenerator = new PGPSignatureGenerator(certificationSignerBuilder, keyPair.getPublicKey());
 
                 signatureGenerator.init(PGPSignature.PRIMARYKEY_BINDING, keyPair.getPrivateKey());
 
@@ -382,7 +382,7 @@ private static PGPPublicKey certifiedPublicKey(
 
         try
         {
-            sGen = new PGPSignatureGenerator(certificationSignerBuilder);
+            sGen = new PGPSignatureGenerator(certificationSignerBuilder, keyPair.getPublicKey());
         }
         catch (Exception e)
         {

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ public PGPSecretKey(`
`293`	`293`	`//`
`294`	`294`	`// generate the certification`
`295`	`295`	`//`
`296`		`- PGPSignatureGenerator sGen = new PGPSignatureGenerator(certificationSignerBuilder);`
	`296`	`+ PGPSignatureGenerator sGen = new PGPSignatureGenerator(certificationSignerBuilder, masterKeyPair.getPublicKey());`
`297`	`297`
`298`	`298`	`sGen.init(PGPSignature.SUBKEY_BINDING, masterKeyPair.getPrivateKey());`
`299`	`299`
`@@ -302,7 +302,7 @@ public PGPSecretKey(`
`302`	`302`	`{`
`303`	`303`	`if (hashedPcks == null)`
`304`	`304`	`{`
`305`		`- PGPSignatureGenerator signatureGenerator = new PGPSignatureGenerator(certificationSignerBuilder);`
	`305`	`+ PGPSignatureGenerator signatureGenerator = new PGPSignatureGenerator(certificationSignerBuilder, keyPair.getPublicKey());`
`306`	`306`
`307`	`307`	`signatureGenerator.init(PGPSignature.PRIMARYKEY_BINDING, keyPair.getPrivateKey());`
`308`	`308`
`@@ -382,7 +382,7 @@ private static PGPPublicKey certifiedPublicKey(`
`382`	`382`
`383`	`383`	`try`
`384`	`384`	`{`
`385`		`- sGen = new PGPSignatureGenerator(certificationSignerBuilder);`
	`385`	`+ sGen = new PGPSignatureGenerator(certificationSignerBuilder, keyPair.getPublicKey());`
`386`	`386`	`}`
`387`	`387`	`catch (Exception e)`
`388`	`388`	`{`