move new byte array of mac to AsconBufferBaseEngine

Author: gefeili

core/src/main/java/org/bouncycastle/crypto/digests/ISAPDigest.java

@@ -1,6 +1,7 @@
 package org.bouncycastle.crypto.digests;
 
 import org.bouncycastle.crypto.engines.AsconPermutationFriend;
+import org.bouncycastle.util.Longs;
 import org.bouncycastle.util.Pack;
 
 /**
@@ -43,15 +44,10 @@ public ISAPDigest()
         reset();
     }
 
-    private long ROTR(long x, long n)
-    {
-        return (x >>> n) | (x << (64 - n));
-    }
-
     protected long U64BIG(long x)
     {
-        return ((ROTR(x, 8) & (0xFF000000FF000000L)) | (ROTR(x, 24) & (0x00FF000000FF0000L)) |
-            (ROTR(x, 40) & (0x0000FF000000FF00L)) | (ROTR(x, 56) & (0x000000FF000000FFL)));
+        return ((Longs.rotateRight(x, 8) & (0xFF000000FF000000L)) | (Longs.rotateRight(x, 24) & (0x00FF000000FF0000L)) |
+            (Longs.rotateRight(x, 40) & (0x0000FF000000FF00L)) | (Longs.rotateRight(x, 56) & (0x000000FF000000FFL)));
     }
 
     @Override

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

@@ -663,6 +663,7 @@ public int doFinal(byte[] output, int outOff)
         {
             throw new OutputLengthException("output buffer too short");
         }
+        mac = new byte[MAC_SIZE];
         processFinalBlock(output, outOff);
         if (forEncryption)
         {
@@ -767,7 +768,6 @@ protected boolean checkData(boolean isDoFinal)
         }
     }
 
-    //TODO: override this for aadFinished
     protected void finishAAD(State nextState, boolean isDoFinal)
     {
         // State indicates whether we ever received AAD

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

@@ -1,6 +1,5 @@
 package org.bouncycastle.crypto.engines;
 
-import org.bouncycastle.crypto.digests.ISAPDigest;
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.Pack;
 

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

@@ -73,7 +73,6 @@ protected void processFinalBlock(byte[] output, int outOff)
         {
             processFinalDecrypt(m_buf, m_bufPos, output, outOff);
         }
-        mac = new byte[MAC_SIZE];
         setBytes(p.x3, mac, 0);
         setBytes(p.x4, mac, 8);
     }

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

@@ -389,7 +389,6 @@ protected void processFinalBlock(byte[] output, int outOff)
         int nblocks_ad = 1 + (IV_SIZE + adlen) / BlockSize;
         int nb_it = Math.max(nblocks_c + 1, nblocks_ad - 1);
         processBytes(m_buf, output, outOff, nb_it, nblocks_m, nblocks_c, mlen, nblocks_ad);
-        mac = new byte[MAC_SIZE];
         Bytes.xorTo(BlockSize, expanded_key, tag_buffer);
         instance.permutation(tag_buffer);
         Bytes.xorTo(BlockSize, expanded_key, tag_buffer);

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

@@ -288,7 +288,6 @@ protected void processFinalBlock(byte[] output, int outOff)
             /* T = E(X[m+a]) */
             giftb128(input, k, Y);
         }
-        mac = new byte[BlockSize];
         System.arraycopy(Y, 0, mac, 0, BlockSize);
     }
 

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

@@ -785,7 +785,6 @@ protected void processFinalBlock(byte[] output, int outOff)
     {
         processFinalAAD();
         int len = m_bufPos;
-        mac = new byte[MAC_SIZE];
         ISAPAEAD.processEncFinalBlock(output, outOff);
         ISAPAEAD.swapInternalState();
         if (forEncryption)

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

@@ -176,7 +176,6 @@ protected void processFinalBlock(byte[] output, int outOff)
             state[STATE_INBYTES - 1] ^= 1 << LAST_THREE_BITS_OFFSET;
         }
         PhotonPermutation(state_2d, state);
-        mac = new byte[MAC_SIZE];
         System.arraycopy(state, 0, mac, 0, MAC_SIZE);
     }
 

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

@@ -32,7 +32,7 @@ public enum RomulusParameters
     //12 13 14 15
 
     // 8-bit Sbox
-    private final byte[] sbox_8 =
+    private static final byte[] sbox_8 =
         {
             (byte)0x65, (byte)0x4c, (byte)0x6a, (byte)0x42, (byte)0x4b, (byte)0x63, (byte)0x43, (byte)0x6b, (byte)0x55,
             (byte)0x75, (byte)0x5a, (byte)0x7a, (byte)0x53, (byte)0x73, (byte)0x5b, (byte)0x7b, (byte)0x35, (byte)0x8c,
@@ -66,10 +66,10 @@ public enum RomulusParameters
         };
 
     // Tweakey permutation
-    private final byte[] TWEAKEY_P = {9, 15, 8, 13, 10, 14, 12, 11, 0, 1, 2, 3, 4, 5, 6, 7};
+    private static final byte[] TWEAKEY_P = {9, 15, 8, 13, 10, 14, 12, 11, 0, 1, 2, 3, 4, 5, 6, 7};
 
     // round constants
-    private final byte[] RC = {
+    private static final byte[] RC = {
         0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3E, 0x3D, 0x3B, 0x37, 0x2F,
         0x1E, 0x3C, 0x39, 0x33, 0x27, 0x0E, 0x1D, 0x3A, 0x35, 0x2B,
         0x16, 0x2C, 0x18, 0x30, 0x21, 0x02, 0x05, 0x0B, 0x17, 0x2E,
@@ -138,7 +138,6 @@ public void processFinalBlock(byte[] output, int outOff)
             int adlen = aadOperator.getLen();
             int mlen = dataOperator.getLen() - (forEncryption ? 0 : MAC_SIZE);
             byte[] m = ((StreamDataOperator)dataOperator).getBytes();
-            mac = new byte[MAC_SIZE];
             int xlen, mOff = 0, mauth = 0;
             xlen = mlen;
             if ((adlen & 31) == 0 && adlen != 0)
@@ -360,7 +359,6 @@ else if (m_bufPos != 0)
                 lfsr_gf56(CNT);
                 nonce_encryption(npub, CNT, s, k, m_bufPos == AD_BLK_LEN_HALF ? (byte)0x14 : (byte)0x15);
             }
-            mac = new byte[MAC_SIZE];
             g8A(s, mac, 0);
         }
 
@@ -540,7 +538,6 @@ else if (messegeLen > 0)
             System.arraycopy(g, 0, LR, 16, 16);
             Arrays.clear(CNT_Z);
             block_cipher(LR, k, LR, 16, CNT_Z, (byte)68);
-            mac = new byte[MAC_SIZE];
             System.arraycopy(LR, 0, mac, 0, MAC_SIZE);
         }
 
@@ -635,8 +632,7 @@ public void reset()
         }
     }
 
-
-    private void skinny_128_384_plus_enc(byte[] input, byte[] userkey)
+    private static void skinny_128_384_plus_enc(byte[] input, byte[] userkey)
     {
         byte[][] state = new byte[4][4];
         byte[][][] keyCells = new byte[3][4][4];

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

@@ -184,7 +184,6 @@ protected void processFinalBlock(byte[] output, int outOff)
         {
             state[RATE_WORDS + i] ^= k[i];
         }
-        mac = new byte[MAC_SIZE];
         Pack.intToLittleEndian(state, RATE_WORDS, TAG_WORDS, mac, 0);
 
     }