PGPSecretKey: Do not append checksum for unencrypted v6 keys

bcgit · Jul 2, 2024 · cea6a81 · cea6a81
1 parent 190aaa5
commit cea6a81
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKey.java b/pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKey.java
@@ -159,11 +159,11 @@ private static SecretKeyPacket buildSecretKeyPacket(boolean isMasterKey, PGPPriv
 
                 return generateSecretKeyPacket(isMasterKey, pubKey.publicPk, encAlgorithm, s2kUsage, s2k, iv, encData);
             }
-            else
+            else if (pubKey.getVersion() != PublicKeyPacket.VERSION_6)
             {
                 pOut.write(checksum(null, keyData, keyData.length));
-                return generateSecretKeyPacket(isMasterKey, pubKey.publicPk, encAlgorithm, bOut.toByteArray());
             }
+            return generateSecretKeyPacket(isMasterKey, pubKey.publicPk, encAlgorithm, bOut.toByteArray());
         }
         catch (PGPException e)
         {