corrected conflict resolution

dghgit · dghgit · commit e237fb4db13e · 2024-12-14T10:00:16.000+11:00
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ElephantTest.java b/core/src/test/java/org/bouncycastle/crypto/test/ElephantTest.java
@@ -28,24 +28,30 @@ public String getName()
     public void performTest()
         throws Exception
     {
-        //testVectors(ElephantEngine.ElephantParameters.elephant160, "v160_2");
-        CipherTest.checkCipher(10, 12, 40, new CipherTest.Instace()
+        CipherTest.checkAEADCipherOutputSize(16, 12, 20, 8, new ElephantEngine(ElephantEngine.ElephantParameters.elephant160));
+        CipherTest.checkAEADCipherOutputSize(16, 12, 22, 8, new ElephantEngine(ElephantEngine.ElephantParameters.elephant176));
+        CipherTest.checkAEADCipherOutputSize(16, 12, 25, 16, new ElephantEngine(ElephantEngine.ElephantParameters.elephant200));
+//        //testVectors(ElephantEngine.ElephantParameters.elephant160, "v160_2");
+        ElephantEngine elephant = new ElephantEngine(ElephantEngine.ElephantParameters.elephant200);
+        testExceptions(elephant, elephant.getKeyBytesSize(), elephant.getIVBytesSize(), elephant.getBlockSize());
+        testParameters(elephant, 16, 12, 16);
+        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()

Original file line number	Diff line number	Diff line change
`@@ -28,24 +28,30 @@ public String getName()`
`28`	`28`	`public void performTest()`
`29`	`29`	`throws Exception`
`30`	`30`	`{`
`31`		`- //testVectors(ElephantEngine.ElephantParameters.elephant160, "v160_2");`
`32`		`- CipherTest.checkCipher(10, 12, 40, new CipherTest.Instace()`
	`31`	`+ CipherTest.checkAEADCipherOutputSize(16, 12, 20, 8, new ElephantEngine(ElephantEngine.ElephantParameters.elephant160));`
	`32`	`+ CipherTest.checkAEADCipherOutputSize(16, 12, 22, 8, new ElephantEngine(ElephantEngine.ElephantParameters.elephant176));`
	`33`	`+ CipherTest.checkAEADCipherOutputSize(16, 12, 25, 16, new ElephantEngine(ElephantEngine.ElephantParameters.elephant200));`
	`34`	`+// //testVectors(ElephantEngine.ElephantParameters.elephant160, "v160_2");`
	`35`	`+ ElephantEngine elephant = new ElephantEngine(ElephantEngine.ElephantParameters.elephant200);`
	`36`	`+ testExceptions(elephant, elephant.getKeyBytesSize(), elephant.getIVBytesSize(), elephant.getBlockSize());`
	`37`	`+ testParameters(elephant, 16, 12, 16);`
	`38`	`+ CipherTest.checkCipher(10, 12, 40, 128, new CipherTest.Instace()`
`33`	`39`	`{`
`34`	`40`	`@Override`
`35`	`41`	`public AEADCipher CreateInstace()`
`36`	`42`	`{`
`37`	`43`	`return new ElephantEngine(ElephantEngine.ElephantParameters.elephant160);`
`38`	`44`	`}`
`39`	`45`	`});`
`40`		`- CipherTest.checkCipher(10, 12, 40, new CipherTest.Instace()`
	`46`	`+ CipherTest.checkCipher(10, 12, 40, 128, new CipherTest.Instace()`
`41`	`47`	`{`
`42`	`48`	`@Override`
`43`	`49`	`public AEADCipher CreateInstace()`
`44`	`50`	`{`
`45`	`51`	`return new ElephantEngine(ElephantEngine.ElephantParameters.elephant176);`
`46`	`52`	`}`
`47`	`53`	`});`
`48`		`- CipherTest.checkCipher(10, 12, 40, new CipherTest.Instace()`
	`54`	`+ CipherTest.checkCipher(10, 12, 40, 128, new CipherTest.Instace()`
`49`	`55`	`{`
`50`	`56`	`@Override`
`51`	`57`	`public AEADCipher CreateInstace()`