Refactor Ascon

Author: gefeili

…e/crypto/digests/AsconDefaultDigest.java …stle/crypto/digests/AsconBaseDigest.javacore/src/main/java/org/bouncycastle/crypto/digests/AsconDefaultDigest.java renamed to core/src/main/java/org/bouncycastle/crypto/digests/AsconBaseDigest.java core/src/main/java/org/bouncycastle/crypto/digests/AsconDefaultDigest.java renamed to core/src/main/java/org/bouncycastle/crypto/digests/AsconBaseDigest.java

@@ -7,7 +7,7 @@
 import org.bouncycastle.crypto.OutputLengthException;
 import org.bouncycastle.util.Pack;
 
-abstract class AsconDefaultDigest
+abstract class AsconBaseDigest
     implements ExtendedDigest
 {
     protected long x0;

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

@@ -1,10 +1,9 @@
 package org.bouncycastle.crypto.digests;
 
-import java.io.ByteArrayOutputStream;
-
 import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.crypto.OutputLengthException;
 import org.bouncycastle.crypto.Xof;
+import org.bouncycastle.util.Arrays;
 
 /**
  * ASCON v1.2 XOF, https://ascon.iaik.tugraz.at/ .
@@ -14,51 +13,49 @@
  * ASCON v1.2 XOF with reference to C Reference Impl from: https://github.com/ascon/ascon-c .
  */
 public class AsconCxof128
-    extends AsconDefaultDigest
+    extends AsconBaseDigest
     implements Xof
 {
-    public AsconCxof128()
-    {
-        reset();
-    }
+    private byte[] s;
 
-    private final ByteArrayOutputStream customizedString = new ByteArrayOutputStream();
-
-
-    @Override
-    public String getAlgorithmName()
+    public AsconCxof128(byte[] s)
     {
-        return "Ascon-XOF-128";
-    }
-
-
-    public void updateCustomizedString(byte in)
-    {
-        customizedString.write(in);
+        if (s.length > 2048)
+        {
+            throw new DataLengthException("customized string is too long");
+        }
+        this.s = Arrays.clone(s);
+        reset();
     }
 
-    public void updateCustomizedString(byte[] input, int inOff, int len)
+    public AsconCxof128(byte[] s, int off, int len)
     {
-        if ((inOff + len) > input.length)
+        if ((off + len) > s.length)
         {
             throw new DataLengthException("input buffer too short");
         }
-        customizedString.write(input, inOff, len);
+        if (len > 2048)
+        {
+            throw new DataLengthException("customized string is too long");
+        }
+        this.s = Arrays.copyOfRange(s, off, off + len);
+        reset();
+    }
+    @Override
+    public String getAlgorithmName()
+    {
+        return "Ascon-XOF-128";
     }
 
     @Override
     public int doOutput(byte[] output, int outOff, int outLen)
     {
+
         if (CRYPTO_BYTES + outOff > output.length)
         {
             throw new OutputLengthException("output buffer is too short");
         }
-        int customizedStringLen = customizedString.size();
-        if (customizedStringLen > 2048)
-        {
-            throw new DataLengthException("customized string is too long");
-        }
-        absorb(customizedString.toByteArray(), customizedStringLen);
+        absorb(s, s.length);
         absorb(buffer.toByteArray(), buffer.size());
         /* squeeze full output blocks */
         squeeze(output, outOff, outLen);
@@ -80,7 +77,6 @@ public int doFinal(byte[] output, int outOff, int outLen)
     @Override
     public void reset()
     {
-        customizedString.reset();
         buffer.reset();
         /* initialize */
         x0 = 7445901275803737603L;

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

@@ -1,6 +1,5 @@
 package org.bouncycastle.crypto.digests;
 
-import org.bouncycastle.crypto.OutputLengthException;
 import org.bouncycastle.util.Pack;
 
 /** ASCON v1.2 Digest, https://ascon.iaik.tugraz.at/ .
@@ -11,7 +10,7 @@
  * @deprecated use Ascon Hash 256 Digest
  */
 public class AsconDigest
-    extends AsconDefaultDigest
+    extends AsconBaseDigest
 {
     public enum AsconParameters
     {

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

@@ -8,7 +8,7 @@
  * ASCON v1.2 Digest with reference to C Reference Impl from: https://github.com/ascon/ascon-c .
  */
 public class AsconHash256Digest
-    extends AsconDefaultDigest
+    extends AsconBaseDigest
 {
     public AsconHash256Digest()
     {

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

@@ -1,9 +1,5 @@
 package org.bouncycastle.crypto.digests;
 
-import java.io.ByteArrayOutputStream;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
 import org.bouncycastle.crypto.Xof;
 import org.bouncycastle.util.Pack;
 
@@ -15,7 +11,7 @@
  * @deprecated Now superseded - please use AsconXof128
  */
 public class AsconXof
-    extends AsconDefaultDigest
+    extends AsconBaseDigest
     implements Xof
 {
     public enum AsconParameters

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

@@ -1,11 +1,6 @@
 package org.bouncycastle.crypto.digests;
 
-import java.io.ByteArrayOutputStream;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
 import org.bouncycastle.crypto.Xof;
-import org.bouncycastle.util.Pack;
 
 /**
  * ASCON v1.2 XOF, https://ascon.iaik.tugraz.at/ .
@@ -16,7 +11,7 @@
  *
  */
 public class AsconXof128
-    extends AsconDefaultDigest
+    extends AsconBaseDigest
     implements Xof
 {
     public AsconXof128()