Skip to content

Commit 5989d52

Browse files
committed
Merge branch '1993-secretkeypacket-newpacketformat' into 'main'
SecretKeyPacket: Properly pass newPacketFormat down to PublicKeyPacket See merge request root/bc-java!74
2 parents 2c4f6f8 + fae8c45 commit 5989d52

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pg/src/main/java/org/bouncycastle/bcpg/SecretKeyPacket.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ public class SecretKeyPacket
146146

147147
if (this instanceof SecretSubkeyPacket)
148148
{
149-
pubKeyPacket = new PublicSubkeyPacket(in);
149+
pubKeyPacket = new PublicSubkeyPacket(in, newPacketFormat);
150150
}
151151
else
152152
{
153-
pubKeyPacket = new PublicKeyPacket(in);
153+
pubKeyPacket = new PublicKeyPacket(in, newPacketFormat);
154154
}
155155

156156
int version = pubKeyPacket.getVersion();
@@ -342,7 +342,7 @@ public SecretKeyPacket(
342342
byte[] iv,
343343
byte[] secKeyData)
344344
{
345-
super(keyTag);
345+
super(keyTag, pubKeyPacket.hasNewPacketFormat());
346346

347347
this.pubKeyPacket = pubKeyPacket;
348348
this.encAlgorithm = encAlgorithm;

0 commit comments

Comments
 (0)