Refactor on Grain128AEADEngine

Author: gefeili

core/src/main/java/org/bouncycastle/crypto/engines/AEADBaseEngine.java

@@ -859,6 +859,7 @@ protected final void ensureInitialized()
         }
     }
 
+    // Used for Grain128 AEAD and Romulus Engine
     protected void finishAAD1(State nextState)
     {
         switch (m_state)
@@ -877,6 +878,7 @@ protected void finishAAD1(State nextState)
         m_state = nextState;
     }
 
+    // Use for Elephant and Sparkle
     protected void finishAAD2(State nextState)
     {
         // State indicates whether we ever received AAD
@@ -896,6 +898,7 @@ protected void finishAAD2(State nextState)
         m_state = nextState;
     }
 
+    // Used for Gift-Cofb, ISAP, PhotonBeetle and Xoodyak
     protected void finishAAD3(State nextState, boolean isDoFinal)
     {
         // State indicates whether we ever received AAD

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

@@ -230,15 +230,15 @@ static void isEqualTo(
 
     public static void main(String[] args)
     {
-//        runTest(new AsconTest());
-//        runTest(new ElephantTest());
-//        runTest(new GiftCofbTest());
+        runTest(new AsconTest());
+        runTest(new ElephantTest());
+        runTest(new GiftCofbTest());
         runTest(new Grain128AEADTest());
-//        runTest(new ISAPTest());
-//        runTest(new PhotonBeetleTest());
-//        runTest(new RomulusTest());
-//        runTest(new SparkleTest());
-//        runTest(new XoodyakTest());
+        runTest(new ISAPTest());
+        runTest(new PhotonBeetleTest());
+        runTest(new RomulusTest());
+        runTest(new SparkleTest());
+        runTest(new XoodyakTest());
     }
 }