Remove unused functions. Format the code

Author: gefeili

core/src/main/java/org/bouncycastle/crypto/kems/SAKKEKEMExtractor.java

@@ -6,11 +6,9 @@
 import org.bouncycastle.crypto.params.SAKKEPrivateKeyParameters;
 import org.bouncycastle.crypto.params.SAKKEPublicKeyParameters;
 import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECFieldElement;
 import org.bouncycastle.math.ec.ECPoint;
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
 
 
 public class SAKKEKEMExtractor
@@ -49,7 +47,7 @@ public byte[] extractSecret(byte[] encapsulation)
 
             // Step 2: Compute w = <R_bS, K_bS> using pairing
             BigInteger w = computePairing(R_bS, K_bS, p, q);
-            System.out.println(new String(Hex.encode(w.toByteArray())));
+            //System.out.println(new String(Hex.encode(w.toByteArray())));
             //BigInteger w = tatePairing(R_bS.getXCoord().toBigInteger(), R_bS.getYCoord().toBigInteger(), K_bS.getXCoord().toBigInteger(), K_bS.getYCoord().toBigInteger(), q, p);
             // Step 3: Compute SSV = H XOR HashToIntegerRange(w, 2^n)
             BigInteger twoToN = BigInteger.ONE.shiftLeft(n);

core/src/main/java/org/bouncycastle/crypto/kems/SAKKEKEMSGenerator.java

@@ -64,7 +64,7 @@ public SAKKEKEMSGenerator(SecureRandom random)
     public SecretWithEncapsulation generateEncapsulated(AsymmetricKeyParameter recipientKey)
     {
         // 1. Generate random SSV in range [0, 2^n - 1]
-        BigInteger ssv = new BigInteger("123456789ABCDEF0123456789ABCDEF0", 16);//new BigInteger(n, random);
+        BigInteger ssv = new BigInteger(n, random);
 
         // 2. Compute r = HashToIntegerRange(SSV || b, q)
         BigInteger b = new BigInteger("323031312D30320074656C3A2B34343737303039303031323300", 16); //getRecipientId((SAKKEPublicKey)recipientKey);
@@ -127,25 +127,13 @@ public SecretWithEncapsulation generateEncapsulated(AsymmetricKeyParameter recip
     // Helper method for F_p² exponentiation
     public static BigInteger[] fp2Exponentiate(
         BigInteger p,
-        BigInteger x,
-        BigInteger y,
-        BigInteger exponent,
-        ECCurve.Fp curve
-    )
-    {
-        BigInteger[] result = new BigInteger[2];
-        sakkePointExponent(p, result, x, y, exponent, curve);
-        return result;
-    }
-
-    public static boolean sakkePointExponent(
-        BigInteger p,
-        BigInteger[] result,
         BigInteger pointX,
         BigInteger pointY,
         BigInteger n,
-        ECCurve.Fp curve)
+        ECCurve.Fp curve
+    )
     {
+        BigInteger[] result = new BigInteger[2];
 
         // Initialize result with the original point
         BigInteger currentX = pointX;
@@ -174,6 +162,6 @@ public static boolean sakkePointExponent(
 
         result[0] = currentX;
         result[1] = currentY;
-        return true;
+        return result;
     }
 }

core/src/main/java/org/bouncycastle/crypto/kems/SAKKEUtils.java

@@ -2,45 +2,11 @@
 
 import java.math.BigInteger;
 
-import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.encoders.Hex;
 
 public class SAKKEUtils
 {
-    public static ECPoint sakkePointExponent(ECPoint point, BigInteger n) {
-        if (n.equals(BigInteger.ZERO)) {
-            throw new IllegalArgumentException("Exponent cannot be zero.");
-        }
-
-        ECPoint result = point;
-        int N = n.bitLength() - 1;
-
-        for (; N != 0; --N) {
-            result = sakkePointSquare(result);
-            if (n.testBit(N - 1)) {
-                result = sakkePointsMultiply(result, point);
-            }
-        }
-        return result;
-    }
-
-    public static ECPoint sakkePointSquare(ECPoint point) {
-        BigInteger x = point.getAffineXCoord().toBigInteger();
-        BigInteger y = point.getAffineYCoord().toBigInteger();
-
-        BigInteger bx1 = x.add(y);
-        BigInteger bx2 = x.subtract(y);
-        BigInteger newX = bx1.multiply(bx2).mod(point.getCurve().getField().getCharacteristic());
-        BigInteger newY = x.multiply(y).multiply(BigInteger.valueOf(2)).mod(point.getCurve().getField().getCharacteristic());
-
-        return point.getCurve().createPoint(newX, newY);
-    }
 
-    public static ECPoint sakkePointsMultiply(ECPoint p1, ECPoint p2) {
-        return p1.add(p2).normalize();
-    }
     public static BigInteger hashToIntegerRange(byte[] input, BigInteger q)
     {
         // RFC 6508 Section 5.1: Hashing to an Integer Range
@@ -66,32 +32,15 @@ public static BigInteger hashToIntegerRange(byte[] input, BigInteger q)
             // h_i = hashfn(h_{i-1})
             digest.update(h, 0, h.length);
             digest.doFinal(h, 0);
-            //System.out.println("h_"+i+":" +new String(Hex.encode(h)));
             // v_i = hashfn(h_i || A)
             digest.update(h, 0, h.length);
             digest.update(A, 0, A.length);
             byte[] v_i = new byte[digest.getDigestSize()];
             digest.doFinal(v_i, 0);
-            //System.out.println("v_"+i+":" +new String(Hex.encode(v_i)));
             // Append v_i to v'
             v = v.shiftLeft(v_i.length * 8).add(new BigInteger(1, v_i));
         }
-        //System.out.println("v:" +new String(Hex.encode(v.toByteArray())));
         // Step 6: v = v' mod n
         return v.mod(q);
     }
-
-    public static byte[] hash(byte[] data)
-    {
-        Digest digest = new SHA256Digest();
-        byte[] rlt = new byte[digest.getDigestSize()];
-        digest.update(data, 0, data.length);
-        digest.doFinal(rlt, 0);
-        return rlt;
-    }
-
-    public static byte[] hash(ECPoint point)
-    {
-        return hash(point.getEncoded(false)); // Use uncompressed encoding
-    }
 }

core/src/test/java/org/bouncycastle/crypto/kems/test/SAKKEKEMSTest.java

@@ -7,13 +7,11 @@
 import org.bouncycastle.crypto.SecretWithEncapsulation;
 import org.bouncycastle.crypto.kems.SAKKEKEMExtractor;
 import org.bouncycastle.crypto.kems.SAKKEKEMSGenerator;
-import org.bouncycastle.crypto.kems.SAKKEUtils;
 import org.bouncycastle.crypto.params.SAKKEPrivateKeyParameters;
 import org.bouncycastle.crypto.params.SAKKEPublicKeyParameters;
 import org.bouncycastle.math.ec.ECCurve;
 import org.bouncycastle.math.ec.ECPoint;
 import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Strings;
 import org.bouncycastle.util.encoders.Hex;
 import org.bouncycastle.util.test.FixedSecureRandom;
 import org.bouncycastle.util.test.SimpleTest;
@@ -27,18 +25,6 @@ public static void main(String[] args)
     {
         SAKKEKEMSTest test = new SAKKEKEMSTest();
         test.performTest();
-        // Expected Rb values
-//        BigInteger expectedRbx = new BigInteger("44E8AD44AB8592A6A5A3DDCA5CF896C718043606A01D650DEF37A01F37C228C332FC317354E2C274D4DAF8AD001054C7...
-//            BigInteger expectedRby = new BigInteger("557E134AD85BB1D4B9CE4F8BE4B08A12BABF55B1D6F1D7A638019EA28E15AB1C9F76375FDD1210D4F4351B9A009486B7...
-//
-//            // Instantiate SAKKE KEM Generator
-//            SAKKEKEMSGenerator kem = new SAKKEKEMSGenerator();
-//        EncapsulatedData encapsulatedData = kem.encapsulate(SSV);
-//
-//        // Validate results
-//        boolean testPassed = expectedRbx.equals(encapsulatedData.getRbx()) && expectedRby.equals(encapsulatedData.getRby());
-
-        //System.out.println("SAKKE KEM Test " + (testPassed ? "PASSED" : "FAILED"));
     }
 
 
@@ -78,7 +64,7 @@ public void performTest()
 //
         byte[] b = Hex.decode("323031312D30320074656C3A2B34343737303039303031323300");
 
-        byte[] SSV = Hex.decode("123456789ABCDEF0123456789ABCDEF0");
+        byte[] ssv = Hex.decode("123456789ABCDEF0123456789ABCDEF0");
         byte[] expectedR = Hex.decode("13EE3E1B8DAC5DB168B1CEB32F0566A4C273693F78BAFFA2A2EE6A686E6BD90F8206CCAB84E7F"
             + "42ED39BD4FB131012ECCA2ECD2119414560C17CAB46B956A80F58A3302EB3E2C9A228FBA7ED34D8ACA2392DA1FFB0B17B2320AE09AAEDF"
             + "D0235F6FE0EB65337A63F9CC97728B8E5AD0460FADE144369AA5B2166213247712096");
@@ -137,17 +123,18 @@ public void performTest()
             g,// Order of the subgroup (from RFC 6509)
             BigInteger.ONE     // Cofactor = 1
         );
-        SAKKEKEMSGenerator generator = new SAKKEKEMSGenerator(new SecureRandom());
-        SecretWithEncapsulation rlt = generator.generateEncapsulated(null);
 
+        SecureRandom random = new FixedSecureRandom(new FixedSecureRandom.Source[]{new FixedSecureRandom.Data(ssv),
+            new FixedSecureRandom.Data(b)});
+        SAKKEKEMSGenerator generator = new SAKKEKEMSGenerator(random);
+        SecretWithEncapsulation rlt = generator.generateEncapsulated(null);
 
         ECPoint K_bS = curve.createPoint(kbx, kby);
 
-
         SAKKEKEMExtractor extractor = new SAKKEKEMExtractor(new SAKKEPrivateKeyParameters(new BigInteger(b), K_bS,
             new SAKKEPublicKeyParameters(curve.createPoint(Zx, Zy))));
         byte[] test = extractor.extractSecret(rlt.getEncapsulation());
-        Assert.assertTrue(Arrays.areEqual(test, SSV));
+        Assert.assertTrue(Arrays.areEqual(test, ssv));
 
     }
 }

core/src/test/java/org/bouncycastle/crypto/test/RegressionTest.java

@@ -1,5 +1,6 @@
 package org.bouncycastle.crypto.test;
 
+import org.bouncycastle.crypto.kems.test.SAKKEKEMSTest;
 import org.bouncycastle.util.test.SimpleTest;
 import org.bouncycastle.util.test.Test;
 
@@ -195,6 +196,7 @@ public class RegressionTest
             new SparkleTest(),
             new ISAPTest(),
             new ConcatenationKDFTest(),
+            new SAKKEKEMSTest(),
         };
 
     public static void main(String[] args)