deleted stateless processing

dghgit · dghgit · commit 78a1cabcf68b · 2022-09-04T01:46:13.000+10:00
diff --git a/core/src/main/java/org/bouncycastle/crypto/StatelessProcessing.java b/core/src/main/java/org/bouncycastle/crypto/StatelessProcessing.java
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java b/core/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java
@@ -5,7 +5,6 @@
 import org.bouncycastle.crypto.CryptoServicesRegistrar;
 import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.StatelessProcessing;
 import org.bouncycastle.crypto.constraints.DefaultServiceProperties;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.util.Arrays;
@@ -35,7 +34,7 @@
  *
  */
 public class AESEngine
-    implements BlockCipher, StatelessProcessing
+    implements BlockCipher
 {
     // The S box
     private static final byte[] S = {
@@ -589,11 +588,6 @@ private void decryptBlock(byte[] in, int inOff, byte[] out, int outOff, int[][]
         Pack.intToLittleEndian(C3, out, outOff + 12);
     }
 
-    public BlockCipher newInstance()
-    {
-        return new AESEngine();
-    }
-
     private int bitsOfSecurity()
     {
         if (WorkingKey == null)
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/AESLightEngine.java b/core/src/main/java/org/bouncycastle/crypto/engines/AESLightEngine.java
@@ -5,7 +5,6 @@
 import org.bouncycastle.crypto.CryptoServicesRegistrar;
 import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.StatelessProcessing;
 import org.bouncycastle.crypto.constraints.DefaultServiceProperties;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.util.Pack;
@@ -36,7 +35,7 @@
  *
  */
 public class AESLightEngine
-    implements BlockCipher, StatelessProcessing
+    implements BlockCipher
 {
     // The S box
     private static final byte[] S = {
@@ -478,11 +477,6 @@ private void decryptBlock(byte[] in, int inOff, byte[] out, int outOff, int[][]
         Pack.intToLittleEndian(C3, out, outOff + 12);
     }
 
-    public BlockCipher newInstance()
-    {
-        return new AESLightEngine();
-    }
-
     private int bitsOfSecurity()
     {
         if (WorkingKey == null)
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/CamelliaEngine.java b/core/src/main/java/org/bouncycastle/crypto/engines/CamelliaEngine.java
@@ -5,15 +5,14 @@
 import org.bouncycastle.crypto.CryptoServicesRegistrar;
 import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.StatelessProcessing;
 import org.bouncycastle.crypto.constraints.DefaultServiceProperties;
 import org.bouncycastle.crypto.params.KeyParameter;
 
 /**
  * Camellia - based on RFC 3713.
  */
 public class CamelliaEngine
-    implements BlockCipher, StatelessProcessing
+    implements BlockCipher
 {
     private boolean initialised = false;
     private int _keySize;
@@ -690,11 +689,6 @@ public void reset()
 
     }
 
-    public BlockCipher newInstance()
-    {
-        return new CamelliaEngine();
-    }
-
     private int bitsOfSecurity()
     {
         return _keySize * 8;
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/CamelliaLightEngine.java b/core/src/main/java/org/bouncycastle/crypto/engines/CamelliaLightEngine.java
@@ -5,7 +5,6 @@
 import org.bouncycastle.crypto.CryptoServicesRegistrar;
 import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.StatelessProcessing;
 import org.bouncycastle.crypto.constraints.DefaultServiceProperties;
 import org.bouncycastle.crypto.params.KeyParameter;
 
@@ -14,7 +13,7 @@
  */
 
 public class CamelliaLightEngine
-    implements BlockCipher, StatelessProcessing
+    implements BlockCipher
 {
     private static final int BLOCK_SIZE = 16;
     private static final int MASK8 = 0xff;
@@ -598,11 +597,6 @@ public void reset()
     {
     }
 
-    public BlockCipher newInstance()
-    {
-        return new CamelliaLightEngine();
-    }
-
     private int bitsOfSecurity()
     {
         return _keySize * 8;
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/SEEDEngine.java b/core/src/main/java/org/bouncycastle/crypto/engines/SEEDEngine.java
@@ -5,15 +5,14 @@
 import org.bouncycastle.crypto.CryptoServicesRegistrar;
 import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.StatelessProcessing;
 import org.bouncycastle.crypto.constraints.DefaultServiceProperties;
 import org.bouncycastle.crypto.params.KeyParameter;
 
 /**
  * Implementation of the SEED algorithm as described in RFC 4009
  */
 public class SEEDEngine
-    implements BlockCipher, StatelessProcessing
+    implements BlockCipher
 {
     private final int BLOCK_SIZE = 16;
 
@@ -353,9 +352,4 @@ private int phaseCalc2(int r0, int ki0, int r1, int ki1)
     {
         return G(phaseCalc1(r0, ki0, r1, ki1) + G((r0 ^ ki0) ^ (r1 ^ ki1)));
     }
-
-    public BlockCipher newInstance()
-    {
-        return new SEEDEngine();
-    }
 }
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/SerpentEngine.java b/core/src/main/java/org/bouncycastle/crypto/engines/SerpentEngine.java
@@ -1,6 +1,5 @@
 package org.bouncycastle.crypto.engines;
 
-import org.bouncycastle.crypto.BlockCipher;
 import org.bouncycastle.util.Pack;
 
 /**
@@ -300,9 +299,4 @@ protected void decryptBlock(
         Pack.intToLittleEndian(X[2] ^ wKey[2], output, outOff + 8);
         Pack.intToLittleEndian(X[3] ^ wKey[3], output, outOff + 12);
     }
-
-    public BlockCipher newInstance()
-    {
-        return new SerpentEngine();
-    }
 }
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/SerpentEngineBase.java b/core/src/main/java/org/bouncycastle/crypto/engines/SerpentEngineBase.java
@@ -6,12 +6,11 @@
 import org.bouncycastle.crypto.CryptoServicesRegistrar;
 import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.StatelessProcessing;
 import org.bouncycastle.crypto.constraints.DefaultServiceProperties;
 import org.bouncycastle.crypto.params.KeyParameter;
 
 public abstract class SerpentEngineBase
-    implements BlockCipher, StatelessProcessing
+    implements BlockCipher
 {
     protected static final int BLOCK_SIZE = 16;
 
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/TnepresEngine.java b/core/src/main/java/org/bouncycastle/crypto/engines/TnepresEngine.java
@@ -1,6 +1,5 @@
 package org.bouncycastle.crypto.engines;
 
-import org.bouncycastle.crypto.BlockCipher;
 import org.bouncycastle.util.Pack;
 
 /**
@@ -307,9 +306,4 @@ protected void decryptBlock(
         Pack.intToBigEndian(X[1] ^ wKey[1], output, outOff + 8);
         Pack.intToBigEndian(X[0] ^ wKey[0], output, outOff + 12);
     }
-
-    public BlockCipher newInstance()
-    {
-        return new TnepresEngine();
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`import org.bouncycastle.crypto.CryptoServicesRegistrar;`
`6`	`6`	`import org.bouncycastle.crypto.DataLengthException;`
`7`	`7`	`import org.bouncycastle.crypto.OutputLengthException;`
`8`		`-import org.bouncycastle.crypto.StatelessProcessing;`
`9`	`8`	`import org.bouncycastle.crypto.constraints.DefaultServiceProperties;`
`10`	`9`	`import org.bouncycastle.crypto.params.KeyParameter;`
`11`	`10`
`@@ -14,7 +13,7 @@`
`14`	`13`	`*/`
`15`	`14`
`16`	`15`	`public class CamelliaLightEngine`
`17`		`- implements BlockCipher, StatelessProcessing`
	`16`	`+ implements BlockCipher`
`18`	`17`	`{`
`19`	`18`	`private static final int BLOCK_SIZE = 16;`
`20`	`19`	`private static final int MASK8 = 0xff;`
`@@ -598,11 +597,6 @@ public void reset()`
`598`	`597`	`{`
`599`	`598`	`}`
`600`	`599`
`601`		`- public BlockCipher newInstance()`
`602`		`- {`
`603`		`- return new CamelliaLightEngine();`
`604`		`- }`
`605`		`-`
`606`	`600`	`private int bitsOfSecurity()`
`607`	`601`	`{`
`608`	`602`	`return _keySize * 8;`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,14 @@`
`5`	`5`	`import org.bouncycastle.crypto.CryptoServicesRegistrar;`
`6`	`6`	`import org.bouncycastle.crypto.DataLengthException;`
`7`	`7`	`import org.bouncycastle.crypto.OutputLengthException;`
`8`		`-import org.bouncycastle.crypto.StatelessProcessing;`
`9`	`8`	`import org.bouncycastle.crypto.constraints.DefaultServiceProperties;`
`10`	`9`	`import org.bouncycastle.crypto.params.KeyParameter;`
`11`	`10`
`12`	`11`	`/**`
`13`	`12`	`* Implementation of the SEED algorithm as described in RFC 4009`
`14`	`13`	`*/`
`15`	`14`	`public class SEEDEngine`
`16`		`- implements BlockCipher, StatelessProcessing`
	`15`	`+ implements BlockCipher`
`17`	`16`	`{`
`18`	`17`	`private final int BLOCK_SIZE = 16;`
`19`	`18`
`@@ -353,9 +352,4 @@ private int phaseCalc2(int r0, int ki0, int r1, int ki1)`
`353`	`352`	`{`
`354`	`353`	`return G(phaseCalc1(r0, ki0, r1, ki1) + G((r0 ^ ki0) ^ (r1 ^ ki1)));`
`355`	`354`	`}`
`356`		`-`
`357`		`- public BlockCipher newInstance()`
`358`		`- {`
`359`		`- return new SEEDEngine();`
`360`		`- }`
`361`	`355`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package org.bouncycastle.crypto.engines;`
`2`	`2`
`3`		`-import org.bouncycastle.crypto.BlockCipher;`
`4`	`3`	`import org.bouncycastle.util.Pack;`
`5`	`4`
`6`	`5`	`/**`
`@@ -300,9 +299,4 @@ protected void decryptBlock(`
`300`	`299`	`Pack.intToLittleEndian(X[2] ^ wKey[2], output, outOff + 8);`
`301`	`300`	`Pack.intToLittleEndian(X[3] ^ wKey[3], output, outOff + 12);`
`302`	`301`	`}`
`303`		`-`
`304`		`- public BlockCipher newInstance()`
`305`		`- {`
`306`		`- return new SerpentEngine();`
`307`		`- }`
`308`	`302`	`}`