Use FixedPointCombMultiplier for most base-point multiplications

2 files changed, 166 insertions, 163 deletions

diff --git a/core/src/main/java/org/bouncycastle/crypto/signers/DSTU4145Signer.java b/core/src/main/java/org/bouncycastle/crypto/signers/DSTU4145Signer.java
index bcc4edf2..0a3ef37f 100644
--- a/core/src/main/java/org/bouncycastle/crypto/signers/DSTU4145Signer.java
+++ b/core/src/main/java/org/bouncycastle/crypto/signers/DSTU4145Signer.java
@@ -13,7 +13,9 @@ import org.bouncycastle.crypto.params.ParametersWithRandom;
 import org.bouncycastle.math.ec.ECAlgorithms;
 import org.bouncycastle.math.ec.ECCurve;
 import org.bouncycastle.math.ec.ECFieldElement;
+import org.bouncycastle.math.ec.ECMultiplier;
 import org.bouncycastle.math.ec.ECPoint;
+import org.bouncycastle.math.ec.FixedPointCombMultiplier;
 import org.bouncycastle.util.Arrays;
 
 /**
@@ -57,9 +59,9 @@ public class DSTU4145Signer
 
     public BigInteger[] generateSignature(byte[] message)
     {
-        ECDomainParameters parameters = key.getParameters();
+        ECDomainParameters ec = key.getParameters();
 
-        ECCurve curve = parameters.getCurve();
+        ECCurve curve = ec.getCurve();
 
         ECFieldElement h = hash2FieldElement(curve, message);
         if (h.isZero())
@@ -67,10 +69,14 @@ public class DSTU4145Signer
             h = curve.fromBigInteger(ONE);
         }
 
-        BigInteger n = parameters.getN();
+        BigInteger n = ec.getN();
         BigInteger e, r, s;
         ECFieldElement Fe, y;
 
+        BigInteger d = ((ECPrivateKeyParameters)key).getD();
+
+        ECMultiplier basePointMultiplier = new FixedPointCombMultiplier();
+
         do
         {
             do
@@ -78,7 +84,7 @@ public class DSTU4145Signer
                 do
                 {
                     e = generateRandomInteger(n, random);
-                    Fe = parameters.getG().multiply(e).normalize().getAffineXCoord();
+                    Fe = basePointMultiplier.multiply(ec.getG(), e).normalize().getAffineXCoord();
                 }
                 while (Fe.isZero());
 
@@ -87,7 +93,7 @@ public class DSTU4145Signer
             }
             while (r.signum() == 0);
 
-            s = r.multiply(((ECPrivateKeyParameters)key).getD()).add(e).mod(n);
+            s = r.multiply(d).add(e).mod(n);
         }
         while (s.signum() == 0);
 
diff --git a/core/src/main/java/org/bouncycastle/crypto/signers/ECGOST3410Signer.java b/core/src/main/java/org/bouncycastle/crypto/signers/ECGOST3410Signer.java
index f6d7f4fa..47dc6bd9 100644
--- a/core/src/main/java/org/bouncycastle/crypto/signers/ECGOST3410Signer.java
+++ b/core/src/main/java/org/bouncycastle/crypto/signers/ECGOST3410Signer.java
@@ -1,158 +1,155 @@
-package org.bouncycastle.crypto.signers;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.params.ECKeyParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.math.ec.ECAlgorithms;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECPoint;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-/**
- * GOST R 34.10-2001 Signature Algorithm
- */
-public class ECGOST3410Signer
-    implements DSA
-{
-    ECKeyParameters key;
-
-    SecureRandom    random;
-
-    public void init(
-        boolean                 forSigning,
-        CipherParameters        param)
-    {
-        if (forSigning)
-        {
-            if (param instanceof ParametersWithRandom)
-            {
-                ParametersWithRandom    rParam = (ParametersWithRandom)param;
-
-                this.random = rParam.getRandom();
-                this.key = (ECPrivateKeyParameters)rParam.getParameters();
-            }
-            else
-            {
-                this.random = new SecureRandom();
-                this.key = (ECPrivateKeyParameters)param;
-            }
-        }
-        else
-        {
-            this.key = (ECPublicKeyParameters)param;
-        }
-    }
-
-    /**
-     * generate a signature for the given message using the key we were
-     * initialised with. For conventional GOST3410 the message should be a GOST3411
-     * hash of the message of interest.
-     *
-     * @param message the message that will be verified later.
-     */
-    public BigInteger[] generateSignature(
-        byte[] message)
-    {
-        byte[] mRev = new byte[message.length]; // conversion is little-endian
-        for (int i = 0; i != mRev.length; i++)
-        {
-            mRev[i] = message[mRev.length - 1 - i];
-        }
-        
-        BigInteger e = new BigInteger(1, mRev);
-        BigInteger n = key.getParameters().getN();
-
-        BigInteger r = null;
-        BigInteger s = null;
-
-        do // generate s
-        {
-            BigInteger k = null;
-
-            do // generate r
-            {
-                do
-                {
-                    k = new BigInteger(n.bitLength(), random);
-                }
-                while (k.equals(ECConstants.ZERO));
-
-                ECPoint p = key.getParameters().getG().multiply(k).normalize();
-
-                BigInteger x = p.getAffineXCoord().toBigInteger();
-
-                r = x.mod(n);
-            }
-            while (r.equals(ECConstants.ZERO));
-
-            BigInteger d = ((ECPrivateKeyParameters)key).getD();
-
-            s = (k.multiply(e)).add(d.multiply(r)).mod(n);
-        }
-        while (s.equals(ECConstants.ZERO));
-
-        BigInteger[]  res = new BigInteger[2];
-
-        res[0] = r;
-        res[1] = s;
-
-        return res;
-    }
-
-    /**
-     * return true if the value r and s represent a GOST3410 signature for
-     * the passed in message (for standard GOST3410 the message should be
-     * a GOST3411 hash of the real message to be verified).
-     */
-    public boolean verifySignature(
-        byte[]      message,
-        BigInteger  r,
-        BigInteger  s)
-    {
-        byte[] mRev = new byte[message.length]; // conversion is little-endian
-        for (int i = 0; i != mRev.length; i++)
-        {
-            mRev[i] = message[mRev.length - 1 - i];
-        }
-        
-        BigInteger e = new BigInteger(1, mRev);
-        BigInteger n = key.getParameters().getN();
-
-        // r in the range [1,n-1]
-        if (r.compareTo(ECConstants.ONE) < 0 || r.compareTo(n) >= 0)
-        {
-            return false;
-        }
-
-        // s in the range [1,n-1]
-        if (s.compareTo(ECConstants.ONE) < 0 || s.compareTo(n) >= 0)
-        {
-            return false;
-        }
-
-        BigInteger v = e.modInverse(n);
-
-        BigInteger z1 = s.multiply(v).mod(n);
-        BigInteger z2 = (n.subtract(r)).multiply(v).mod(n);
-
-        ECPoint G = key.getParameters().getG(); // P
-        ECPoint Q = ((ECPublicKeyParameters)key).getQ();
-
-        ECPoint point = ECAlgorithms.sumOfTwoMultiplies(G, z1, Q, z2).normalize();
-
-        // components must be bogus.
-        if (point.isInfinity())
-        {
-            return false;
-        }
-
-        BigInteger R = point.getAffineXCoord().toBigInteger().mod(n);
-
-        return R.equals(r);
-    }
-}
+package org.bouncycastle.crypto.signers;

+

+import org.bouncycastle.crypto.CipherParameters;

+import org.bouncycastle.crypto.DSA;

+import org.bouncycastle.crypto.params.ECDomainParameters;

+import org.bouncycastle.crypto.params.ECKeyParameters;

+import org.bouncycastle.crypto.params.ECPrivateKeyParameters;

+import org.bouncycastle.crypto.params.ECPublicKeyParameters;

+import org.bouncycastle.crypto.params.ParametersWithRandom;

+import org.bouncycastle.math.ec.ECAlgorithms;

+import org.bouncycastle.math.ec.ECConstants;

+import org.bouncycastle.math.ec.ECMultiplier;

+import org.bouncycastle.math.ec.ECPoint;

+import org.bouncycastle.math.ec.FixedPointCombMultiplier;

+

+import java.math.BigInteger;

+import java.security.SecureRandom;

+

+/**

+ * GOST R 34.10-2001 Signature Algorithm

+ */

+public class ECGOST3410Signer

+    implements DSA

+{

+    ECKeyParameters key;

+

+    SecureRandom    random;

+

+    public void init(

+        boolean                 forSigning,

+        CipherParameters        param)

+    {

+        if (forSigning)

+        {

+            if (param instanceof ParametersWithRandom)

+            {

+                ParametersWithRandom    rParam = (ParametersWithRandom)param;

+

+                this.random = rParam.getRandom();

+                this.key = (ECPrivateKeyParameters)rParam.getParameters();

+            }

+            else

+            {

+                this.random = new SecureRandom();

+                this.key = (ECPrivateKeyParameters)param;

+            }

+        }

+        else

+        {

+            this.key = (ECPublicKeyParameters)param;

+        }

+    }

+

+    /**

+     * generate a signature for the given message using the key we were

+     * initialised with. For conventional GOST3410 the message should be a GOST3411

+     * hash of the message of interest.

+     *

+     * @param message the message that will be verified later.

+     */

+    public BigInteger[] generateSignature(

+        byte[] message)

+    {

+        byte[] mRev = new byte[message.length]; // conversion is little-endian

+        for (int i = 0; i != mRev.length; i++)

+        {

+            mRev[i] = message[mRev.length - 1 - i];

+        }

+

+        BigInteger e = new BigInteger(1, mRev);

+

+        ECDomainParameters ec = key.getParameters();

+        BigInteger n = ec.getN();

+        BigInteger d = ((ECPrivateKeyParameters)key).getD();

+

+        BigInteger r, s;

+

+        ECMultiplier basePointMultiplier = new FixedPointCombMultiplier();

+

+        do // generate s

+        {

+            BigInteger k;

+            do // generate r

+            {

+                do

+                {

+                    k = new BigInteger(n.bitLength(), random);

+                }

+                while (k.equals(ECConstants.ZERO));

+

+                ECPoint p = basePointMultiplier.multiply(ec.getG(), k).normalize();

+

+                r = p.getAffineXCoord().toBigInteger().mod(n);

+            }

+            while (r.equals(ECConstants.ZERO));

+

+            s = (k.multiply(e)).add(d.multiply(r)).mod(n);

+        }

+        while (s.equals(ECConstants.ZERO));

+

+        return new BigInteger[]{ r, s };

+    }

+

+    /**

+     * return true if the value r and s represent a GOST3410 signature for

+     * the passed in message (for standard GOST3410 the message should be

+     * a GOST3411 hash of the real message to be verified).

+     */

+    public boolean verifySignature(

+        byte[]      message,

+        BigInteger  r,

+        BigInteger  s)

+    {

+        byte[] mRev = new byte[message.length]; // conversion is little-endian

+        for (int i = 0; i != mRev.length; i++)

+        {

+            mRev[i] = message[mRev.length - 1 - i];

+        }

+        

+        BigInteger e = new BigInteger(1, mRev);

+        BigInteger n = key.getParameters().getN();

+

+        // r in the range [1,n-1]

+        if (r.compareTo(ECConstants.ONE) < 0 || r.compareTo(n) >= 0)

+        {

+            return false;

+        }

+

+        // s in the range [1,n-1]

+        if (s.compareTo(ECConstants.ONE) < 0 || s.compareTo(n) >= 0)

+        {

+            return false;

+        }

+

+        BigInteger v = e.modInverse(n);

+

+        BigInteger z1 = s.multiply(v).mod(n);

+        BigInteger z2 = (n.subtract(r)).multiply(v).mod(n);

+

+        ECPoint G = key.getParameters().getG(); // P

+        ECPoint Q = ((ECPublicKeyParameters)key).getQ();

+

+        ECPoint point = ECAlgorithms.sumOfTwoMultiplies(G, z1, Q, z2).normalize();

+

+        // components must be bogus.

+        if (point.isInfinity())

+        {

+            return false;

+        }

+

+        BigInteger R = point.getAffineXCoord().toBigInteger().mod(n);

+

+        return R.equals(r);

+    }

+}