Add Romulus M

Author: gefeili

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

@@ -29,7 +29,8 @@ protected enum DataOperatorType
     {
         Default,
         Counter,
-        Stream
+        Stream,
+        //StreamCipher
     }
 
     protected enum State
@@ -103,8 +104,12 @@ protected void setInnerMembers(ProcessingBufferType type, AADOperatorType aadOpe
             dataOperator = new CounterDataOperator();
             break;
         case Stream:
+            m_buf = new byte[MAC_SIZE];
             dataOperator = new StreamDataOperator();
             break;
+//        case StreamCipher:
+//            dataOperator = new StreamCipherOperator();
+//            break;
         }
     }
 
@@ -382,15 +387,17 @@ public void reset()
         }
     }
 
-    protected static class StreamDataOperator
+    protected class StreamDataOperator
         implements DataOperator
     {
         private final ErasableOutputStream stream = new ErasableOutputStream();
 
         @Override
         public int processBytes(byte[] input, int inOff, int len, byte[] output, int outOff)
         {
+            ensureInitialized();
             stream.write(input, inOff, len);
+            m_bufPos = stream.size();
             return 0;
         }
 
@@ -412,6 +419,31 @@ 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 static final class ErasableOutputStream
         extends ByteArrayOutputStream
     {

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

@@ -5,7 +5,6 @@
 import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.Pack;
 
 /**