More whitespace fixes.

Another set of mechnical replacements for "a,b" with "a, b".

No change in generated assembly.

diff --git a/lib/libcrypto/sha/sha256.c b/lib/libcrypto/sha/sha256.c
index 192e208..6c58321 100644 (file)
--- a/lib/libcrypto/sha/sha256.c
+++ b/lib/libcrypto/sha/sha256.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sha256.c,v 1.14 2023/03/26 17:56:51 jsing Exp $ */
+/* $OpenBSD: sha256.c,v 1.15 2023/03/29 05:34:01 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -163,7 +163,7 @@ SHA224_Final(unsigned char *md, SHA256_CTX *c)
  * Idea behind separate cases for pre-defined lengths is to let the
  * compiler decide if it's appropriate to unroll small loops.
  */
-#define        HASH_MAKE_STRING(c,s)   do {    \
+#define        HASH_MAKE_STRING(c, s)  do {    \
        unsigned long ll;               \
        unsigned int  nn;               \
        switch ((c)->md_len)            \
@@ -225,15 +225,15 @@ static const SHA_LONG K256[64] = {
 #define sigma0(x)      (ROTATE((x),25) ^ ROTATE((x),14) ^ ((x)>>3))
 #define sigma1(x)      (ROTATE((x),15) ^ ROTATE((x),13) ^ ((x)>>10))
 
-#define Ch(x,y,z)      (((x) & (y)) ^ ((~(x)) & (z)))
-#define Maj(x,y,z)     (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+#define Ch(x, y, z)    (((x) & (y)) ^ ((~(x)) & (z)))
+#define Maj(x, y, z)   (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
 
 #ifdef OPENSSL_SMALL_FOOTPRINT
 
 static void
 sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num)
 {
-       unsigned MD32_REG_T a, b,c, d,e, f,g, h,s0, s1, T1, T2;
+       unsigned MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1, T2;
        SHA_LONG        X[16], l;
        int i;
        const unsigned char *data = in;
@@ -296,21 +296,21 @@ sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num)
 
 #else
 
-#define        ROUND_00_15(i,a,b,c,d,e,f,g,h)          do {    \
-       T1 += h + Sigma1(e) + Ch(e,f,g) + K256[i];      \
-       h = Sigma0(a) + Maj(a,b,c);                     \
+#define        ROUND_00_15(i, a, b, c, d, e, f, g, h)          do {    \
+       T1 += h + Sigma1(e) + Ch(e, f, g) + K256[i];    \
+       h = Sigma0(a) + Maj(a, b, c);                   \
        d += T1;        h += T1;                } while (0)
 
-#define        ROUND_16_63(i,a,b,c,d,e,f,g,h,X)        do {    \
+#define        ROUND_16_63(i, a, b, c, d, e, f, g, h, X)       do {    \
        s0 = X[(i+1)&0x0f];     s0 = sigma0(s0);        \
        s1 = X[(i+14)&0x0f];    s1 = sigma1(s1);        \
        T1 = X[(i)&0x0f] += s0 + s1 + X[(i+9)&0x0f];    \
-       ROUND_00_15(i,a,b,c,d,e,f,g,h);         } while (0)
+       ROUND_00_15(i, a, b, c, d, e, f, g, h);         } while (0)
 
 static void
 sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num)
 {
-       unsigned MD32_REG_T a, b,c, d,e, f,g, h,s0, s1, T1;
+       unsigned MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1;
        SHA_LONG        X[16];
        int i;
        const unsigned char *data = in;
@@ -331,37 +331,37 @@ sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num)
                        const SHA_LONG *W = (const SHA_LONG *)data;
 
                        T1 = X[0] = W[0];
-                       ROUND_00_15(0, a,b, c,d, e,f, g, h);
+                       ROUND_00_15(0, a, b, c, d, e, f, g, h);
                        T1 = X[1] = W[1];
-                       ROUND_00_15(1, h,a, b,c, d,e, f, g);
+                       ROUND_00_15(1, h, a, b, c, d, e, f, g);
                        T1 = X[2] = W[2];
-                       ROUND_00_15(2, g,h, a,b, c,d, e, f);
+                       ROUND_00_15(2, g, h, a, b, c, d, e, f);
                        T1 = X[3] = W[3];
-                       ROUND_00_15(3, f,g, h,a, b,c, d, e);
+                       ROUND_00_15(3, f, g, h, a, b, c, d, e);
                        T1 = X[4] = W[4];
-                       ROUND_00_15(4, e,f, g,h, a,b, c, d);
+                       ROUND_00_15(4, e, f, g, h, a, b, c, d);
                        T1 = X[5] = W[5];
-                       ROUND_00_15(5, d,e, f,g, h,a, b, c);
+                       ROUND_00_15(5, d, e, f, g, h, a, b, c);
                        T1 = X[6] = W[6];
-                       ROUND_00_15(6, c,d, e,f, g,h, a, b);
+                       ROUND_00_15(6, c, d, e, f, g, h, a, b);
                        T1 = X[7] = W[7];
-                       ROUND_00_15(7, b,c, d,e, f,g, h, a);
+                       ROUND_00_15(7, b, c, d, e, f, g, h, a);
                        T1 = X[8] = W[8];
-                       ROUND_00_15(8, a,b, c,d, e,f, g, h);
+                       ROUND_00_15(8, a, b, c, d, e, f, g, h);
                        T1 = X[9] = W[9];
-                       ROUND_00_15(9, h,a, b,c, d,e, f, g);
+                       ROUND_00_15(9, h, a, b, c, d, e, f, g);
                        T1 = X[10] = W[10];
-                       ROUND_00_15(10, g,h, a,b, c,d, e, f);
+                       ROUND_00_15(10, g, h, a, b, c, d, e, f);
                        T1 = X[11] = W[11];
-                       ROUND_00_15(11, f,g, h,a, b,c, d, e);
+                       ROUND_00_15(11, f, g, h, a, b, c, d, e);
                        T1 = X[12] = W[12];
-                       ROUND_00_15(12, e,f, g,h, a,b, c, d);
+                       ROUND_00_15(12, e, f, g, h, a, b, c, d);
                        T1 = X[13] = W[13];
-                       ROUND_00_15(13, d,e, f,g, h,a, b, c);
+                       ROUND_00_15(13, d, e, f, g, h, a, b, c);
                        T1 = X[14] = W[14];
-                       ROUND_00_15(14, c,d, e,f, g,h, a, b);
+                       ROUND_00_15(14, c, d, e, f, g, h, a, b);
                        T1 = X[15] = W[15];
-                       ROUND_00_15(15, b,c, d,e, f,g, h, a);
+                       ROUND_00_15(15, b, c, d, e, f, g, h, a);
 
                        data += SHA256_CBLOCK;
                } else {
@@ -369,63 +369,63 @@ sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num)
 
                        HOST_c2l(data, l);
                        T1 = X[0] = l;
-                       ROUND_00_15(0, a,b, c,d, e,f, g, h);
+                       ROUND_00_15(0, a, b, c, d, e, f, g, h);
                        HOST_c2l(data, l);
                        T1 = X[1] = l;
-                       ROUND_00_15(1, h,a, b,c, d,e, f, g);
+                       ROUND_00_15(1, h, a, b, c, d, e, f, g);
                        HOST_c2l(data, l);
                        T1 = X[2] = l;
-                       ROUND_00_15(2, g,h, a,b, c,d, e, f);
+                       ROUND_00_15(2, g, h, a, b, c, d, e, f);
                        HOST_c2l(data, l);
                        T1 = X[3] = l;
-                       ROUND_00_15(3, f,g, h,a, b,c, d, e);
+                       ROUND_00_15(3, f, g, h, a, b, c, d, e);
                        HOST_c2l(data, l);
                        T1 = X[4] = l;
-                       ROUND_00_15(4, e,f, g,h, a,b, c, d);
+                       ROUND_00_15(4, e, f, g, h, a, b, c, d);
                        HOST_c2l(data, l);
                        T1 = X[5] = l;
-                       ROUND_00_15(5, d,e, f,g, h,a, b, c);
+                       ROUND_00_15(5, d, e, f, g, h, a, b, c);
                        HOST_c2l(data, l);
                        T1 = X[6] = l;
-                       ROUND_00_15(6, c,d, e,f, g,h, a, b);
+                       ROUND_00_15(6, c, d, e, f, g, h, a, b);
                        HOST_c2l(data, l);
                        T1 = X[7] = l;
-                       ROUND_00_15(7, b,c, d,e, f,g, h, a);
+                       ROUND_00_15(7, b, c, d, e, f, g, h, a);
                        HOST_c2l(data, l);
                        T1 = X[8] = l;
-                       ROUND_00_15(8, a,b, c,d, e,f, g, h);
+                       ROUND_00_15(8, a, b, c, d, e, f, g, h);
                        HOST_c2l(data, l);
                        T1 = X[9] = l;
-                       ROUND_00_15(9, h,a, b,c, d,e, f, g);
+                       ROUND_00_15(9, h, a, b, c, d, e, f, g);
                        HOST_c2l(data, l);
                        T1 = X[10] = l;
-                       ROUND_00_15(10, g,h, a,b, c,d, e, f);
+                       ROUND_00_15(10, g, h, a, b, c, d, e, f);
                        HOST_c2l(data, l);
                        T1 = X[11] = l;
-                       ROUND_00_15(11, f,g, h,a, b,c, d, e);
+                       ROUND_00_15(11, f, g, h, a, b, c, d, e);
                        HOST_c2l(data, l);
                        T1 = X[12] = l;
-                       ROUND_00_15(12, e,f, g,h, a,b, c, d);
+                       ROUND_00_15(12, e, f, g, h, a, b, c, d);
                        HOST_c2l(data, l);
                        T1 = X[13] = l;
-                       ROUND_00_15(13, d,e, f,g, h,a, b, c);
+                       ROUND_00_15(13, d, e, f, g, h, a, b, c);
                        HOST_c2l(data, l);
                        T1 = X[14] = l;
-                       ROUND_00_15(14, c,d, e,f, g,h, a, b);
+                       ROUND_00_15(14, c, d, e, f, g, h, a, b);
                        HOST_c2l(data, l);
                        T1 = X[15] = l;
-                       ROUND_00_15(15, b,c, d,e, f,g, h, a);
+                       ROUND_00_15(15, b, c, d, e, f, g, h, a);
                }
 
                for (i = 16; i < 64; i += 8) {
-                       ROUND_16_63(i + 0, a,b, c,d, e,f, g,h, X);
-                       ROUND_16_63(i + 1, h,a, b,c, d,e, f,g, X);
-                       ROUND_16_63(i + 2, g,h, a,b, c,d, e,f, X);
-                       ROUND_16_63(i + 3, f,g, h,a, b,c, d,e, X);
-                       ROUND_16_63(i + 4, e,f, g,h, a,b, c,d, X);
-                       ROUND_16_63(i + 5, d,e, f,g, h,a, b,c, X);
-                       ROUND_16_63(i + 6, c,d, e,f, g,h, a,b, X);
-                       ROUND_16_63(i + 7, b,c, d,e, f,g, h,a, X);
+                       ROUND_16_63(i + 0, a, b, c, d, e, f, g, h, X);
+                       ROUND_16_63(i + 1, h, a, b, c, d, e, f, g, X);
+                       ROUND_16_63(i + 2, g, h, a, b, c, d, e, f, X);
+                       ROUND_16_63(i + 3, f, g, h, a, b, c, d, e, X);
+                       ROUND_16_63(i + 4, e, f, g, h, a, b, c, d, X);
+                       ROUND_16_63(i + 5, d, e, f, g, h, a, b, c, X);
+                       ROUND_16_63(i + 6, c, d, e, f, g, h, a, b, X);
+                       ROUND_16_63(i + 7, b, c, d, e, f, g, h, a, X);
                }
 
                ctx->h[0] += a;