removed Assert

Author: dghgit

core/src/main/java/org/bouncycastle/util/test/SimpleTest.java

@@ -31,7 +31,7 @@ protected void isTrue(
         }
     }
 
-    protected void isTrue(
+    public void isTrue(
         String message,
         boolean value)
     {
@@ -273,7 +273,7 @@ void operation()
             throws Exception;
     }
 
-    protected Exception testException(String failMessage, String exceptionClass, TestExceptionOperation operation)
+    public Exception testException(String failMessage, String exceptionClass, TestExceptionOperation operation)
     {
         try
         {
@@ -286,7 +286,7 @@ protected Exception testException(String failMessage, String exceptionClass, Tes
             {
                 isTrue(e.getMessage(), e.getMessage().indexOf(failMessage) >= 0);
             }
-            isTrue(e.getClass().getName().indexOf(exceptionClass) >= 0);
+            isTrue(e.getMessage(),e.getClass().getName().indexOf(exceptionClass) >= 0);
             return e;
         }
         return null;

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

@@ -10,13 +10,13 @@
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.crypto.KeyGenerationParameters;
 import org.bouncycastle.crypto.modes.AEADCipher;
+import org.bouncycastle.crypto.params.AEADParameters;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.crypto.params.ParametersWithIV;
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.test.SimpleTest;
 import org.bouncycastle.util.test.SimpleTestResult;
 import org.bouncycastle.util.test.TestFailedException;
-import org.junit.Assert;
 
 public abstract class CipherTest
     extends SimpleTest
@@ -255,7 +255,7 @@ static void isEqualTo(
         }
     }
 
-    static void checkCipher(final BlockCipher pCipher, final int datalen)
+   void checkCipher(final BlockCipher pCipher, final int datalen)
         throws Exception
     {
         final SecureRandom random = new SecureRandom();
@@ -299,7 +299,53 @@ static void checkCipher(final BlockCipher pCipher, final int datalen)
         myCipher.doFinal(plaintext, myOutLen);
 
         /* Check that the cipherTexts are identical */
-        Assert.assertArrayEquals(myOutput, myOutput2);
-        Assert.assertArrayEquals(myData, plaintext);
+        isTrue(areEqual(myOutput, myOutput2));
+        isTrue(areEqual(myData, plaintext));
+    }
+
+    static void checkAEADParemeter(SimpleTest test, int keySize, int ivSize, final int macSize, int blockSize, final AEADCipher cipher)
+        throws Exception
+    {
+        final SecureRandom random = new SecureRandom();
+        final byte[] key = new byte[keySize];
+        final byte[] iv = new byte[ivSize];
+        int tmpLength = random.nextInt(blockSize - 1) + 1;
+        final byte[] plaintext = new byte[blockSize * 2 + tmpLength];
+        byte[] aad = new byte[random.nextInt(100) + 2];
+        random.nextBytes(key);
+        random.nextBytes(iv);
+        random.nextBytes(plaintext);
+        random.nextBytes(aad);
+        cipher.init(true, new ParametersWithIV(new KeyParameter(key), iv));
+        byte[] ciphertext1 = new byte[cipher.getOutputSize(plaintext.length)];
+        for (int i = 0; i < aad.length; ++i)
+        {
+            cipher.processAADByte(aad[i]);
+        }
+        int len = cipher.processBytes(plaintext, 0, plaintext.length, ciphertext1, 0);
+        len += cipher.doFinal(ciphertext1, len);
+        int aadSplit = random.nextInt(aad.length) + 1;
+        cipher.init(true, new AEADParameters(new KeyParameter(key), macSize * 8, iv, Arrays.copyOf(aad, aadSplit)));
+        cipher.processAADBytes(aad, aadSplit, aad.length - aadSplit);
+        byte[] ciphertext2 = new byte[cipher.getOutputSize(plaintext.length)];
+        len = cipher.processBytes(plaintext, 0, plaintext.length, ciphertext2, 0);
+        len += cipher.doFinal(ciphertext2, len);
+        test.isTrue("cipher text check", Arrays.areEqual(ciphertext1, ciphertext2));
+
+        test.testException("Invalid value for MAC size: ", "IllegalArgumentException", new TestExceptionOperation()
+        {
+            @Override
+            public void operation()
+                throws Exception
+            {
+                int macSize2 = random.nextInt();
+                while (macSize2 == macSize * 8)
+                {
+                    macSize2 = random.nextInt();
+                }
+                cipher.init(true, new AEADParameters(new KeyParameter(key), macSize2, iv, null));
+            }
+        });
+
     }
 }