Remove some unnecessary code

gefeili · gefeili · commit c2b0ed7f7cc3 · 2025-01-28T16:31:57.000+10:30
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/AsconAEAD128.java b/core/src/main/java/org/bouncycastle/crypto/engines/AsconAEAD128.java
@@ -21,16 +21,10 @@ public class AsconAEAD128
 {
     public AsconAEAD128()
     {
-        KEY_SIZE = 16;
-        IV_SIZE = 16;
-        MAC_SIZE = 16;
-        AADBufferSize = BlockSize = 16;
+        KEY_SIZE = IV_SIZE = MAC_SIZE = AADBufferSize = BlockSize = 16;
         ASCON_IV = 0x00001000808c0001L;
         algorithmName = "Ascon-AEAD128";
         nr = 8;
-        m_bufferSizeDecrypt = BlockSize + MAC_SIZE;
-        m_buf = new byte[m_bufferSizeDecrypt];
-        m_aad = new byte[BlockSize];
         dsep = -9223372036854775808L; //0x80L << 56
         setInnerMembers(ProcessingBufferType.Immediate, AADOperatorType.Default, DataOperatorType.Default);
     }
@@ -65,7 +59,7 @@ protected void ascon_aeadinit()
         p.x4 ^= K1;
     }
 
-    protected void processFinalAadBlock()
+    protected void processFinalAAD()
     {
         if (m_aadPos == BlockSize)
         {
@@ -164,5 +158,4 @@ public String getAlgorithmVersion()
     {
         return "v1.3";
     }
-}
-
+}
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/AsconBaseEngine.java b/core/src/main/java/org/bouncycastle/crypto/engines/AsconBaseEngine.java
@@ -27,7 +27,7 @@ protected void finishAAD(State nextState, boolean isDofinal)
         {
         case DecAad:
         case EncAad:
-            processFinalAadBlock();
+            this.processFinalAAD();
             p.p(nr);
             break;
         default:
@@ -39,13 +39,10 @@ protected void finishAAD(State nextState, boolean isDofinal)
         m_state = nextState;
     }
 
-    protected abstract void processFinalAadBlock();
-
     protected abstract void processFinalDecrypt(byte[] input, int inLen, byte[] output, int outOff);
 
     protected abstract void processFinalEncrypt(byte[] input, int inLen, byte[] output, int outOff);
 
-
     protected void processBufferAAD(byte[] buffer, int inOff)
     {
         p.x0 ^= loadBytes(buffer, inOff);
@@ -56,12 +53,6 @@ protected void processBufferAAD(byte[] buffer, int inOff)
         p.p(nr);
     }
 
-    protected void processFinalAAD()
-    {
-        processFinalAadBlock();
-        p.p(nr);
-    }
-
     @Override
     protected void processFinalBlock(byte[] output, int outOff)
     {
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/AsconEngine.java b/core/src/main/java/org/bouncycastle/crypto/engines/AsconEngine.java
@@ -36,8 +36,7 @@ public enum AsconParameters
     public AsconEngine(AsconParameters asconParameters)
     {
         this.asconParameters = asconParameters;
-        IV_SIZE = 16;
-        MAC_SIZE = 16;
+        IV_SIZE = MAC_SIZE = 16;
         switch (asconParameters)
         {
         case ascon80pq:
@@ -63,9 +62,7 @@ public AsconEngine(AsconParameters asconParameters)
         }
         nr = (BlockSize == 8) ? 6 : 8;
         m_bufferSizeDecrypt = BlockSize + MAC_SIZE;
-        m_buf = new byte[m_bufferSizeDecrypt];
         AADBufferSize = BlockSize;
-        m_aad = new byte[BlockSize];
         dsep = 1L;
         setInnerMembers(asconParameters == AsconParameters.ascon128a ? ProcessingBufferType.Immediate : ProcessingBufferType.ImmediateLargeMac, AADOperatorType.Default, DataOperatorType.Default);
     }
@@ -108,7 +105,7 @@ protected void ascon_aeadinit()
         p.x4 ^= K2;
     }
 
-    protected void processFinalAadBlock()
+    protected void processFinalAAD()
     {
         m_aad[m_aadPos] = (byte)0x80;
         if (m_aadPos >= 8) // ASCON_AEAD_RATE == 16 is implied
@@ -244,4 +241,4 @@ public String getAlgorithmVersion()
     {
         return "v1.2";
     }
-}
+}
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/ISAPEngine.java b/core/src/main/java/org/bouncycastle/crypto/engines/ISAPEngine.java
@@ -26,9 +26,7 @@ public enum IsapType
 
     public ISAPEngine(IsapType isapType)
     {
-        KEY_SIZE = 16;
-        IV_SIZE = 16;
-        MAC_SIZE = 16;
+        KEY_SIZE = IV_SIZE = MAC_SIZE = 16;
         switch (isapType)
         {
         case ISAP_A_128A:
@@ -53,7 +51,7 @@ public ISAPEngine(IsapType isapType)
             ProcessingBufferType.ImmediateLargeMac, AADOperatorType.Default, DataOperatorType.Default);
     }
 
-    final int ISAP_STATE_SZ = 40;
+    private static final int ISAP_STATE_SZ = 40;
     private byte[] k;
     private byte[] npub;
     private int ISAP_rH;
@@ -740,15 +738,14 @@ protected void processBufferDecrypt(byte[] input, int inOff, byte[] output, int
     protected void processFinalBlock(byte[] output, int outOff)
     {
         processFinalAAD();
-        int len = m_bufPos;
         ISAPAEAD.processEncFinalBlock(output, outOff);
         if (forEncryption)
         {
-            ISAPAEAD.processMACFinal(output, outOff, len, mac);
+            ISAPAEAD.processMACFinal(output, outOff, m_bufPos, mac);
         }
         else
         {
-            ISAPAEAD.processMACFinal(m_buf, 0, len, mac);
+            ISAPAEAD.processMACFinal(m_buf, 0, m_bufPos, mac);
         }
     }
 
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/RomulusEngine.java b/core/src/main/java/org/bouncycastle/crypto/engines/RomulusEngine.java
@@ -22,7 +22,7 @@ public enum RomulusParameters
 
     private byte[] k;
     private byte[] npub;
-    private final int AD_BLK_LEN_HALF = 16;
+    private static final int AD_BLK_LEN_HALF = 16;
     private Instance instance;
     private final byte[] CNT;
 
@@ -120,11 +120,11 @@ private interface Instance
     private class RomulusM
         implements Instance
     {
-        byte[] mac_s = new byte[16];
-        byte[] mac_CNT = new byte[7];
+        private final byte[] mac_s = new byte[16];
+        private final byte[] mac_CNT = new byte[7];
 
-        byte[] s = new byte[16];
-        byte[] CNT = new byte[7];
+        private final byte[] s = new byte[16];
+        private final byte[] CNT = new byte[7];
         int offset;
         boolean twist = true;
 
@@ -626,7 +626,6 @@ public void reset()
             Arrays.clear(h);
             Arrays.clear(g);
             Arrays.clear(LR);
-            Arrays.clear(CNT_Z);
             Arrays.clear(T);
             Arrays.clear(S);
             reset_lfsr_gf56(CNT);

Original file line number	Diff line number	Diff line change
`@@ -21,16 +21,10 @@ public class AsconAEAD128`
`21`	`21`	`{`
`22`	`22`	`public AsconAEAD128()`
`23`	`23`	`{`
`24`		`- KEY_SIZE = 16;`
`25`		`- IV_SIZE = 16;`
`26`		`- MAC_SIZE = 16;`
`27`		`- AADBufferSize = BlockSize = 16;`
	`24`	`+ KEY_SIZE = IV_SIZE = MAC_SIZE = AADBufferSize = BlockSize = 16;`
`28`	`25`	`ASCON_IV = 0x00001000808c0001L;`
`29`	`26`	`algorithmName = "Ascon-AEAD128";`
`30`	`27`	`nr = 8;`
`31`		`- m_bufferSizeDecrypt = BlockSize + MAC_SIZE;`
`32`		`- m_buf = new byte[m_bufferSizeDecrypt];`
`33`		`- m_aad = new byte[BlockSize];`
`34`	`28`	`dsep = -9223372036854775808L; //0x80L << 56`
`35`	`29`	`setInnerMembers(ProcessingBufferType.Immediate, AADOperatorType.Default, DataOperatorType.Default);`
`36`	`30`	`}`
`@@ -65,7 +59,7 @@ protected void ascon_aeadinit()`
`65`	`59`	`p.x4 ^= K1;`
`66`	`60`	`}`
`67`	`61`
`68`		`- protected void processFinalAadBlock()`
	`62`	`+ protected void processFinalAAD()`
`69`	`63`	`{`
`70`	`64`	`if (m_aadPos == BlockSize)`
`71`	`65`	`{`
`@@ -164,5 +158,4 @@ public String getAlgorithmVersion()`
`164`	`158`	`{`
`165`	`159`	`return "v1.3";`
`166`	`160`	`}`
`167`		`-}`
`168`		`-`
	`161`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,7 @@ public enum AsconParameters`
`36`	`36`	`public AsconEngine(AsconParameters asconParameters)`
`37`	`37`	`{`
`38`	`38`	`this.asconParameters = asconParameters;`
`39`		`- IV_SIZE = 16;`
`40`		`- MAC_SIZE = 16;`
	`39`	`+ IV_SIZE = MAC_SIZE = 16;`
`41`	`40`	`switch (asconParameters)`
`42`	`41`	`{`
`43`	`42`	`case ascon80pq:`
`@@ -63,9 +62,7 @@ public AsconEngine(AsconParameters asconParameters)`
`63`	`62`	`}`
`64`	`63`	`nr = (BlockSize == 8) ? 6 : 8;`
`65`	`64`	`m_bufferSizeDecrypt = BlockSize + MAC_SIZE;`
`66`		`- m_buf = new byte[m_bufferSizeDecrypt];`
`67`	`65`	`AADBufferSize = BlockSize;`
`68`		`- m_aad = new byte[BlockSize];`
`69`	`66`	`dsep = 1L;`
`70`	`67`	`setInnerMembers(asconParameters == AsconParameters.ascon128a ? ProcessingBufferType.Immediate : ProcessingBufferType.ImmediateLargeMac, AADOperatorType.Default, DataOperatorType.Default);`
`71`	`68`	`}`
`@@ -108,7 +105,7 @@ protected void ascon_aeadinit()`
`108`	`105`	`p.x4 ^= K2;`
`109`	`106`	`}`
`110`	`107`
`111`		`- protected void processFinalAadBlock()`
	`108`	`+ protected void processFinalAAD()`
`112`	`109`	`{`
`113`	`110`	`m_aad[m_aadPos] = (byte)0x80;`
`114`	`111`	`if (m_aadPos >= 8) // ASCON_AEAD_RATE == 16 is implied`
`@@ -244,4 +241,4 @@ public String getAlgorithmVersion()`
`244`	`241`	`{`
`245`	`242`	`return "v1.2";`
`246`	`243`	`}`
`247`		`-}`
	`244`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,7 @@ public enum IsapType`
`26`	`26`
`27`	`27`	`public ISAPEngine(IsapType isapType)`
`28`	`28`	`{`
`29`		`- KEY_SIZE = 16;`
`30`		`- IV_SIZE = 16;`
`31`		`- MAC_SIZE = 16;`
	`29`	`+ KEY_SIZE = IV_SIZE = MAC_SIZE = 16;`
`32`	`30`	`switch (isapType)`
`33`	`31`	`{`
`34`	`32`	`case ISAP_A_128A:`
`@@ -53,7 +51,7 @@ public ISAPEngine(IsapType isapType)`
`53`	`51`	`ProcessingBufferType.ImmediateLargeMac, AADOperatorType.Default, DataOperatorType.Default);`
`54`	`52`	`}`
`55`	`53`
`56`		`- final int ISAP_STATE_SZ = 40;`
	`54`	`+ private static final int ISAP_STATE_SZ = 40;`
`57`	`55`	`private byte[] k;`
`58`	`56`	`private byte[] npub;`
`59`	`57`	`private int ISAP_rH;`
`@@ -740,15 +738,14 @@ protected void processBufferDecrypt(byte[] input, int inOff, byte[] output, int`
`740`	`738`	`protected void processFinalBlock(byte[] output, int outOff)`
`741`	`739`	`{`
`742`	`740`	`processFinalAAD();`
`743`		`- int len = m_bufPos;`
`744`	`741`	`ISAPAEAD.processEncFinalBlock(output, outOff);`
`745`	`742`	`if (forEncryption)`
`746`	`743`	`{`
`747`		`- ISAPAEAD.processMACFinal(output, outOff, len, mac);`
	`744`	`+ ISAPAEAD.processMACFinal(output, outOff, m_bufPos, mac);`
`748`	`745`	`}`
`749`	`746`	`else`
`750`	`747`	`{`
`751`		`- ISAPAEAD.processMACFinal(m_buf, 0, len, mac);`
	`748`	`+ ISAPAEAD.processMACFinal(m_buf, 0, m_bufPos, mac);`
`752`	`749`	`}`
`753`	`750`	`}`
`754`	`751`