fixed inverted tests in signature unpack and use of unpack.

Author: dghgit

core/src/main/java/org/bouncycastle/pqc/crypto/crystals/dilithium/DilithiumEngine.java

@@ -427,7 +427,6 @@ public byte[] signSignature(byte[] msg, int msglen, byte[] rho, byte[] key, byte
             // System.out.println(h.toString("h"));
             // System.out.println("Signature before pack = ");
             // Helper.printByteArray(outSig);
-
             outSig = Packing.packSignature(outSig, z, h, this);
 
             rej = false;
@@ -474,7 +473,7 @@ public boolean signVerify(byte[] sig, int siglen, byte[] msg, int msglen, byte[]
         // System.out.println("rho = ");
         // Helper.printByteArray(rho);
 
-        if (Packing.unpackSignature(z, h, sig, this))
+        if (!Packing.unpackSignature(z, h, sig, this))
         {
             return false;
         }

core/src/main/java/org/bouncycastle/pqc/crypto/crystals/dilithium/Packing.java

@@ -172,8 +172,8 @@ static boolean unpackSignature(PolyVecL z, PolyVecK h, byte[] sig, DilithiumEngi
         }
         for (j = k; j < engine.getDilithiumOmega(); ++j)
         {
-            if ((sig[end + j] & 0xFF) == 0)
-            {
+            if ((sig[end + j] & 0xFF) != 0)
+            {                    
                 return false;
             }
         }

core/src/test/java/org/bouncycastle/pqc/crypto/test/CrystalsDilithiumTest.java

@@ -3,6 +3,7 @@
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.security.SecureRandom;
 import java.util.HashMap;
 
 import junit.framework.TestCase;
@@ -15,6 +16,7 @@
 import org.bouncycastle.pqc.crypto.crystals.dilithium.DilithiumPublicKeyParameters;
 import org.bouncycastle.pqc.crypto.crystals.dilithium.DilithiumSigner;
 import org.bouncycastle.util.Arrays;
+import org.bouncycastle.util.Strings;
 import org.bouncycastle.util.encoders.Hex;
 
 public class CrystalsDilithiumTest
@@ -219,33 +221,33 @@ public void testVectors()
         }
     }
 
-//    public void testDilithiumRandom()
-//    {
-//        byte[] msg = Strings.toByteArray("Hello World!");
-//        DilithiumKeyPairGenerator keyGen = new DilithiumKeyPairGenerator();
-//
-//        SecureRandom random = new SecureRandom();
-//
-//        keyGen.init(new DilithiumKeyGenerationParameters(random, DilithiumParameters.dilithium3));
-//
-//        for (int i = 0; i != 1000; i++)
-//        {
-//            AsymmetricCipherKeyPair keyPair = keyGen.generateKeyPair();
-//
-//            // sign
-//            DilithiumSigner signer = new DilithiumSigner();
-//            DilithiumPrivateKeyParameters skparam = (DilithiumPrivateKeyParameters)keyPair.getPrivate();
-//            ParametersWithRandom skwrand = new ParametersWithRandom(skparam, random);
-//            signer.init(true, skwrand);
-//
-//            byte[] sigGenerated = signer.generateSignature(msg);
-//
-//            // verify
-//            DilithiumSigner verifier = new DilithiumSigner();
-//            DilithiumPublicKeyParameters pkparam = (DilithiumPublicKeyParameters)keyPair.getPublic();
-//            verifier.init(false, pkparam);
-//
-//            assertTrue("count = " + i, verifier.verifySignature(msg, sigGenerated));
-//        }
-//    }
+    public void testDilithiumRandom()
+    {
+        byte[] msg = Strings.toByteArray("Hello World!");
+        DilithiumKeyPairGenerator keyGen = new DilithiumKeyPairGenerator();
+
+        SecureRandom random = new SecureRandom();
+
+        keyGen.init(new DilithiumKeyGenerationParameters(random, DilithiumParameters.dilithium3));
+
+        for (int i = 0; i != 1000; i++)
+        {
+            AsymmetricCipherKeyPair keyPair = keyGen.generateKeyPair();
+
+            // sign
+            DilithiumSigner signer = new DilithiumSigner();
+            DilithiumPrivateKeyParameters skparam = (DilithiumPrivateKeyParameters)keyPair.getPrivate();
+            ParametersWithRandom skwrand = new ParametersWithRandom(skparam, random);
+            signer.init(true, skwrand);
+
+            byte[] sigGenerated = signer.generateSignature(msg);
+
+            // verify
+            DilithiumSigner verifier = new DilithiumSigner();
+            DilithiumPublicKeyParameters pkparam = (DilithiumPublicKeyParameters)keyPair.getPublic();
+            verifier.init(false, pkparam);
+
+            assertTrue("count = " + i, verifier.verifySignature(msg, sigGenerated));
+        }
+    }
 }