Refactor around Ascon Digests

gefeili · gefeili · commit 45c65cfb663f · 2024-11-15T17:06:07.000+10:30
diff --git a/core/src/main/java/org/bouncycastle/crypto/digests/AsconBaseDigest.java b/core/src/main/java/org/bouncycastle/crypto/digests/AsconBaseDigest.java
@@ -59,8 +59,12 @@ protected void p(int nr)
 
     protected abstract long pad(int i);
 
+    protected abstract long loadBytes(final byte[] bytes);
+
     protected abstract long loadBytes(final byte[] bytes, int inOff, int n);
 
+    protected abstract void setBytes(long w, byte[] bytes, int inOff);
+
     protected abstract void setBytes(long w, byte[] bytes, int inOff, int n);
 
     @Override
@@ -81,7 +85,7 @@ public void update(byte in)
         m_buf[m_bufPos] = in;
         if (++m_bufPos == ASCON_HASH_RATE)
         {
-            x0 ^= loadBytes(m_buf, 0, ASCON_HASH_RATE);
+            x0 ^= loadBytes(m_buf);
             p(ASCON_PB_ROUNDS);
             m_bufPos = 0;
         }
@@ -106,7 +110,7 @@ public void update(byte[] input, int inOff, int len)
         {
             System.arraycopy(input, inOff, m_buf, m_bufPos, available);
             inPos += available;
-            x0 ^= loadBytes(m_buf, 0, m_buf.length);
+            x0 ^= loadBytes(m_buf);
             p(ASCON_PB_ROUNDS);
         }
         int remaining;
@@ -127,29 +131,12 @@ protected void finishAbsorbing()
         p(12);
     }
 
-//    protected void absorb(byte[] input, int len)
-//    {
-//        int inOff = 0;
-//        /* absorb full plaintext blocks */
-//        while (len >= ASCON_HASH_RATE)
-//        {
-//            x0 ^= loadBytes(input, inOff, 8);
-//            p(ASCON_PB_ROUNDS);
-//            inOff += ASCON_HASH_RATE;
-//            len -= ASCON_HASH_RATE;
-//        }
-//        /* absorb final plaintext block */
-//        x0 ^= loadBytes(input, inOff, len);
-//        x0 ^= pad(len);
-//        p(12);
-//    }
-
     protected void squeeze(byte[] output, int outOff, int len)
     {
         /* squeeze full output blocks */
         while (len > ASCON_HASH_RATE)
         {
-            setBytes(x0, output, outOff, ASCON_HASH_RATE);
+            setBytes(x0, output, outOff);
             p(ASCON_PB_ROUNDS);
             outOff += ASCON_HASH_RATE;
             len -= ASCON_HASH_RATE;
diff --git a/core/src/main/java/org/bouncycastle/crypto/digests/AsconCxof128.java b/core/src/main/java/org/bouncycastle/crypto/digests/AsconCxof128.java
@@ -59,11 +59,21 @@ protected long pad(int i)
         return 0x01L << (i << 3);
     }
 
+    protected long loadBytes(final byte[] bytes)
+    {
+        return Pack.littleEndianToLong(bytes, 0);
+    }
+
     protected long loadBytes(final byte[] bytes, int inOff, int n)
     {
         return Pack.littleEndianToLong(bytes, inOff, n);
     }
 
+    protected void setBytes(long w, byte[] bytes, int inOff)
+    {
+        Pack.longToLittleEndian(w, bytes, inOff);
+    }
+
     protected void setBytes(long w, byte[] bytes, int inOff, int n)
     {
         Pack.longToLittleEndian(w, bytes, inOff, n);
diff --git a/core/src/main/java/org/bouncycastle/crypto/digests/AsconDigest.java b/core/src/main/java/org/bouncycastle/crypto/digests/AsconDigest.java
@@ -46,11 +46,21 @@ protected long pad(int i)
         return 0x80L << (56 - (i << 3));
     }
 
+    protected long loadBytes(final byte[] bytes)
+    {
+        return Pack.bigEndianToLong(bytes, 0);
+    }
+
     protected long loadBytes(final byte[] bytes, int inOff, int n)
     {
         return Pack.bigEndianToLong(bytes, inOff, n);
     }
 
+    protected void setBytes(long w, byte[] bytes, int inOff)
+    {
+        Pack.longToBigEndian(w, bytes, inOff);
+    }
+
     protected void setBytes(long w, byte[] bytes, int inOff, int n)
     {
         Pack.longToBigEndian(w, bytes, inOff, n);
diff --git a/core/src/main/java/org/bouncycastle/crypto/digests/AsconHash256Digest.java b/core/src/main/java/org/bouncycastle/crypto/digests/AsconHash256Digest.java
@@ -26,11 +26,21 @@ protected long pad(int i)
         return 0x01L << (i << 3);
     }
 
+    protected long loadBytes(final byte[] bytes)
+    {
+        return Pack.littleEndianToLong(bytes, 0);
+    }
+
     protected long loadBytes(final byte[] bytes, int inOff, int n)
     {
         return Pack.littleEndianToLong(bytes, inOff, n);
     }
 
+    protected void setBytes(long w, byte[] bytes, int inOff)
+    {
+        Pack.longToLittleEndian(w, bytes, inOff);
+    }
+
     protected void setBytes(long w, byte[] bytes, int inOff, int n)
     {
         Pack.longToLittleEndian(w, bytes, inOff, n);
diff --git a/core/src/main/java/org/bouncycastle/crypto/digests/AsconXof.java b/core/src/main/java/org/bouncycastle/crypto/digests/AsconXof.java
@@ -49,11 +49,21 @@ protected long pad(int i)
         return 0x80L << (56 - (i << 3));
     }
 
+    protected long loadBytes(final byte[] bytes)
+    {
+        return Pack.bigEndianToLong(bytes, 0);
+    }
+
     protected long loadBytes(final byte[] bytes, int inOff, int n)
     {
         return Pack.bigEndianToLong(bytes, inOff, n);
     }
 
+    protected void setBytes(long w, byte[] bytes, int inOff)
+    {
+        Pack.longToBigEndian(w, bytes, inOff);
+    }
+
     protected void setBytes(long w, byte[] bytes, int inOff, int n)
     {
         Pack.longToBigEndian(w, bytes, inOff, n);
diff --git a/core/src/main/java/org/bouncycastle/crypto/digests/AsconXof128.java b/core/src/main/java/org/bouncycastle/crypto/digests/AsconXof128.java
@@ -28,11 +28,21 @@ protected long pad(int i)
         return 0x01L << (i << 3);
     }
 
+    protected long loadBytes(final byte[] bytes)
+    {
+        return Pack.littleEndianToLong(bytes, 0);
+    }
+
     protected long loadBytes(final byte[] bytes, int inOff, int n)
     {
         return Pack.littleEndianToLong(bytes, inOff, n);
     }
 
+    protected void setBytes(long w, byte[] bytes, int inOff)
+    {
+        Pack.longToLittleEndian(w, bytes, inOff);
+    }
+
     protected void setBytes(long w, byte[] bytes, int inOff, int n)
     {
         Pack.longToLittleEndian(w, bytes, inOff, n);

Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,21 @@ protected long pad(int i)`
`59`	`59`	`return 0x01L << (i << 3);`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ protected long loadBytes(final byte[] bytes)`
	`63`	`+ {`
	`64`	`+ return Pack.littleEndianToLong(bytes, 0);`
	`65`	`+ }`
	`66`	`+`
`62`	`67`	`protected long loadBytes(final byte[] bytes, int inOff, int n)`
`63`	`68`	`{`
`64`	`69`	`return Pack.littleEndianToLong(bytes, inOff, n);`
`65`	`70`	`}`
`66`	`71`
	`72`	`+ protected void setBytes(long w, byte[] bytes, int inOff)`
	`73`	`+ {`
	`74`	`+ Pack.longToLittleEndian(w, bytes, inOff);`
	`75`	`+ }`
	`76`	`+`
`67`	`77`	`protected void setBytes(long w, byte[] bytes, int inOff, int n)`
`68`	`78`	`{`
`69`	`79`	`Pack.longToLittleEndian(w, bytes, inOff, n);`
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,21 @@ protected long pad(int i)`
`46`	`46`	`return 0x80L << (56 - (i << 3));`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ protected long loadBytes(final byte[] bytes)`
	`50`	`+ {`
	`51`	`+ return Pack.bigEndianToLong(bytes, 0);`
	`52`	`+ }`
	`53`	`+`
`49`	`54`	`protected long loadBytes(final byte[] bytes, int inOff, int n)`
`50`	`55`	`{`
`51`	`56`	`return Pack.bigEndianToLong(bytes, inOff, n);`
`52`	`57`	`}`
`53`	`58`
	`59`	`+ protected void setBytes(long w, byte[] bytes, int inOff)`
	`60`	`+ {`
	`61`	`+ Pack.longToBigEndian(w, bytes, inOff);`
	`62`	`+ }`
	`63`	`+`
`54`	`64`	`protected void setBytes(long w, byte[] bytes, int inOff, int n)`
`55`	`65`	`{`
`56`	`66`	`Pack.longToBigEndian(w, bytes, inOff, n);`
Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,21 @@ protected long pad(int i)`
`26`	`26`	`return 0x01L << (i << 3);`
`27`	`27`	`}`
`28`	`28`
	`29`	`+ protected long loadBytes(final byte[] bytes)`
	`30`	`+ {`
	`31`	`+ return Pack.littleEndianToLong(bytes, 0);`
	`32`	`+ }`
	`33`	`+`
`29`	`34`	`protected long loadBytes(final byte[] bytes, int inOff, int n)`
`30`	`35`	`{`
`31`	`36`	`return Pack.littleEndianToLong(bytes, inOff, n);`
`32`	`37`	`}`
`33`	`38`
	`39`	`+ protected void setBytes(long w, byte[] bytes, int inOff)`
	`40`	`+ {`
	`41`	`+ Pack.longToLittleEndian(w, bytes, inOff);`
	`42`	`+ }`
	`43`	`+`
`34`	`44`	`protected void setBytes(long w, byte[] bytes, int inOff, int n)`
`35`	`45`	`{`
`36`	`46`	`Pack.longToLittleEndian(w, bytes, inOff, n);`
Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,21 @@ protected long pad(int i)`
`49`	`49`	`return 0x80L << (56 - (i << 3));`
`50`	`50`	`}`
`51`	`51`
	`52`	`+ protected long loadBytes(final byte[] bytes)`
	`53`	`+ {`
	`54`	`+ return Pack.bigEndianToLong(bytes, 0);`
	`55`	`+ }`
	`56`	`+`
`52`	`57`	`protected long loadBytes(final byte[] bytes, int inOff, int n)`
`53`	`58`	`{`
`54`	`59`	`return Pack.bigEndianToLong(bytes, inOff, n);`
`55`	`60`	`}`
`56`	`61`
	`62`	`+ protected void setBytes(long w, byte[] bytes, int inOff)`
	`63`	`+ {`
	`64`	`+ Pack.longToBigEndian(w, bytes, inOff);`
	`65`	`+ }`
	`66`	`+`
`57`	`67`	`protected void setBytes(long w, byte[] bytes, int inOff, int n)`
`58`	`68`	`{`
`59`	`69`	`Pack.longToBigEndian(w, bytes, inOff, n);`
Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,21 @@ protected long pad(int i)`
`28`	`28`	`return 0x01L << (i << 3);`
`29`	`29`	`}`
`30`	`30`
	`31`	`+ protected long loadBytes(final byte[] bytes)`
	`32`	`+ {`
	`33`	`+ return Pack.littleEndianToLong(bytes, 0);`
	`34`	`+ }`
	`35`	`+`
`31`	`36`	`protected long loadBytes(final byte[] bytes, int inOff, int n)`
`32`	`37`	`{`
`33`	`38`	`return Pack.littleEndianToLong(bytes, inOff, n);`
`34`	`39`	`}`
`35`	`40`
	`41`	`+ protected void setBytes(long w, byte[] bytes, int inOff)`
	`42`	`+ {`
	`43`	`+ Pack.longToLittleEndian(w, bytes, inOff);`
	`44`	`+ }`
	`45`	`+`
`36`	`46`	`protected void setBytes(long w, byte[] bytes, int inOff, int n)`
`37`	`47`	`{`
`38`	`48`	`Pack.longToLittleEndian(w, bytes, inOff, n);`