Merge branch 'hqc-checksum-fail' into 'main'

Hqc checksum fail

See merge request root/bc-java!82

Author: ligefeiBouncycastle

core/src/main/java/org/bouncycastle/pqc/crypto/hqc/ReedSolomon.java

@@ -191,8 +191,7 @@ private static void computeZx(int[] output, int[] sigma, int deg, int[] syndrome
         for (int i = 2; i <= delta; i++)
         {
             int mask = i - deg < 1 ? 0xffff : 0;
-            output[i] = mask & sigma[i - 1];
-
+            output[i] ^= (mask) & syndromes[i - 1];
             for (int j = 1; j < i; j++)
             {
                 output[i] ^= (mask) & GFCalculator.mult(sigma[j], syndromes[i - j - 1]);

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

@@ -16,10 +16,14 @@
 import org.bouncycastle.jcajce.spec.KEMExtractSpec;
 import org.bouncycastle.jcajce.spec.KEMGenerateSpec;
 import org.bouncycastle.jcajce.spec.KEMParameterSpec;
+import org.bouncycastle.pqc.crypto.hqc.HQCKeyGenerationParameters;
+import org.bouncycastle.pqc.crypto.hqc.HQCKeyPairGenerator;
+import org.bouncycastle.pqc.crypto.hqc.HQCParameters;
 import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
 import org.bouncycastle.pqc.jcajce.spec.HQCParameterSpec;
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.encoders.Hex;
+import org.bouncycastle.util.test.FixedSecureRandom;
 
 /**
  * KEM tests for HQC with the BCPQC provider.
@@ -36,7 +40,7 @@ public void setUp()
     }
 
     public void testBasicKEMAES()
-            throws Exception
+        throws Exception
     {
         KeyPairGenerator kpg = KeyPairGenerator.getInstance("HQC", "BCPQC");
         kpg.initialize(HQCParameterSpec.hqc128, new SecureRandom());
@@ -51,7 +55,7 @@ public void testBasicKEMAES()
     }
 
     public void testBasicKEMCamellia()
-            throws Exception
+        throws Exception
     {
         KeyPairGenerator kpg = KeyPairGenerator.getInstance("HQC", "BCPQC");
         kpg.initialize(HQCParameterSpec.hqc128, new SecureRandom());
@@ -61,7 +65,7 @@ public void testBasicKEMCamellia()
     }
 
     public void testBasicKEMSEED()
-            throws Exception
+        throws Exception
     {
         KeyPairGenerator kpg = KeyPairGenerator.getInstance("HQC", "BCPQC");
         kpg.initialize(HQCParameterSpec.hqc128, new SecureRandom());
@@ -70,7 +74,7 @@ public void testBasicKEMSEED()
     }
 
     public void testBasicKEMARIA()
-            throws Exception
+        throws Exception
     {
         KeyPairGenerator kpg = KeyPairGenerator.getInstance("HQC", "BCPQC");
         kpg.initialize(HQCParameterSpec.hqc128, new SecureRandom());
@@ -80,7 +84,7 @@ public void testBasicKEMARIA()
     }
 
     private void performKEMScipher(KeyPair kp, String algorithm, KEMParameterSpec ktsParameterSpec)
-            throws Exception
+        throws Exception
     {
         Cipher w1 = Cipher.getInstance(algorithm, "BCPQC");
 
@@ -109,7 +113,7 @@ private void performKEMScipher(KeyPair kp, String algorithm, KEMParameterSpec kt
     }
 
     public void testGenerateAES()
-            throws Exception
+        throws Exception
     {
         KeyPairGenerator kpg = KeyPairGenerator.getInstance("HQC", "BCPQC");
         kpg.initialize(HQCParameterSpec.hqc128, new SecureRandom());
@@ -135,7 +139,7 @@ public void testGenerateAES()
     }
 
     public void testGenerateAES256()
-            throws Exception
+        throws Exception
     {
         KeyPairGenerator kpg = KeyPairGenerator.getInstance("HQC", "BCPQC");
         kpg.initialize(HQCParameterSpec.hqc256, new SecureRandom());
@@ -159,4 +163,45 @@ public void testGenerateAES256()
 
         assertTrue(Arrays.areEqual(secEnc1.getEncoded(), secEnc2.getEncoded()));
     }
+
+    public void testReedSolomon()
+        throws Exception
+    {
+        byte[] seed = Hex.decode("416a32ada1c7a569c34d5334273a781c340aac25eb7614271aa6930d0358fb30fd87e111336a29e165dc60d9643a3e9b");//b
+        byte[] kemSeed = Hex.decode("13f36c0636ff93af6d702f7774097c185bf67cddc9b09f9b584d736c4faf40e073b0499efa0c926e9a44fec1e45ee4cf");
+        //HQCKeyPairGenerator kpg = new HQCKeyPairGenerator();
+        //kpg.init(new HQCKeyGenerationParameters();
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("HQC", "BCPQC");
+        SecureRandom random = new FixedSecureRandom(new FixedSecureRandom.Source[]{new FixedSecureRandom.Data(seed)});
+        SecureRandom kemRandom = new FixedSecureRandom(new FixedSecureRandom.Source[]{new FixedSecureRandom.Data(kemSeed)});
+        kpg.initialize(HQCParameterSpec.hqc128, random);
+        KeyPair kp = kpg.generateKeyPair();
+        String algorithm = "HQC";
+        KEMParameterSpec ktsParameterSpec = new KEMParameterSpec("ARIA-KWP");
+        Cipher w1 = Cipher.getInstance(algorithm, "BCPQC");
+
+        byte[] keyBytes;
+        if (algorithm.endsWith("KWP"))
+        {
+            keyBytes = Hex.decode("000102030405060708090a0b0c0d0e0faa");
+        }
+        else
+        {
+            keyBytes = Hex.decode("000102030405060708090a0b0c0d0e0f");
+        }
+        SecretKey key = new SecretKeySpec(keyBytes, "AES");
+
+        w1.init(Cipher.WRAP_MODE, kp.getPublic(), ktsParameterSpec, kemRandom);
+
+        byte[] data = w1.wrap(key);
+
+        Cipher w2 = Cipher.getInstance(algorithm, "BCPQC");
+
+        w2.init(Cipher.UNWRAP_MODE, kp.getPrivate(), ktsParameterSpec);
+
+        Key k = w2.unwrap(data, "AES", Cipher.SECRET_KEY);
+
+        assertTrue(Arrays.areEqual(keyBytes, k.getEncoded()));
+    }
+
 }