Add more tests for Ascon

Author: gefeili

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

@@ -90,6 +90,51 @@ public void performTest()
 
         testVectorsXof_AsconXof();
         testVectorsXof_AsconXofA();
+
+        CipherTest.checkCipher(32, 16, 100, 128, new CipherTest.Instace()
+        {
+            @Override
+            public AEADCipher CreateInstace()
+            {
+                return new AsconAEAD128Engine();
+            }
+        });
+
+        CipherTest.checkCipher(32, 16, 100, 128, new CipherTest.Instace()
+        {
+            @Override
+            public AEADCipher CreateInstace()
+            {
+                return new AsconEngine(AsconEngine.AsconParameters.ascon128);
+            }
+        });
+
+        CipherTest.checkCipher(32, 16, 100, 128, new CipherTest.Instace()
+        {
+            @Override
+            public AEADCipher CreateInstace()
+            {
+                return new AsconEngine(AsconEngine.AsconParameters.ascon128a);
+            }
+        });
+
+        CipherTest.checkCipher(32, 16, 100, 160, new CipherTest.Instace()
+        {
+            @Override
+            public AEADCipher CreateInstace()
+            {
+                return new AsconEngine(AsconEngine.AsconParameters.ascon80pq);
+            }
+        });
+
+        DigestTest.checkDigestReset(this, new AsconHash256Digest());
+        DigestTest.checkDigestReset(this, new AsconXof128());
+        DigestTest.checkDigestReset(this, new AsconCxof128());
+        DigestTest.checkDigestReset(this, new AsconCxof128());
+        DigestTest.checkDigestReset(this, new AsconXof(AsconXof.AsconParameters.AsconXof));
+        DigestTest.checkDigestReset(this, new AsconXof(AsconXof.AsconParameters.AsconXofA));
+        DigestTest.checkDigestReset(this, new AsconDigest(AsconDigest.AsconParameters.AsconHash));
+        DigestTest.checkDigestReset(this, new AsconDigest(AsconDigest.AsconParameters.AsconHashA));
     }
 
     public void testBufferingEngine_ascon128()

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

@@ -128,7 +128,7 @@ interface Instace
         AEADCipher CreateInstace();
     }
 
-    static void checkCipher(int aeadLen, int ivLen, int msgLen,  Instace instace)
+    static void checkCipher(int aeadLen, int ivLen, int msgLen, int strength, Instace instace)
     {
         AEADCipher pCipher = instace.CreateInstace();
 
@@ -145,7 +145,7 @@ static void checkCipher(int aeadLen, int ivLen, int msgLen,  Instace instace)
 
             /* Create the Key parameters */
             final CipherKeyGenerator myGenerator = new CipherKeyGenerator();
-            final KeyGenerationParameters myGenParams = new KeyGenerationParameters(myRandom, 128);
+            final KeyGenerationParameters myGenParams = new KeyGenerationParameters(myRandom, strength);
             myGenerator.init(myGenParams);
             final byte[] myKey = myGenerator.generateKey();
             final KeyParameter myKeyParams = new KeyParameter(myKey);

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

@@ -29,23 +29,23 @@ public void performTest()
         throws Exception
     {
         //testVectors(ElephantEngine.ElephantParameters.elephant160, "v160_2");
-        CipherTest.checkCipher(10, 12, 40, new CipherTest.Instace()
+        CipherTest.checkCipher(10, 12, 40, 128, new CipherTest.Instace()
         {
             @Override
             public AEADCipher CreateInstace()
             {
                 return new ElephantEngine(ElephantEngine.ElephantParameters.elephant160);
             }
         });
-        CipherTest.checkCipher(10, 12, 40, new CipherTest.Instace()
+        CipherTest.checkCipher(10, 12, 40, 128, new CipherTest.Instace()
         {
             @Override
             public AEADCipher CreateInstace()
             {
                 return new ElephantEngine(ElephantEngine.ElephantParameters.elephant176);
             }
         });
-        CipherTest.checkCipher(10, 12, 40, new CipherTest.Instace()
+        CipherTest.checkCipher(10, 12, 40, 128, new CipherTest.Instace()
         {
             @Override
             public AEADCipher CreateInstace()