Skip to content

Commit 36814dd

Browse files
committed
added null test for ContextParameterSpec
1 parent 897bf35 commit 36814dd

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/BaseDeterministicOrRandomSignature.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ public abstract class BaseDeterministicOrRandomSignature
3434
protected BaseDeterministicOrRandomSignature(String name)
3535
{
3636
super(name);
37-
this.originalSpec = null;
37+
this.originalSpec = ContextParameterSpec.EMPTY_CONTEXT_SPEC;
3838
}
3939

4040
final protected void engineInitVerify(PublicKey publicKey)
4141
throws InvalidKeyException
4242
{
4343
verifyInit(publicKey);
44-
paramSpec = null;
44+
paramSpec = ContextParameterSpec.EMPTY_CONTEXT_SPEC;
4545
isInitState = true;
4646
reInit();
4747
}
@@ -53,7 +53,7 @@ final protected void engineInitSign(
5353
throws InvalidKeyException
5454
{
5555
signInit(privateKey, null);
56-
paramSpec = null;
56+
paramSpec = ContextParameterSpec.EMPTY_CONTEXT_SPEC;
5757
isInitState = true;
5858
reInit();
5959
}
@@ -64,7 +64,7 @@ final protected void engineInitSign(
6464
throws InvalidKeyException
6565
{
6666
signInit(privateKey, random);
67-
paramSpec = null;
67+
paramSpec = ContextParameterSpec.EMPTY_CONTEXT_SPEC;
6868
isInitState = true;
6969
reInit();
7070
}

prov/src/main/java/org/bouncycastle/jcajce/spec/ContextParameterSpec.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
public class ContextParameterSpec
88
implements AlgorithmParameterSpec
99
{
10+
public static ContextParameterSpec EMPTY_CONTEXT_SPEC = new ContextParameterSpec(new byte[0]);
11+
1012
private final byte[] context;
1113

1214
public ContextParameterSpec(byte[] context)

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,12 @@ public void testHashMLDSAKATSig()
529529
sig.update(msg, 0, msg.length);
530530

531531
assertTrue(sig.verify(genS));
532+
533+
AlgorithmParameters algP = sig.getParameters();
534+
535+
ContextParameterSpec cSpec = algP.getParameterSpec(ContextParameterSpec.class);
536+
537+
assertTrue(Arrays.areEqual(new byte[0], cSpec.getContext()));
532538
}
533539

534540
public void testHashMLDSAKATSigWithContext()

0 commit comments

Comments
 (0)