Blake2s refactoring

Author: peterdettman

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

@@ -27,6 +27,7 @@
 import org.bouncycastle.crypto.CryptoServicesRegistrar;
 import org.bouncycastle.crypto.ExtendedDigest;
 import org.bouncycastle.util.Arrays;
+import org.bouncycastle.util.Integers;
 import org.bouncycastle.util.Pack;
 
 /**
@@ -285,41 +286,36 @@ private void init(byte[] salt, byte[] personalization, byte[] key)
 
         if (key != null && key.length > 0)
         {
-            if (key.length > 32)
+            keyLength = key.length;
+            if (keyLength > 32)
             {
-                throw new IllegalArgumentException(
-                    "Keys > 32 bytes are not supported");
+                throw new IllegalArgumentException("Keys > 32 bytes are not supported");
             }
-            this.key = new byte[key.length];
-            System.arraycopy(key, 0, this.key, 0, key.length);
-
-            keyLength = key.length;
-            System.arraycopy(key, 0, buffer, 0, key.length);
+            this.key = new byte[keyLength];
+            System.arraycopy(key, 0, this.key, 0, keyLength);
+            System.arraycopy(key, 0, buffer, 0, keyLength);
             bufferPos = BLOCK_LENGTH_BYTES; // zero padding
         }
 
         if (chainValue == null)
         {
             chainValue = new int[8];
 
-            chainValue[0] = blake2s_IV[0]
-                ^ (digestLength | (keyLength << 8) | ((fanout << 16) | (depth << 24)));
+            chainValue[0] = blake2s_IV[0] ^ (digestLength | (keyLength << 8) | ((fanout << 16) | (depth << 24)));
             chainValue[1] = blake2s_IV[1] ^ leafLength;
 
             int nofHi = (int)(nodeOffset >> 32);
             int nofLo = (int)nodeOffset;
             chainValue[2] = blake2s_IV[2] ^ nofLo;
-            chainValue[3] = blake2s_IV[3] ^ (nofHi |
-                (nodeDepth << 16) | (innerHashLength << 24));
+            chainValue[3] = blake2s_IV[3] ^ (nofHi | (nodeDepth << 16) | (innerHashLength << 24));
 
             chainValue[4] = blake2s_IV[4];
             chainValue[5] = blake2s_IV[5];
             if (salt != null)
             {
                 if (salt.length != 8)
                 {
-                    throw new IllegalArgumentException(
-                        "Salt length must be exactly 8 bytes");
+                    throw new IllegalArgumentException("Salt length must be exactly 8 bytes");
                 }
                 this.salt = new byte[8];
                 System.arraycopy(salt, 0, this.salt, 0, salt.length);
@@ -334,12 +330,10 @@ private void init(byte[] salt, byte[] personalization, byte[] key)
             {
                 if (personalization.length != 8)
                 {
-                    throw new IllegalArgumentException(
-                        "Personalization length must be exactly 8 bytes");
+                    throw new IllegalArgumentException("Personalization length must be exactly 8 bytes");
                 }
                 this.personalization = new byte[8];
-                System.arraycopy(personalization, 0, this.personalization, 0,
-                    personalization.length);
+                System.arraycopy(personalization, 0, this.personalization, 0, personalization.length);
 
                 chainValue[6] ^= Pack.littleEndianToInt(personalization, 0);
                 chainValue[7] ^= Pack.littleEndianToInt(personalization, 4);
@@ -542,18 +536,13 @@ private void compress(byte[] message, int messagePos)
     private void G(int m1, int m2, int posA, int posB, int posC, int posD)
     {
         internalState[posA] = internalState[posA] + internalState[posB] + m1;
-        internalState[posD] = rotr32(internalState[posD] ^ internalState[posA], 16);
+        internalState[posD] = Integers.rotateRight(internalState[posD] ^ internalState[posA], 16);
         internalState[posC] = internalState[posC] + internalState[posD];
-        internalState[posB] = rotr32(internalState[posB] ^ internalState[posC], 12);
+        internalState[posB] = Integers.rotateRight(internalState[posB] ^ internalState[posC], 12);
         internalState[posA] = internalState[posA] + internalState[posB] + m2;
-        internalState[posD] = rotr32(internalState[posD] ^ internalState[posA], 8);
+        internalState[posD] = Integers.rotateRight(internalState[posD] ^ internalState[posA], 8);
         internalState[posC] = internalState[posC] + internalState[posD];
-        internalState[posB] = rotr32(internalState[posB] ^ internalState[posC], 7);
-    }
-
-    private int rotr32(int x, int rot)
-    {
-        return x >>> rot | (x << (32 - rot));
+        internalState[posB] = Integers.rotateRight(internalState[posB] ^ internalState[posC], 7);
     }
 
     /**