DedicatedEd25519KeyPairTest: Use versioned constructor

bcgit · Jun 4, 2024 · 190aaa5 · 190aaa5
1 parent 9f3e116
commit 190aaa5
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/DedicatedEd25519KeyPairTest.java b/pg/src/test/java/org/bouncycastle/openpgp/test/DedicatedEd25519KeyPairTest.java
@@ -48,7 +48,7 @@ private void testConversionOfJcaKeyPair()
         gen.initialize(new EdDSAParameterSpec("Ed25519"));
         KeyPair kp = gen.generateKeyPair();
 
-        JcaPGPKeyPair j1 = new JcaPGPKeyPair(PublicKeyAlgorithmTags.Ed25519, kp, date);
+        JcaPGPKeyPair j1 = new JcaPGPKeyPair(PublicKeyPacket.VERSION_4, PublicKeyAlgorithmTags.Ed25519, kp, date);
         byte[] pubEnc = j1.getPublicKey().getEncoded();
         byte[] privEnc = j1.getPrivateKey().getPrivateKeyDataPacket().getEncoded();
         isTrue("Dedicated Ed25519 public key MUST be instanceof Ed25519PublicBCPGKey",
@@ -92,7 +92,7 @@ private void testConversionOfBcKeyPair()
         gen.init(new Ed25519KeyGenerationParameters(new SecureRandom()));
         AsymmetricCipherKeyPair kp = gen.generateKeyPair();
 
-        BcPGPKeyPair b1 = new BcPGPKeyPair(PublicKeyAlgorithmTags.Ed25519, kp, date);
+        BcPGPKeyPair b1 = new BcPGPKeyPair(PublicKeyPacket.VERSION_4, PublicKeyAlgorithmTags.Ed25519, kp, date);
         byte[] pubEnc = b1.getPublicKey().getEncoded();
         byte[] privEnc = b1.getPrivateKey().getPrivateKeyDataPacket().getEncoded();
         isTrue("Dedicated Ed25519 public key MUST be instanceof Ed25519PublicBCPGKey",
@@ -136,18 +136,18 @@ private void testConversionOfTestVectorKey() throws PGPException, IOException {
         Date creationTime = new Date(Pack.bigEndianToInt(Hex.decode("63877fe3"), 0) * 1000L);
         byte[] k = Hex.decode("f94da7bb48d60a61e567706a6587d0331999bb9d891a08242ead84543df895a3");
         PGPPublicKey v4k = new PGPPublicKey(
-                new PublicKeyPacket(PublicKeyAlgorithmTags.Ed25519, creationTime, new Ed25519PublicBCPGKey(k)),
+                new PublicKeyPacket(PublicKeyPacket.VERSION_4, PublicKeyAlgorithmTags.Ed25519, creationTime, new Ed25519PublicBCPGKey(k)),
                 new BcKeyFingerprintCalculator()
         );
 
         // convert parsed key to Jca public key
         PublicKey jcpk = jc.getPublicKey(v4k);
-        PGPPublicKey jck = jc.getPGPPublicKey(PublicKeyAlgorithmTags.Ed25519, jcpk, creationTime);
+        PGPPublicKey jck = jc.getPGPPublicKey(PublicKeyPacket.VERSION_4, PublicKeyAlgorithmTags.Ed25519, jcpk, creationTime);
         isEncodingEqual(v4k.getEncoded(), jck.getEncoded());
 
         // convert parsed key to Bc public key
         AsymmetricKeyParameter bcpk = bc.getPublicKey(v4k);
-        PGPPublicKey bck = bc.getPGPPublicKey(PublicKeyAlgorithmTags.Ed25519, null, bcpk, creationTime);
+        PGPPublicKey bck = bc.getPGPPublicKey(PublicKeyPacket.VERSION_4, PublicKeyAlgorithmTags.Ed25519, null, bcpk, creationTime);
         isEncodingEqual(v4k.getEncoded(), bck.getEncoded());
     }