Skip to content

Commit 2ef5673

Browse files
committed
added coverage for getPublicData method.
updated test vectors in SLHDSATest following RNG fix.
1 parent 326914b commit 2ef5673

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

prov/src/test/java/org/bouncycastle/pqc/jcajce/provider/test/MLDSAKeyPairGeneratorTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
1010
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
1111
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
12+
import org.bouncycastle.jcajce.interfaces.MLDSAPrivateKey;
13+
import org.bouncycastle.jcajce.interfaces.MLDSAPublicKey;
1214
import org.bouncycastle.jcajce.spec.MLDSAParameterSpec;
1315
import org.bouncycastle.jce.provider.BouncyCastleProvider;
14-
import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
16+
import org.bouncycastle.util.Arrays;
1517

1618
/**
1719
* KeyFactory/KeyPairGenerator tests for MLDSA with BC provider.
@@ -104,6 +106,7 @@ public void testKeyPairEncoding()
104106
KeyPair keyPair = kpg.generateKeyPair();
105107
performKeyPairEncodingTest(keyPair);
106108
assertEquals(oids[i], SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded()).getAlgorithm().getAlgorithm());
109+
assertTrue(oids[i].toString(), Arrays.areEqual(((MLDSAPublicKey)keyPair.getPublic()).getPublicData(), ((MLDSAPrivateKey)keyPair.getPrivate()).getPublicKey().getPublicData()));
107110
}
108111
}
109112

prov/src/test/java/org/bouncycastle/pqc/jcajce/provider/test/MLKEMKeyPairGeneratorTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
1111
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
1212
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
13+
import org.bouncycastle.jcajce.interfaces.MLKEMPrivateKey;
14+
import org.bouncycastle.jcajce.interfaces.MLKEMPublicKey;
1315
import org.bouncycastle.jcajce.spec.MLKEMParameterSpec;
1416
import org.bouncycastle.jce.provider.BouncyCastleProvider;
17+
import org.bouncycastle.util.Arrays;
1518

1619
/**
1720
* KeyFactory/KeyPairGenerator tests for MLKEM with BCPQC provider.
@@ -61,6 +64,7 @@ public void testKeyPairEncoding()
6164
KeyPair keyPair = kpg.generateKeyPair();
6265
performKeyPairEncodingTest(keyPair);
6366
assertEquals(oids[i], SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded()).getAlgorithm().getAlgorithm());
67+
assertTrue(oids[i].toString(), Arrays.areEqual(((MLKEMPublicKey)keyPair.getPublic()).getPublicData(), ((MLKEMPrivateKey)keyPair.getPrivate()).getPublicKey().getPublicData()));
6468
}
6569
}
6670

prov/src/test/java/org/bouncycastle/pqc/jcajce/provider/test/SLHDSAKeyPairGeneratorTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
1414
import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
1515
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
16+
import org.bouncycastle.jcajce.interfaces.SLHDSAPrivateKey;
17+
import org.bouncycastle.jcajce.interfaces.SLHDSAPublicKey;
1618
import org.bouncycastle.jcajce.spec.SLHDSAParameterSpec;
1719
import org.bouncycastle.jce.provider.BouncyCastleProvider;
1820
import org.bouncycastle.util.Arrays;
@@ -150,6 +152,7 @@ public void testKeyPairEncoding()
150152
KeyPair keyPair = kpg.generateKeyPair();
151153
performKeyPairEncodingTest(keyPair);
152154
assertEquals(oids[i], SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded()).getAlgorithm().getAlgorithm());
155+
assertTrue(oids[i].toString(), Arrays.areEqual(((SLHDSAPublicKey)keyPair.getPublic()).getPublicData(), ((SLHDSAPrivateKey)keyPair.getPrivate()).getPublicKey().getPublicData()));
153156
}
154157
}
155158

prov/src/test/java/org/bouncycastle/pqc/jcajce/provider/test/SLHDSATest.java

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)