Set DataOperatorType as Counter for PhotonBeetleEngine

Author: gefeili

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

@@ -382,10 +382,10 @@ public void reset()
         }
     }
 
-    protected class StreamDataOperator
+    protected static class StreamDataOperator
         implements DataOperator
     {
-        private ErasableOutputStream stream = new ErasableOutputStream();
+        private final ErasableOutputStream stream = new ErasableOutputStream();
 
         @Override
         public int processBytes(byte[] input, int inOff, int len, byte[] output, int outOff)

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

@@ -1,7 +1,5 @@
 package org.bouncycastle.crypto.engines;
 
-import org.bouncycastle.crypto.DataLengthException;
-
 /**
  * Photon-Beetle, <a href="https://www.isical.ac.in/~lightweight/beetle/"></a>
  * https://csrc.nist.gov/CSRC/media/Projects/lightweight-cryptography/documents/finalist-round/updated-spec-doc/photon-beetle-spec-final.pdf
@@ -24,7 +22,6 @@ public enum PhotonBeetleParameters
     private byte[] N;
     private byte[] state;
     private byte[][] state_2d;
-    private int messageLen;
     private final int RATE_INBYTES_HALF;
     private final int STATE_INBYTES;
     private final int LAST_THREE_BITS_OFFSET;
@@ -77,7 +74,7 @@ public PhotonBeetleEngine(PhotonBeetleParameters pbp)
         LAST_THREE_BITS_OFFSET = (STATE_INBITS - ((STATE_INBYTES - 1) << 3) - 3);
         algorithmName = "Photon-Beetle AEAD";
         setInnerMembers(pbp == PhotonBeetleParameters.pb128 ? ProcessingBufferType.Buffered : ProcessingBufferType.BufferedLargeMac,
-            AADOperatorType.Counter, DataOperatorType.Default);
+            AADOperatorType.Counter, DataOperatorType.Counter);
     }
 
     @Override
@@ -116,7 +113,7 @@ public void processFinalAAD()
                         state[m_aadPos] ^= 0x01; // ozs
                     }
                 }
-                state[STATE_INBYTES - 1] ^= select(messageLen - (forEncryption ? 0 : MAC_SIZE) > 0,
+                state[STATE_INBYTES - 1] ^= select(dataOperator.getLen() - (forEncryption ? 0 : MAC_SIZE) > 0,
                     ((aadLen % BlockSize) == 0), (byte)3, (byte)4) << LAST_THREE_BITS_OFFSET;
             }
             m_aadPos = 0;
@@ -138,18 +135,10 @@ protected void processBufferDecrypt(byte[] input, int inOff, byte[] output, int
         XOR(output, outOff, BlockSize);
     }
 
-    @Override
-    public int processBytes(byte[] input, int inOff, int len, byte[] output, int outOff)
-        throws DataLengthException
-    {
-        messageLen += len;
-        return super.processBytes(input, inOff, len, output, outOff);
-    }
-
     @Override
     protected void processFinalBlock(byte[] output, int outOff)
     {
-        int len = messageLen - (forEncryption ? 0 : MAC_SIZE);
+        int len = dataOperator.getLen() - (forEncryption ? 0 : MAC_SIZE);
         int bufferLen = m_bufPos;// - (forEncryption ? 0 : MAC_SIZE);
         int aadLen = aadOperator.getLen();
         if (aadLen != 0 || len != 0)
@@ -194,7 +183,6 @@ protected void reset(boolean clearMac)
         bufferReset();
         input_empty = true;
         aadFinished = false;
-        messageLen = 0;
         System.arraycopy(K, 0, state, 0, K.length);
         System.arraycopy(N, 0, state, K.length, N.length);
         super.reset(clearMac);

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

@@ -2,7 +2,6 @@
 
 import org.bouncycastle.util.Arrays;
 
-
 /**
  * Romulus v1.3, based on the current round 3 submission, https://romulusae.github.io/romulus/
  * Reference C implementation: https://github.com/romulusae/romulus

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

@@ -10,7 +10,6 @@
 import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.crypto.engines.ElephantEngine;
-import org.bouncycastle.crypto.engines.GiftCofbEngine;
 import org.bouncycastle.crypto.modes.AEADCipher;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.crypto.params.ParametersWithIV;