Test updates

Author: peterdettman

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

@@ -190,7 +190,7 @@ private void testOverlapping()
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + expected.length)))
         {
-            fail("failed to overlapping of encryption");
+            fail("failed for overlapping encryption");
         }
 
         bc.init(false, key);
@@ -200,7 +200,7 @@ private void testOverlapping()
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + expected.length)))
         {
-            fail("failed to overlapping of encryption");
+            fail("failed for overlapping decryption");
         }
     }
 
@@ -228,7 +228,7 @@ private void testOverlapping2()
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + expected.length)))
         {
-            fail("failed to overlapping of encryption");
+            fail("failed for overlapping encryption");
         }
 
         bc.init(false, key);
@@ -238,7 +238,7 @@ private void testOverlapping2()
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + expected.length)))
         {
-            fail("failed to overlapping of encryption");
+            fail("failed for overlapping decryption");
         }
     }
 

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

@@ -478,17 +478,17 @@ private void testOverlapping()
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + expected.length)))
         {
-            fail("failed to overlapping of encryption");
+            fail("failed for overlapping encryption");
         }
 
         bc = initCipher(false, parameters);
         bc.processBytes(data, 0, expected.length, expected, 0);
-        bc = initCipher(true, parameters);
+        bc = initCipher(false, parameters);
         bc.processBytes(data, 0, expected.length, data, offset);
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + expected.length)))
         {
-            fail("failed to overlapping of encryption");
+            fail("failed for overlapping decryption");
         }
     }
 

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

@@ -1489,7 +1489,7 @@ private void testOverlapping()
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + expected.length)))
         {
-            fail("failed to overlapping of encryption");
+            fail("failed for overlapping encryption");
         }
 
         bc.init(false, param);
@@ -1499,7 +1499,7 @@ private void testOverlapping()
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + expected.length)))
         {
-            fail("failed to overlapping of encryption");
+            fail("failed for overlapping decryption");
         }
     }
 }

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

@@ -162,7 +162,7 @@ private void testOverlapping()
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + expected.length)))
         {
-            fail("failed to overlapping of encryption");
+            fail("failed for overlapping encryption");
         }
 
         bc.init(false, param);
@@ -172,7 +172,7 @@ private void testOverlapping()
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + expected.length)))
         {
-            fail("failed to overlapping of encryption");
+            fail("failed for overlapping decryption");
         }
     }
 

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

@@ -160,7 +160,7 @@ private void testOverlapping()
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + bc.getBlockSize() * 2)))
         {
-            fail("failed to overlapping of encryption");
+            fail("failed for overlapping encryption");
         }
 
         bc.init(false, key);
@@ -170,7 +170,7 @@ private void testOverlapping()
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + bc.getBlockSize() * 2)))
         {
-            fail("failed to overlapping of encryption");
+            fail("failed for overlapping decryption");
         }
     }
 

prov/src/test/java/org/bouncycastle/jce/provider/test/BlockCipherTest.java

@@ -1848,7 +1848,7 @@ private void testOverlapping()
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + bc.getBlockSize() * 2)))
         {
-            fail("failed to overlapping of encryption");
+            fail("failed for overlapping encryption");
         }
 
         bc.init(false, key);
@@ -1858,7 +1858,7 @@ private void testOverlapping()
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + bc.getBlockSize() * 2)))
         {
-            fail("failed to overlapping of encryption");
+            fail("failed for overlapping decryption");
         }
     }
 
@@ -1931,9 +1931,9 @@ public void testOverlap()
 
                 // Grab a copy of the produced cipher text
                 byte[] ct = Arrays.copyOfRange(workingArray, outputOffset, outputOffset + msg.length);
-                System.out.println("\nOutput Offset: " + outputOffset);
-                System.out.println("Expected: " + pad(outputOffset * 2) + Hex.toHexString(expectedOutput));
-                System.out.println("Actual  : " + Hex.toHexString(workingArray));
+//                System.out.println("\nOutput Offset: " + outputOffset);
+//                System.out.println("Expected: " + pad(outputOffset * 2) + Hex.toHexString(expectedOutput));
+//                System.out.println("Actual  : " + Hex.toHexString(workingArray));
 
                 isTrue(Arrays.areEqual(ct, expectedOutput));