Refactor around Ascon digests

Author: gefeili

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

@@ -124,6 +124,12 @@ public void update(byte[] input, int inOff, int len)
         m_bufPos = remaining;
     }
 
+    @Override
+    public int doFinal(byte[] output, int outOff)
+    {
+        return hash(output, outOff, CRYPTO_BYTES);
+    }
+
     protected void finishAbsorbing()
     {
         x0 ^= loadBytes(m_buf, 0, m_bufPos);

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

@@ -14,7 +14,7 @@
  * <a href="https://csrc.nist.gov/pubs/sp/800/232/ipd">NIST SP 800-232 (Initial Public Draft)</a>.
  * For reference source code and implementation details, please see:
  * <a href="https://github.com/ascon/ascon-c">Reference, highly optimized, masked C and
- *  ASM implementations of Ascon (NIST SP 800-232)</a>.
+ * ASM implementations of Ascon (NIST SP 800-232)</a>.
  * </p>
  */
 public class AsconCxof128
@@ -31,8 +31,6 @@ public AsconCxof128(byte[] s)
         }
         this.s = Arrays.clone(s);
         reset();
-        update(s, 0, s.length);
-        finishAbsorbing();
     }
 
     public AsconCxof128(byte[] s, int off, int len)
@@ -47,8 +45,6 @@ public AsconCxof128(byte[] s, int off, int len)
         }
         this.s = Arrays.copyOfRange(s, off, off + len);
         reset();
-        update(s, 0, s.length);
-        finishAbsorbing();
     }
 
     public AsconCxof128()
@@ -63,7 +59,7 @@ protected long pad(int i)
 
     protected long loadBytes(final byte[] bytes, int inOff)
     {
-        return Pack.littleEndianToLong(bytes,  inOff);
+        return Pack.littleEndianToLong(bytes, inOff);
     }
 
     protected long loadBytes(final byte[] bytes, int inOff, int n)
@@ -100,11 +96,6 @@ public int doOutput(byte[] output, int outOff, int outLen)
         return outLen;
     }
 
-    @Override
-    public int doFinal(byte[] output, int outOff)
-    {
-        return doOutput(output, outOff, getDigestSize());
-    }
 
     @Override
     public int doFinal(byte[] output, int outOff, int outLen)
@@ -122,8 +113,11 @@ public void reset()
         x2 = -1616759365661982283L;
         x3 = 3076320316797452470L;
         x4 = -8124743304765850554L;
-        update(s, 0, s.length);
-        finishAbsorbing();
+        if (s != null)
+        {
+            update(s, 0, s.length);
+            finishAbsorbing();
+        }
     }
 }
 

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

@@ -72,12 +72,6 @@ public String getAlgorithmName()
         return algorithmName;
     }
 
-    @Override
-    public int doFinal(byte[] output, int outOff)
-    {
-        return hash(output, outOff, CRYPTO_BYTES);
-    }
-
     @Override
     public void reset()
     {

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

@@ -52,11 +52,7 @@ public String getAlgorithmName()
         return "Ascon-Hash256";
     }
 
-    @Override
-    public int doFinal(byte[] output, int outOff)
-    {
-        return hash(output, outOff, CRYPTO_BYTES);
-    }
+
 
     @Override
     public void reset()

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

@@ -82,12 +82,6 @@ public int doOutput(byte[] output, int outOff, int outLen)
         return hash(output, outOff, outLen);
     }
 
-    @Override
-    public int doFinal(byte[] output, int outOff)
-    {
-        return doOutput(output, outOff, getDigestSize());
-    }
-
     @Override
     public int doFinal(byte[] output, int outOff, int outLen)
     {

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

@@ -60,12 +60,6 @@ public int doOutput(byte[] output, int outOff, int outLen)
         return hash(output, outOff, outLen);
     }
 
-    @Override
-    public int doFinal(byte[] output, int outOff)
-    {
-        return doOutput(output, outOff, getDigestSize());
-    }
-
     @Override
     public int doFinal(byte[] output, int outOff, int outLen)
     {