Fix the issue for #2025

Author: gefeili

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

@@ -28,7 +28,7 @@ protected enum DataOperatorType
         Default,
         Counter,
         Stream,
-        //StreamCipher //TODO: add for Grain 128 AEAD
+        StreamCipher
     }
 
     protected enum State
@@ -99,9 +99,10 @@ protected void setInnerMembers(ProcessingBufferType type, AADOperatorType aadOpe
             m_buf = new byte[MAC_SIZE];
             dataOperator = new StreamDataOperator();
             break;
-//        case StreamCipher:
-//            dataOperator = new StreamCipherOperator();
-//            break;
+        case StreamCipher:
+            m_buf = new byte[m_bufferSizeDecrypt];
+            dataOperator = new StreamCipherOperator();
+            break;
         }
     }
 
@@ -368,30 +369,38 @@ public void reset()
         }
     }
 
-//    protected class StreamCipherOperator
-//        implements DataOperator
-//    {
-//        private int len;
-//        @Override
-//        public int processBytes(byte[] input, int inOff, int len, byte[] output, int outOff)
-//        {
-//            this.len = len;
-//            processBufferEncrypt(input, inOff, output, outOff);
-//            return len;
-//        }
-//
-//        @Override
-//        public int getLen()
-//        {
-//            return 0;
-//        }
-//
-//        @Override
-//        public void reset()
-//        {
-//
-//        }
-//    }
+    protected class StreamCipherOperator
+        implements DataOperator
+    {
+        private int len;
+
+        @Override
+        public int processBytes(byte[] input, int inOff, int len, byte[] output, int outOff)
+        {
+            this.len = len;
+            if (forEncryption)
+            {
+                processBufferEncrypt(input, inOff, output, outOff);
+            }
+            else
+            {
+                processBufferDecrypt(input, inOff, output, outOff);
+            }
+            return len;
+        }
+
+        @Override
+        public int getLen()
+        {
+            return 0;
+        }
+
+        @Override
+        public void reset()
+        {
+
+        }
+    }
 
     protected static final class ErasableOutputStream
         extends ByteArrayOutputStream

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

@@ -116,7 +116,7 @@ protected void finishAAD(State nextState, boolean isDoFinal)
         m_state = nextState;
     }
 
-    public void processFinalAAD()
+    protected void processFinalAAD()
     {
         int aadLen = aadOperator.getLen();
         if (aadLen != 0)