Merge branch 'main' of gitlab.cryptoworkshop.com:root/bc-java

Author: dghgit

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

@@ -24,7 +24,7 @@ public abstract class LongDigest
 
     protected long    H1, H2, H3, H4, H5, H6, H7, H8;
 
-    private long[]  W = new long[80];
+    private long[]  W = new long[16];
     private int     wOff;
 
     /**
@@ -271,68 +271,104 @@ protected void processBlock()
     {
         adjustByteCounts();
 
-        //
-        // expand 16 word block into 80 word blocks.
-        //
-        for (int t = 16; t <= 79; t++)
-        {
-            W[t] = Sigma1(W[t - 2]) + W[t - 7] + Sigma0(W[t - 15]) + W[t - 16];
-        }
+        long[] W = this.W;
 
-        //
-        // set up working variables.
-        //
-        long     a = H1;
-        long     b = H2;
-        long     c = H3;
-        long     d = H4;
-        long     e = H5;
-        long     f = H6;
-        long     g = H7;
-        long     h = H8;
-
-        int t = 0;
-        for(int i = 0; i < 10; i ++)
+        // The message schedule lives in 16 rotating locals instead of a 64/80-word array: no bounds
+        // checks or memory traffic for the expansion, and the array only ever holds the 16 input words.
+        long w00 = W[0], w01 = W[1], w02 = W[2], w03 = W[3];
+        long w04 = W[4], w05 = W[5], w06 = W[6], w07 = W[7];
+        long w08 = W[8], w09 = W[9], w10 = W[10], w11 = W[11];
+        long w12 = W[12], w13 = W[13], w14 = W[14], w15 = W[15];
+
+        long a = H1, b = H2, c = H3, d = H4, e = H5, f = H6, g = H7, h = H8;
+
+        for (int t = 0; ; t += 16)
         {
-          // t = 8 * i
-          h += Sum1(e) + Ch(e, f, g) + K[t] + W[t++];
-          d += h;
-          h += Sum0(a) + Maj(a, b, c);
-
-          // t = 8 * i + 1
-          g += Sum1(d) + Ch(d, e, f) + K[t] + W[t++];
-          c += g;
-          g += Sum0(h) + Maj(h, a, b);
-
-          // t = 8 * i + 2
-          f += Sum1(c) + Ch(c, d, e) + K[t] + W[t++];
-          b += f;
-          f += Sum0(g) + Maj(g, h, a);
-
-          // t = 8 * i + 3
-          e += Sum1(b) + Ch(b, c, d) + K[t] + W[t++];
-          a += e;
-          e += Sum0(f) + Maj(f, g, h);
-
-          // t = 8 * i + 4
-          d += Sum1(a) + Ch(a, b, c) + K[t] + W[t++];
-          h += d;
-          d += Sum0(e) + Maj(e, f, g);
-
-          // t = 8 * i + 5
-          c += Sum1(h) + Ch(h, a, b) + K[t] + W[t++];
-          g += c;
-          c += Sum0(d) + Maj(d, e, f);
-
-          // t = 8 * i + 6
-          b += Sum1(g) + Ch(g, h, a) + K[t] + W[t++];
-          f += b;
-          b += Sum0(c) + Maj(c, d, e);
-
-          // t = 8 * i + 7
-          a += Sum1(f) + Ch(f, g, h) + K[t] + W[t++];
-          e += a;
-          a += Sum0(b) + Maj(b, c, d);
+            h += Sum1(e) + Ch(e, f, g) + K[t] + w00;
+            d += h;
+            h += Sum0(a) + Maj(a, b, c);
+
+            g += Sum1(d) + Ch(d, e, f) + K[t + 1] + w01;
+            c += g;
+            g += Sum0(h) + Maj(h, a, b);
+
+            f += Sum1(c) + Ch(c, d, e) + K[t + 2] + w02;
+            b += f;
+            f += Sum0(g) + Maj(g, h, a);
+
+            e += Sum1(b) + Ch(b, c, d) + K[t + 3] + w03;
+            a += e;
+            e += Sum0(f) + Maj(f, g, h);
+
+            d += Sum1(a) + Ch(a, b, c) + K[t + 4] + w04;
+            h += d;
+            d += Sum0(e) + Maj(e, f, g);
+
+            c += Sum1(h) + Ch(h, a, b) + K[t + 5] + w05;
+            g += c;
+            c += Sum0(d) + Maj(d, e, f);
+
+            b += Sum1(g) + Ch(g, h, a) + K[t + 6] + w06;
+            f += b;
+            b += Sum0(c) + Maj(c, d, e);
+
+            a += Sum1(f) + Ch(f, g, h) + K[t + 7] + w07;
+            e += a;
+            a += Sum0(b) + Maj(b, c, d);
+
+            h += Sum1(e) + Ch(e, f, g) + K[t + 8] + w08;
+            d += h;
+            h += Sum0(a) + Maj(a, b, c);
+
+            g += Sum1(d) + Ch(d, e, f) + K[t + 9] + w09;
+            c += g;
+            g += Sum0(h) + Maj(h, a, b);
+
+            f += Sum1(c) + Ch(c, d, e) + K[t + 10] + w10;
+            b += f;
+            f += Sum0(g) + Maj(g, h, a);
+
+            e += Sum1(b) + Ch(b, c, d) + K[t + 11] + w11;
+            a += e;
+            e += Sum0(f) + Maj(f, g, h);
+
+            d += Sum1(a) + Ch(a, b, c) + K[t + 12] + w12;
+            h += d;
+            d += Sum0(e) + Maj(e, f, g);
+
+            c += Sum1(h) + Ch(h, a, b) + K[t + 13] + w13;
+            g += c;
+            c += Sum0(d) + Maj(d, e, f);
+
+            b += Sum1(g) + Ch(g, h, a) + K[t + 14] + w14;
+            f += b;
+            b += Sum0(c) + Maj(c, d, e);
+
+            a += Sum1(f) + Ch(f, g, h) + K[t + 15] + w15;
+            e += a;
+            a += Sum0(b) + Maj(b, c, d);
+
+            if (t == 64)
+                break;
+
+            // W[t+16+j] = sigma1(W[t+14+j]) + W[t+9+j] + sigma0(W[t+1+j]) + W[t+j]; wrapped indices refer to
+            // words already updated in this pass, which is exactly the required schedule.
+            w00 += Sigma1(w14) + w09 + Sigma0(w01);
+            w01 += Sigma1(w15) + w10 + Sigma0(w02);
+            w02 += Sigma1(w00) + w11 + Sigma0(w03);
+            w03 += Sigma1(w01) + w12 + Sigma0(w04);
+            w04 += Sigma1(w02) + w13 + Sigma0(w05);
+            w05 += Sigma1(w03) + w14 + Sigma0(w06);
+            w06 += Sigma1(w04) + w15 + Sigma0(w07);
+            w07 += Sigma1(w05) + w00 + Sigma0(w08);
+            w08 += Sigma1(w06) + w01 + Sigma0(w09);
+            w09 += Sigma1(w07) + w02 + Sigma0(w10);
+            w10 += Sigma1(w08) + w03 + Sigma0(w11);
+            w11 += Sigma1(w09) + w04 + Sigma0(w12);
+            w12 += Sigma1(w10) + w05 + Sigma0(w13);
+            w13 += Sigma1(w11) + w06 + Sigma0(w14);
+            w14 += Sigma1(w12) + w07 + Sigma0(w15);
+            w15 += Sigma1(w13) + w08 + Sigma0(w00);
         }
 
         H1 += a;
@@ -354,72 +390,63 @@ protected void processBlock()
         }
     }
 
-    /* SHA-384 and SHA-512 functions (as for SHA-256 but for longs) */
-    private long Ch(
-        long    x,
-        long    y,
-        long    z)
+    private static long Ch(long x, long y, long z)
     {
-        return ((x & y) ^ ((~x) & z));
+        //return (x & y) ^ (z & ~x);
+        return z ^ (x & (y ^ z));
     }
 
-    private long Maj(
-        long    x,
-        long    y,
-        long    z)
+    private static long Maj(long x, long y, long z)
     {
-        return ((x & y) ^ (x & z) ^ (y & z));
+        //return ((x & y) ^ (x & z) ^ (y & z));
+        return (x & y) | (z & (x ^ y));
     }
 
-    private long Sum0(
-        long    x)
+    private static long Sum0(long x)
     {
-        return ((x << 36)|(x >>> 28)) ^ ((x << 30)|(x >>> 34)) ^ ((x << 25)|(x >>> 39));
+        return (x << 36 | x >>> 28) ^ (x << 30 | x >>> 34) ^ (x << 25 | x >>> 39);
     }
 
-    private long Sum1(
-        long    x)
+    private static long Sum1(long x)
     {
-        return ((x << 50)|(x >>> 14)) ^ ((x << 46)|(x >>> 18)) ^ ((x << 23)|(x >>> 41));
+        return (x << 50 | x >>> 14) ^ (x << 46 | x >>> 18) ^ (x << 23 | x >>> 41);
     }
 
-    private long Sigma0(
-        long    x)
+    private static long Sigma0(long x)
     {
-        return ((x << 63)|(x >>> 1)) ^ ((x << 56)|(x >>> 8)) ^ (x >>> 7);
+        return (x << 63 | x >>> 1) ^ (x << 56 | x >>> 8) ^ (x >>> 7);
     }
 
-    private long Sigma1(
-        long    x)
+    private static long Sigma1(long x)
     {
-        return ((x << 45)|(x >>> 19)) ^ ((x << 3)|(x >>> 61)) ^ (x >>> 6);
+        return (x << 45 | x >>> 19) ^ (x << 3 | x >>> 61) ^ (x >>> 6);
     }
 
-    /* SHA-384 and SHA-512 Constants
-     * (represent the first 64 bits of the fractional parts of the
-     * cube roots of the first sixty-four prime numbers)
+    /**
+     * SHA-512 Constants (represent the first 64 bits of the fractional parts of the cube roots of the first sixty-four
+     * prime numbers)
      */
     static final long K[] = {
-0x428a2f98d728ae22L, 0x7137449123ef65cdL, 0xb5c0fbcfec4d3b2fL, 0xe9b5dba58189dbbcL,
-0x3956c25bf348b538L, 0x59f111f1b605d019L, 0x923f82a4af194f9bL, 0xab1c5ed5da6d8118L,
-0xd807aa98a3030242L, 0x12835b0145706fbeL, 0x243185be4ee4b28cL, 0x550c7dc3d5ffb4e2L,
-0x72be5d74f27b896fL, 0x80deb1fe3b1696b1L, 0x9bdc06a725c71235L, 0xc19bf174cf692694L,
-0xe49b69c19ef14ad2L, 0xefbe4786384f25e3L, 0x0fc19dc68b8cd5b5L, 0x240ca1cc77ac9c65L,
-0x2de92c6f592b0275L, 0x4a7484aa6ea6e483L, 0x5cb0a9dcbd41fbd4L, 0x76f988da831153b5L,
-0x983e5152ee66dfabL, 0xa831c66d2db43210L, 0xb00327c898fb213fL, 0xbf597fc7beef0ee4L,
-0xc6e00bf33da88fc2L, 0xd5a79147930aa725L, 0x06ca6351e003826fL, 0x142929670a0e6e70L,
-0x27b70a8546d22ffcL, 0x2e1b21385c26c926L, 0x4d2c6dfc5ac42aedL, 0x53380d139d95b3dfL,
-0x650a73548baf63deL, 0x766a0abb3c77b2a8L, 0x81c2c92e47edaee6L, 0x92722c851482353bL,
-0xa2bfe8a14cf10364L, 0xa81a664bbc423001L, 0xc24b8b70d0f89791L, 0xc76c51a30654be30L,
-0xd192e819d6ef5218L, 0xd69906245565a910L, 0xf40e35855771202aL, 0x106aa07032bbd1b8L,
-0x19a4c116b8d2d0c8L, 0x1e376c085141ab53L, 0x2748774cdf8eeb99L, 0x34b0bcb5e19b48a8L,
-0x391c0cb3c5c95a63L, 0x4ed8aa4ae3418acbL, 0x5b9cca4f7763e373L, 0x682e6ff3d6b2b8a3L,
-0x748f82ee5defb2fcL, 0x78a5636f43172f60L, 0x84c87814a1f0ab72L, 0x8cc702081a6439ecL,
-0x90befffa23631e28L, 0xa4506cebde82bde9L, 0xbef9a3f7b2c67915L, 0xc67178f2e372532bL,
-0xca273eceea26619cL, 0xd186b8c721c0c207L, 0xeada7dd6cde0eb1eL, 0xf57d4f7fee6ed178L,
-0x06f067aa72176fbaL, 0x0a637dc5a2c898a6L, 0x113f9804bef90daeL, 0x1b710b35131c471bL,
-0x28db77f523047d84L, 0x32caab7b40c72493L, 0x3c9ebe0a15c9bebcL, 0x431d67c49c100d4cL,
-0x4cc5d4becb3e42b6L, 0x597f299cfc657e2aL, 0x5fcb6fab3ad6faecL, 0x6c44198c4a475817L
+        0x428a2f98d728ae22L, 0x7137449123ef65cdL, 0xb5c0fbcfec4d3b2fL, 0xe9b5dba58189dbbcL,
+        0x3956c25bf348b538L, 0x59f111f1b605d019L, 0x923f82a4af194f9bL, 0xab1c5ed5da6d8118L,
+        0xd807aa98a3030242L, 0x12835b0145706fbeL, 0x243185be4ee4b28cL, 0x550c7dc3d5ffb4e2L,
+        0x72be5d74f27b896fL, 0x80deb1fe3b1696b1L, 0x9bdc06a725c71235L, 0xc19bf174cf692694L,
+        0xe49b69c19ef14ad2L, 0xefbe4786384f25e3L, 0x0fc19dc68b8cd5b5L, 0x240ca1cc77ac9c65L,
+        0x2de92c6f592b0275L, 0x4a7484aa6ea6e483L, 0x5cb0a9dcbd41fbd4L, 0x76f988da831153b5L,
+        0x983e5152ee66dfabL, 0xa831c66d2db43210L, 0xb00327c898fb213fL, 0xbf597fc7beef0ee4L,
+        0xc6e00bf33da88fc2L, 0xd5a79147930aa725L, 0x06ca6351e003826fL, 0x142929670a0e6e70L,
+        0x27b70a8546d22ffcL, 0x2e1b21385c26c926L, 0x4d2c6dfc5ac42aedL, 0x53380d139d95b3dfL,
+        0x650a73548baf63deL, 0x766a0abb3c77b2a8L, 0x81c2c92e47edaee6L, 0x92722c851482353bL,
+        0xa2bfe8a14cf10364L, 0xa81a664bbc423001L, 0xc24b8b70d0f89791L, 0xc76c51a30654be30L,
+        0xd192e819d6ef5218L, 0xd69906245565a910L, 0xf40e35855771202aL, 0x106aa07032bbd1b8L,
+        0x19a4c116b8d2d0c8L, 0x1e376c085141ab53L, 0x2748774cdf8eeb99L, 0x34b0bcb5e19b48a8L,
+        0x391c0cb3c5c95a63L, 0x4ed8aa4ae3418acbL, 0x5b9cca4f7763e373L, 0x682e6ff3d6b2b8a3L,
+        0x748f82ee5defb2fcL, 0x78a5636f43172f60L, 0x84c87814a1f0ab72L, 0x8cc702081a6439ecL,
+        0x90befffa23631e28L, 0xa4506cebde82bde9L, 0xbef9a3f7b2c67915L, 0xc67178f2e372532bL,
+        0xca273eceea26619cL, 0xd186b8c721c0c207L, 0xeada7dd6cde0eb1eL, 0xf57d4f7fee6ed178L,
+        0x06f067aa72176fbaL, 0x0a637dc5a2c898a6L, 0x113f9804bef90daeL, 0x1b710b35131c471bL,
+        0x28db77f523047d84L, 0x32caab7b40c72493L, 0x3c9ebe0a15c9bebcL, 0x431d67c49c100d4cL,
+        0x4cc5d4becb3e42b6L, 0x597f299cfc657e2aL, 0x5fcb6fab3ad6faecL, 0x6c44198c4a475817L
     };
 
     protected abstract CryptoServiceProperties cryptoServiceProperties();