refactoring of context into ParametersWithContext

dghgit · dghgit · commit 32ba114d4d1c · 2024-09-15T09:54:08.000+10:00
diff --git a/core/src/main/java/org/bouncycastle/crypto/params/ParametersWithContext.java b/core/src/main/java/org/bouncycastle/crypto/params/ParametersWithContext.java
@@ -0,0 +1,29 @@
+package org.bouncycastle.crypto.params;
+
+import org.bouncycastle.crypto.CipherParameters;
+import org.bouncycastle.util.Arrays;
+
+public class ParametersWithContext
+    implements CipherParameters
+{
+    private CipherParameters  parameters;
+    private byte[] context;
+
+    public ParametersWithContext(
+        CipherParameters parameters,
+        byte[] context)
+    {
+        this.parameters = parameters;
+        this.context = Arrays.clone(context);
+    }
+
+    public byte[] getContext()
+    {
+        return Arrays.clone(context);
+    }
+
+    public CipherParameters getParameters()
+    {
+        return parameters;
+    }
+}
diff --git a/core/src/main/java/org/bouncycastle/pqc/crypto/mldsa/HashMLDSASigner.java b/core/src/main/java/org/bouncycastle/pqc/crypto/mldsa/HashMLDSASigner.java
@@ -12,13 +12,16 @@
 import org.bouncycastle.crypto.Signer;
 import org.bouncycastle.crypto.digests.SHA512Digest;
 import org.bouncycastle.crypto.digests.SHAKEDigest;
+import org.bouncycastle.crypto.params.ParametersWithContext;
 import org.bouncycastle.crypto.params.ParametersWithRandom;
 import org.bouncycastle.pqc.crypto.DigestUtils;
 import org.bouncycastle.util.Arrays;
 
 public class HashMLDSASigner
     implements Signer
 {
+    private static final byte[] EMPTY_CONTEXT = new byte[0];
+    
     private MLDSAPrivateKeyParameters privKey;
     private MLDSAPublicKeyParameters pubKey;
 
@@ -34,6 +37,23 @@ public HashMLDSASigner()
 
     public void init(boolean forSigning, CipherParameters param)
     {
+        byte[] ctx;
+
+        if (param instanceof ParametersWithContext)
+        {
+            ctx = ((ParametersWithContext)param).getContext();
+            param = ((ParametersWithContext)param).getParameters();
+
+            if (ctx.length > 255)
+            {
+                throw new IllegalArgumentException("context too long");
+            }
+        }
+        else
+        {
+            ctx = EMPTY_CONTEXT;
+        }
+
         if (forSigning)
         {
             if (param instanceof ParametersWithRandom)
@@ -49,12 +69,6 @@ public void init(boolean forSigning, CipherParameters param)
 
             engine = privKey.getParameters().getEngine(this.random);
 
-            byte[] ctx = privKey.getContext();
-            if (ctx.length > 255)
-            {
-                throw new IllegalArgumentException("context too long");
-            }
-
             engine.initSign(privKey.tr, true, ctx);
 
             initDigest(privKey);
@@ -64,13 +78,7 @@ public void init(boolean forSigning, CipherParameters param)
             pubKey = (MLDSAPublicKeyParameters)param;
 
             engine = pubKey.getParameters().getEngine(this.random);
-
-            byte[] ctx = pubKey.getContext();
-            if (ctx.length > 255)
-            {
-                throw new IllegalArgumentException("context too long");
-            }
-
+            
             engine.initVerify(pubKey.rho, pubKey.t1, true, ctx);
 
             initDigest(pubKey);
diff --git a/core/src/main/java/org/bouncycastle/pqc/crypto/mldsa/MLDSAKeyParameters.java b/core/src/main/java/org/bouncycastle/pqc/crypto/mldsa/MLDSAKeyParameters.java
@@ -7,31 +7,16 @@ public class MLDSAKeyParameters
 {
     private final MLDSAParameters params;
 
-    private final byte[] context;
-
-    public MLDSAKeyParameters(boolean isPrivate, MLDSAParameters params, byte[] context)
-    {
-        super(isPrivate);
-        this.params = params;
-        this.context = context;
-    }
-
     public MLDSAKeyParameters(
         boolean isPrivate,
         MLDSAParameters params)
     {
         super(isPrivate);
         this.params = params;
-        this.context = new byte[0];
     }
 
     public MLDSAParameters getParameters()
     {
         return params;
     }
-
-    public byte[] getContext()
-    {
-        return context.clone();
-    }
 }
diff --git a/core/src/main/java/org/bouncycastle/pqc/crypto/mldsa/MLDSASigner.java b/core/src/main/java/org/bouncycastle/pqc/crypto/mldsa/MLDSASigner.java
@@ -7,11 +7,14 @@
 import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.crypto.Signer;
 import org.bouncycastle.crypto.digests.SHAKEDigest;
+import org.bouncycastle.crypto.params.ParametersWithContext;
 import org.bouncycastle.crypto.params.ParametersWithRandom;
 
 public class MLDSASigner
     implements Signer
 {
+    private static final byte[] EMPTY_CONTEXT = new byte[0];
+
     private MLDSAPrivateKeyParameters privKey;
     private MLDSAPublicKeyParameters pubKey;
 
@@ -27,6 +30,23 @@ public MLDSASigner()
     public void init(boolean forSigning, CipherParameters param)
     {
         boolean isPreHash;
+        byte[] ctx;
+
+        if (param instanceof ParametersWithContext)
+        {
+            ctx = ((ParametersWithContext)param).getContext();
+            param = ((ParametersWithContext)param).getParameters();
+
+            if (ctx.length > 255)
+            {
+                throw new IllegalArgumentException("context too long");
+            }
+        }
+        else
+        {
+            ctx = EMPTY_CONTEXT;
+        }
+
 
         if (forSigning)
         {
@@ -43,12 +63,6 @@ public void init(boolean forSigning, CipherParameters param)
 
             engine = privKey.getParameters().getEngine(this.random);
 
-            byte[] ctx = privKey.getContext();
-            if (ctx.length > 255)
-            {
-                throw new IllegalArgumentException("context too long");
-            }
-
             engine.initSign(privKey.tr, false, ctx);
 
             msgDigest = engine.getShake256Digest();
@@ -61,12 +75,6 @@ public void init(boolean forSigning, CipherParameters param)
 
             engine = pubKey.getParameters().getEngine(random);
 
-            byte[] ctx = pubKey.getContext();
-            if (ctx.length > 255)
-            {
-                throw new IllegalArgumentException("context too long");
-            }
-
             engine.initVerify(pubKey.rho, pubKey.t1, false, ctx);
 
             msgDigest = engine.getShake256Digest();
@@ -111,21 +119,21 @@ public boolean verifySignature(byte[] signature)
         boolean isTrue = engine.verifyInternal(signature, signature.length, msgDigest, pubKey.rho, pubKey.t1);
 
         reset();
-                                                 
+
         return isTrue;
     }
 
     public void reset()
     {
         msgDigest = engine.getShake256Digest();
     }
-    
+
     protected byte[] internalGenerateSignature(byte[] message, byte[] random)
     {
         MLDSAEngine engine = privKey.getParameters().getEngine(this.random);
 
         engine.initSign(privKey.tr, false, null);
-        
+
         return engine.signInternal(message, message.length, privKey.rho, privKey.k, privKey.t0, privKey.s1, privKey.s2, random);
     }
 
diff --git a/core/src/main/java/org/bouncycastle/pqc/crypto/slhdsa/HashSLHDSASigner.java b/core/src/main/java/org/bouncycastle/pqc/crypto/slhdsa/HashSLHDSASigner.java
@@ -13,6 +13,7 @@
 import org.bouncycastle.crypto.digests.SHA256Digest;
 import org.bouncycastle.crypto.digests.SHA512Digest;
 import org.bouncycastle.crypto.digests.SHAKEDigest;
+import org.bouncycastle.crypto.params.ParametersWithContext;
 import org.bouncycastle.crypto.params.ParametersWithRandom;
 import org.bouncycastle.pqc.crypto.DigestUtils;
 import org.bouncycastle.util.Arrays;
@@ -23,6 +24,8 @@
 public class HashSLHDSASigner
     implements Signer
 {
+    private static final byte[] EMPTY_CONTEXT = new byte[0];
+
     private SLHDSAPrivateKeyParameters privKey;
     private SLHDSAPublicKeyParameters pubKey;
     private byte[] ctx;
@@ -36,6 +39,21 @@ public HashSLHDSASigner()
 
     public void init(boolean forSigning, CipherParameters param)
     {
+        if (param instanceof ParametersWithContext)
+        {
+            ctx = ((ParametersWithContext)param).getContext();
+            param = ((ParametersWithContext)param).getParameters();
+
+            if (ctx.length > 255)
+            {
+                throw new IllegalArgumentException("context too long");
+            }
+        }
+        else
+        {
+            ctx = EMPTY_CONTEXT;
+        }
+
         if (forSigning)
         {
             if (param instanceof ParametersWithRandom)
@@ -48,26 +66,12 @@ public void init(boolean forSigning, CipherParameters param)
                 privKey = (SLHDSAPrivateKeyParameters)param;
             }
 
-            ctx = privKey.getContext();
-
-            if (ctx.length > 255)
-            {
-                throw new IllegalArgumentException("context too long");
-            }
-
             initDigest(privKey);
         }
         else
         {
             pubKey = (SLHDSAPublicKeyParameters)param;
-
-            ctx = pubKey.getContext();
-
-            if (ctx.length > 255)
-            {
-                throw new IllegalArgumentException("context too long");
-            }
-
+            
             initDigest(pubKey);
         }
 
diff --git a/core/src/main/java/org/bouncycastle/pqc/crypto/slhdsa/SLHDSAKeyParameters.java b/core/src/main/java/org/bouncycastle/pqc/crypto/slhdsa/SLHDSAKeyParameters.java
@@ -6,29 +6,15 @@ public class SLHDSAKeyParameters
     extends AsymmetricKeyParameter
 {
     final SLHDSAParameters parameters;
-    final byte[] context;
-
-    protected SLHDSAKeyParameters(boolean isPrivate, SLHDSAParameters parameters, byte[] context)
-    {
-        super(isPrivate);
-        this.parameters = parameters;
-        this.context = context;
-    }
 
     protected SLHDSAKeyParameters(boolean isPrivate, SLHDSAParameters parameters)
     {
         super(isPrivate);
         this.parameters = parameters;
-        this.context = new byte[0];
     }
 
     public SLHDSAParameters getParameters()
     {
         return parameters;
     }
-
-    public byte[] getContext()
-    {
-        return context.clone();
-    }
 }
diff --git a/core/src/main/java/org/bouncycastle/pqc/crypto/slhdsa/SLHDSASigner.java b/core/src/main/java/org/bouncycastle/pqc/crypto/slhdsa/SLHDSASigner.java

Original file line number	Diff line number	Diff line change
`@@ -7,31 +7,16 @@ public class MLDSAKeyParameters`
`7`	`7`	`{`
`8`	`8`	`private final MLDSAParameters params;`
`9`	`9`
`10`		`- private final byte[] context;`
`11`		`-`
`12`		`- public MLDSAKeyParameters(boolean isPrivate, MLDSAParameters params, byte[] context)`
`13`		`- {`
`14`		`- super(isPrivate);`
`15`		`- this.params = params;`
`16`		`- this.context = context;`
`17`		`- }`
`18`		`-`
`19`	`10`	`public MLDSAKeyParameters(`
`20`	`11`	`boolean isPrivate,`
`21`	`12`	`MLDSAParameters params)`
`22`	`13`	`{`
`23`	`14`	`super(isPrivate);`
`24`	`15`	`this.params = params;`
`25`		`- this.context = new byte[0];`
`26`	`16`	`}`
`27`	`17`
`28`	`18`	`public MLDSAParameters getParameters()`
`29`	`19`	`{`
`30`	`20`	`return params;`
`31`	`21`	`}`
`32`		`-`
`33`		`- public byte[] getContext()`
`34`		`- {`
`35`		`- return context.clone();`
`36`		`- }`
`37`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,29 +6,15 @@ public class SLHDSAKeyParameters`
`6`	`6`	`extends AsymmetricKeyParameter`
`7`	`7`	`{`
`8`	`8`	`final SLHDSAParameters parameters;`
`9`		`- final byte[] context;`
`10`		`-`
`11`		`- protected SLHDSAKeyParameters(boolean isPrivate, SLHDSAParameters parameters, byte[] context)`
`12`		`- {`
`13`		`- super(isPrivate);`
`14`		`- this.parameters = parameters;`
`15`		`- this.context = context;`
`16`		`- }`
`17`	`9`
`18`	`10`	`protected SLHDSAKeyParameters(boolean isPrivate, SLHDSAParameters parameters)`
`19`	`11`	`{`
`20`	`12`	`super(isPrivate);`
`21`	`13`	`this.parameters = parameters;`
`22`		`- this.context = new byte[0];`
`23`	`14`	`}`
`24`	`15`
`25`	`16`	`public SLHDSAParameters getParameters()`
`26`	`17`	`{`
`27`	`18`	`return parameters;`
`28`	`19`	`}`
`29`		`-`
`30`		`- public byte[] getContext()`
`31`		`- {`
`32`		`- return context.clone();`
`33`		`- }`
`34`	`20`	`}`