Refactor around constructor and reset of digests

Author: gefeili

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

@@ -112,10 +112,4 @@ protected int hash(byte[] output, int outOff, int outLen)
         squeeze(output, outOff, outLen);
         return outLen;
     }
-
-    public void reset()
-    {
-        Arrays.clear(m_buf);
-        m_bufPos = 0;
-    }
 }

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

@@ -35,6 +35,7 @@ public AsconCXof128(byte[] s)
 
     public AsconCXof128(byte[] s, int off, int len)
     {
+        algorithmName = "Ascon-CXOF128";
         if ((off + len) > s.length)
         {
             throw new DataLengthException("input buffer too short");
@@ -103,12 +104,6 @@ protected void padAndAbsorb()
         super.padAndAbsorb();
     }
 
-    @Override
-    public String getAlgorithmName()
-    {
-        return "Ascon-CXOF128";
-    }
-
     @Override
     public int doOutput(byte[] output, int outOff, int outLen)
     {

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

@@ -68,12 +68,6 @@ protected void setBytes(long w, byte[] bytes, int inOff, int n)
         Pack.longToBigEndian(w, bytes, inOff, n);
     }
 
-    @Override
-    public String getAlgorithmName()
-    {
-        return algorithmName;
-    }
-
     @Override
     public void reset()
     {

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

@@ -18,6 +18,7 @@ public class AsconHash256
 {
     public AsconHash256()
     {
+        algorithmName = "Ascon-Hash256";
         reset();
     }
 
@@ -46,12 +47,6 @@ protected void setBytes(long w, byte[] bytes, int inOff, int n)
         Pack.longToLittleEndian(w, bytes, inOff, n);
     }
 
-    @Override
-    public String getAlgorithmName()
-    {
-        return "Ascon-Hash256";
-    }
-
     @Override
     public void reset()
     {

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

@@ -97,12 +97,6 @@ protected void setBytes(long w, byte[] bytes, int inOff, int n)
         Pack.longToBigEndian(w, bytes, inOff, n);
     }
 
-    @Override
-    public String getAlgorithmName()
-    {
-        return algorithmName;
-    }
-
     @Override
     public int doOutput(byte[] output, int outOff, int outLen)
     {

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

@@ -22,6 +22,7 @@ public class AsconXof128
 
     public AsconXof128()
     {
+        algorithmName = "Ascon-XOF-128";
         reset();
     }
 
@@ -56,12 +57,6 @@ protected void padAndAbsorb()
         super.padAndAbsorb();
     }
 
-    @Override
-    public String getAlgorithmName()
-    {
-        return "Ascon-XOF-128";
-    }
-
     @Override
     public void update(byte in)
     {

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

@@ -3,6 +3,7 @@
 import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.crypto.ExtendedDigest;
 import org.bouncycastle.crypto.OutputLengthException;
+import org.bouncycastle.util.Arrays;
 
 public abstract class BufferBaseDigest
     implements ExtendedDigest
@@ -163,6 +164,12 @@ public int doFinal(byte[] output, int outOff)
         return DigestSize;
     }
 
+    public void reset()
+    {
+        Arrays.clear(m_buf);
+        m_bufPos = 0;
+    }
+
     protected abstract void processBytes(byte[] input, int inOff);
 
     protected abstract void finish(byte[] output, int outOff);

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

@@ -100,14 +100,13 @@ protected void finish(byte[] output, int outOff)
     @Override
     public void reset()
     {
+        super.reset();
         t0 = t1 = t2 = t3 = t4 = 0;
         /* init state */
         x0 = -1255492011513352131L;
         x1 = -8380609354527731710L;
         x2 = -5437372128236807582L;
         x3 = 4834782570098516968L;
         x4 = 3787428097924915520L;
-        Arrays.clear(m_buf);
-        m_bufPos = 0;
     }
 }

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

@@ -104,10 +104,9 @@ else if (blockCount == 4 && m_bufPos == 0)
     @Override
     public void reset()
     {
+        super.reset();
         Arrays.fill(state, (byte)0);
         blockCount = 0;
-        Arrays.clear(m_buf);
-        m_bufPos = 0;
     }
 
     void PHOTON_Permutation()

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

@@ -69,6 +69,7 @@ public RomulusDigest()
     {
         super(ProcessingBufferType.Immediate, 32);
         DigestSize = 32;
+        algorithmName = "Romulus Hash";
     }
 
     void skinny_128_384_plus_enc(byte[] input, byte[] userkey)
@@ -214,12 +215,6 @@ void ipad_256(byte[] m, int inOff, byte[] mp, int len8)
         mp[31] = (byte)(len8 & 0x1f);
     }
 
-    @Override
-    public String getAlgorithmName()
-    {
-        return "Romulus Hash";
-    }
-
     @Override
     protected void processBytes(byte[] input, int inOff)
     {
@@ -241,8 +236,7 @@ protected void finish(byte[] output, int outOff)
     @Override
     public void reset()
     {
-        Arrays.clear(m_buf);
-        m_bufPos = 0;
+        super.reset();
         Arrays.clear(h);
         Arrays.clear(g);
     }