From: jsing Date: Wed, 29 Mar 2023 05:31:43 +0000 (+0000) Subject: Whitespace fixes. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=438c4d7cf5ea10c4606ad19bdf49fef08623fbe5;p=openbsd Whitespace fixes. Mechanically replace "a,b" with "a, b". No change to generated assembly. --- diff --git a/lib/libcrypto/sha/sha1dgst.c b/lib/libcrypto/sha/sha1dgst.c index 8703c9d2b51..32e320abefa 100644 --- a/lib/libcrypto/sha/sha1dgst.c +++ b/lib/libcrypto/sha/sha1dgst.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sha1dgst.c,v 1.24 2023/03/29 05:03:34 jsing Exp $ */ +/* $OpenBSD: sha1dgst.c,v 1.25 2023/03/29 05:31:43 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -71,7 +71,7 @@ #define HASH_LONG SHA_LONG #define HASH_CTX SHA_CTX #define HASH_CBLOCK SHA_CBLOCK -#define HASH_MAKE_STRING(c,s) do { \ +#define HASH_MAKE_STRING(c, s) do { \ unsigned long ll; \ ll=(c)->h0; HOST_l2c(ll,(s)); \ ll=(c)->h1; HOST_l2c(ll,(s)); \ @@ -85,7 +85,7 @@ #define HASH_FINAL SHA1_Final #define HASH_INIT SHA1_Init #define HASH_BLOCK_DATA_ORDER sha1_block_data_order -#define Xupdate(a,ix,ia,ib,ic,id) ( (a)=(ia^ib^ic^id), \ +#define Xupdate(a, ix, ia, ib, ic, id) ( (a)=(ia^ib^ic^id), \ ix=(a)=ROTATE((a),1) \ ) @@ -122,39 +122,39 @@ SHA1_Init(SHA_CTX *c) * I've just become aware of another tweak to be made, again from Wei Dai, * in F_40_59, (x&a)|(y&a) -> (x|y)&a */ -#define F_00_19(b,c,d) ((((c) ^ (d)) & (b)) ^ (d)) -#define F_20_39(b,c,d) ((b) ^ (c) ^ (d)) -#define F_40_59(b,c,d) (((b) & (c)) | (((b)|(c)) & (d))) -#define F_60_79(b,c,d) F_20_39(b,c,d) +#define F_00_19(b, c, d) ((((c) ^ (d)) & (b)) ^ (d)) +#define F_20_39(b, c, d) ((b) ^ (c) ^ (d)) +#define F_40_59(b, c, d) (((b) & (c)) | (((b)|(c)) & (d))) +#define F_60_79(b, c, d) F_20_39(b, c, d) #ifndef OPENSSL_SMALL_FOOTPRINT -#define BODY_00_15(i,a,b,c,d,e,f,xi) \ +#define BODY_00_15(i, a, b, c, d, e, f, xi) \ (f)=xi+(e)+K_00_19+ROTATE((a),5)+F_00_19((b),(c),(d)); \ (b)=ROTATE((b),30); -#define BODY_16_19(i,a,b,c,d,e,f,xi,xa,xb,xc,xd) \ - Xupdate(f,xi,xa,xb,xc,xd); \ +#define BODY_16_19(i, a, b, c, d, e, f, xi, xa, xb, xc, xd) \ + Xupdate(f, xi, xa, xb, xc, xd); \ (f)+=(e)+K_00_19+ROTATE((a),5)+F_00_19((b),(c),(d)); \ (b)=ROTATE((b),30); -#define BODY_20_31(i,a,b,c,d,e,f,xi,xa,xb,xc,xd) \ - Xupdate(f,xi,xa,xb,xc,xd); \ +#define BODY_20_31(i, a, b, c, d, e, f, xi, xa, xb, xc, xd) \ + Xupdate(f, xi, xa, xb, xc, xd); \ (f)+=(e)+K_20_39+ROTATE((a),5)+F_20_39((b),(c),(d)); \ (b)=ROTATE((b),30); -#define BODY_32_39(i,a,b,c,d,e,f,xa,xb,xc,xd) \ - Xupdate(f,xa,xa,xb,xc,xd); \ +#define BODY_32_39(i, a, b, c, d, e, f, xa, xb, xc, xd) \ + Xupdate(f, xa, xa, xb, xc, xd); \ (f)+=(e)+K_20_39+ROTATE((a),5)+F_20_39((b),(c),(d)); \ (b)=ROTATE((b),30); -#define BODY_40_59(i,a,b,c,d,e,f,xa,xb,xc,xd) \ - Xupdate(f,xa,xa,xb,xc,xd); \ +#define BODY_40_59(i, a, b, c, d, e, f, xa, xb, xc, xd) \ + Xupdate(f, xa, xa, xb, xc, xd); \ (f)+=(e)+K_40_59+ROTATE((a),5)+F_40_59((b),(c),(d)); \ (b)=ROTATE((b),30); -#define BODY_60_79(i,a,b,c,d,e,f,xa,xb,xc,xd) \ - Xupdate(f,xa,xa,xb,xc,xd); \ +#define BODY_60_79(i, a, b, c, d, e, f, xa, xb, xc, xd) \ + Xupdate(f, xa, xa, xb, xc, xd); \ (f)=xa+(e)+K_60_79+ROTATE((a),5)+F_60_79((b),(c),(d)); \ (b)=ROTATE((b),30); @@ -164,7 +164,7 @@ static void sha1_block_data_order(SHA_CTX *c, const void *p, size_t num) { const unsigned char *data = p; - unsigned MD32_REG_T A, B,C, D,E, T, l; + unsigned MD32_REG_T A, B, C, D, E, T, l; unsigned MD32_REG_T X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15; @@ -182,36 +182,36 @@ sha1_block_data_order(SHA_CTX *c, const void *p, size_t num) X0 = W[0]; X1 = W[1]; - BODY_00_15( 0, A,B, C,D, E,T, X0); + BODY_00_15( 0, A, B, C, D, E, T, X0); X2 = W[2]; - BODY_00_15( 1, T,A, B,C, D,E, X1); + BODY_00_15( 1, T, A, B, C, D, E, X1); X3 = W[3]; - BODY_00_15( 2, E,T, A,B, C,D, X2); + BODY_00_15( 2, E, T, A, B, C, D, X2); X4 = W[4]; - BODY_00_15( 3, D,E, T,A, B,C, X3); + BODY_00_15( 3, D, E, T, A, B, C, X3); X5 = W[5]; - BODY_00_15( 4, C,D, E,T, A,B, X4); + BODY_00_15( 4, C, D, E, T, A, B, X4); X6 = W[6]; - BODY_00_15( 5, B,C, D,E, T,A, X5); + BODY_00_15( 5, B, C, D, E, T, A, X5); X7 = W[7]; - BODY_00_15( 6, A,B, C,D, E,T, X6); + BODY_00_15( 6, A, B, C, D, E, T, X6); X8 = W[8]; - BODY_00_15( 7, T,A, B,C, D,E, X7); + BODY_00_15( 7, T, A, B, C, D, E, X7); X9 = W[9]; - BODY_00_15( 8, E,T, A,B, C,D, X8); + BODY_00_15( 8, E, T, A, B, C, D, X8); X10 = W[10]; - BODY_00_15( 9, D,E, T,A, B,C, X9); + BODY_00_15( 9, D, E, T, A, B, C, X9); X11 = W[11]; - BODY_00_15(10, C,D, E,T, A,B, X10); + BODY_00_15(10, C, D, E, T, A, B, X10); X12 = W[12]; - BODY_00_15(11, B,C, D,E, T,A, X11); + BODY_00_15(11, B, C, D, E, T, A, X11); X13 = W[13]; - BODY_00_15(12, A,B, C,D, E,T, X12); + BODY_00_15(12, A, B, C, D, E, T, X12); X14 = W[14]; - BODY_00_15(13, T,A, B,C, D,E, X13); + BODY_00_15(13, T, A, B, C, D, E, X13); X15 = W[15]; - BODY_00_15(14, E,T, A,B, C,D, X14); - BODY_00_15(15, D,E, T,A, B,C, X15); + BODY_00_15(14, E, T, A, B, C, D, X14); + BODY_00_15(15, D, E, T, A, B, C, X15); data += SHA_CBLOCK; } else { @@ -219,120 +219,120 @@ sha1_block_data_order(SHA_CTX *c, const void *p, size_t num) X0 = l; HOST_c2l(data, l); X1 = l; - BODY_00_15( 0, A,B, C,D, E,T, X0); + BODY_00_15( 0, A, B, C, D, E, T, X0); HOST_c2l(data, l); X2 = l; - BODY_00_15( 1, T,A, B,C, D,E, X1); + BODY_00_15( 1, T, A, B, C, D, E, X1); HOST_c2l(data, l); X3 = l; - BODY_00_15( 2, E,T, A,B, C,D, X2); + BODY_00_15( 2, E, T, A, B, C, D, X2); HOST_c2l(data, l); X4 = l; - BODY_00_15( 3, D,E, T,A, B,C, X3); + BODY_00_15( 3, D, E, T, A, B, C, X3); HOST_c2l(data, l); X5 = l; - BODY_00_15( 4, C,D, E,T, A,B, X4); + BODY_00_15( 4, C, D, E, T, A, B, X4); HOST_c2l(data, l); X6 = l; - BODY_00_15( 5, B,C, D,E, T,A, X5); + BODY_00_15( 5, B, C, D, E, T, A, X5); HOST_c2l(data, l); X7 = l; - BODY_00_15( 6, A,B, C,D, E,T, X6); + BODY_00_15( 6, A, B, C, D, E, T, X6); HOST_c2l(data, l); X8 = l; - BODY_00_15( 7, T,A, B,C, D,E, X7); + BODY_00_15( 7, T, A, B, C, D, E, X7); HOST_c2l(data, l); X9 = l; - BODY_00_15( 8, E,T, A,B, C,D, X8); + BODY_00_15( 8, E, T, A, B, C, D, X8); HOST_c2l(data, l); X10 = l; - BODY_00_15( 9, D,E, T,A, B,C, X9); + BODY_00_15( 9, D, E, T, A, B, C, X9); HOST_c2l(data, l); X11 = l; - BODY_00_15(10, C,D, E,T, A,B, X10); + BODY_00_15(10, C, D, E, T, A, B, X10); HOST_c2l(data, l); X12 = l; - BODY_00_15(11, B,C, D,E, T,A, X11); + BODY_00_15(11, B, C, D, E, T, A, X11); HOST_c2l(data, l); X13 = l; - BODY_00_15(12, A,B, C,D, E,T, X12); + BODY_00_15(12, A, B, C, D, E, T, X12); HOST_c2l(data, l); X14 = l; - BODY_00_15(13, T,A, B,C, D,E, X13); + BODY_00_15(13, T, A, B, C, D, E, X13); HOST_c2l(data, l); X15 = l; - BODY_00_15(14, E,T, A,B, C,D, X14); - BODY_00_15(15, D,E, T,A, B,C, X15); + BODY_00_15(14, E, T, A, B, C, D, X14); + BODY_00_15(15, D, E, T, A, B, C, X15); } - BODY_16_19(16, C,D, E,T, A,B, X0, X0, X2, X8, X13); - BODY_16_19(17, B,C, D,E, T,A, X1, X1, X3, X9, X14); - BODY_16_19(18, A,B, C,D, E,T, X2, X2, X4, X10, X15); - BODY_16_19(19, T,A, B,C, D,E, X3, X3, X5, X11, X0); - - BODY_20_31(20, E,T, A,B, C,D, X4, X4, X6, X12, X1); - BODY_20_31(21, D,E, T,A, B,C, X5, X5, X7, X13, X2); - BODY_20_31(22, C,D, E,T, A,B, X6, X6, X8, X14, X3); - BODY_20_31(23, B,C, D,E, T,A, X7, X7, X9, X15, X4); - BODY_20_31(24, A,B, C,D, E,T, X8, X8, X10, X0, X5); - BODY_20_31(25, T,A, B,C, D,E, X9, X9, X11, X1, X6); - BODY_20_31(26, E,T, A,B, C,D, X10, X10, X12, X2, X7); - BODY_20_31(27, D,E, T,A, B,C, X11, X11, X13, X3, X8); - BODY_20_31(28, C,D, E,T, A,B, X12, X12, X14, X4, X9); - BODY_20_31(29, B,C, D,E, T,A, X13, X13, X15, X5, X10); - BODY_20_31(30, A,B, C,D, E,T, X14, X14, X0, X6, X11); - BODY_20_31(31, T,A, B,C, D,E, X15, X15, X1, X7, X12); - - BODY_32_39(32, E,T, A,B, C,D, X0, X2, X8, X13); - BODY_32_39(33, D,E, T,A, B,C, X1, X3, X9, X14); - BODY_32_39(34, C,D, E,T, A,B, X2, X4, X10, X15); - BODY_32_39(35, B,C, D,E, T,A, X3, X5, X11, X0); - BODY_32_39(36, A,B, C,D, E,T, X4, X6, X12, X1); - BODY_32_39(37, T,A, B,C, D,E, X5, X7, X13, X2); - BODY_32_39(38, E,T, A,B, C,D, X6, X8, X14, X3); - BODY_32_39(39, D,E, T,A, B,C, X7, X9, X15, X4); - - BODY_40_59(40, C,D, E,T, A,B, X8, X10, X0, X5); - BODY_40_59(41, B,C, D,E, T,A, X9, X11, X1, X6); - BODY_40_59(42, A,B, C,D, E,T, X10, X12, X2, X7); - BODY_40_59(43, T,A, B,C, D,E, X11, X13, X3, X8); - BODY_40_59(44, E,T, A,B, C,D, X12, X14, X4, X9); - BODY_40_59(45, D,E, T,A, B,C, X13, X15, X5, X10); - BODY_40_59(46, C,D, E,T, A,B, X14, X0, X6, X11); - BODY_40_59(47, B,C, D,E, T,A, X15, X1, X7, X12); - BODY_40_59(48, A,B, C,D, E,T, X0, X2, X8, X13); - BODY_40_59(49, T,A, B,C, D,E, X1, X3, X9, X14); - BODY_40_59(50, E,T, A,B, C,D, X2, X4, X10, X15); - BODY_40_59(51, D,E, T,A, B,C, X3, X5, X11, X0); - BODY_40_59(52, C,D, E,T, A,B, X4, X6, X12, X1); - BODY_40_59(53, B,C, D,E, T,A, X5, X7, X13, X2); - BODY_40_59(54, A,B, C,D, E,T, X6, X8, X14, X3); - BODY_40_59(55, T,A, B,C, D,E, X7, X9, X15, X4); - BODY_40_59(56, E,T, A,B, C,D, X8, X10, X0, X5); - BODY_40_59(57, D,E, T,A, B,C, X9, X11, X1, X6); - BODY_40_59(58, C,D, E,T, A,B, X10, X12, X2, X7); - BODY_40_59(59, B,C, D,E, T,A, X11, X13, X3, X8); - - BODY_60_79(60, A,B, C,D, E,T, X12, X14, X4, X9); - BODY_60_79(61, T,A, B,C, D,E, X13, X15, X5, X10); - BODY_60_79(62, E,T, A,B, C,D, X14, X0, X6, X11); - BODY_60_79(63, D,E, T,A, B,C, X15, X1, X7, X12); - BODY_60_79(64, C,D, E,T, A,B, X0, X2, X8, X13); - BODY_60_79(65, B,C, D,E, T,A, X1, X3, X9, X14); - BODY_60_79(66, A,B, C,D, E,T, X2, X4, X10, X15); - BODY_60_79(67, T,A, B,C, D,E, X3, X5, X11, X0); - BODY_60_79(68, E,T, A,B, C,D, X4, X6, X12, X1); - BODY_60_79(69, D,E, T,A, B,C, X5, X7, X13, X2); - BODY_60_79(70, C,D, E,T, A,B, X6, X8, X14, X3); - BODY_60_79(71, B,C, D,E, T,A, X7, X9, X15, X4); - BODY_60_79(72, A,B, C,D, E,T, X8, X10, X0, X5); - BODY_60_79(73, T,A, B,C, D,E, X9, X11, X1, X6); - BODY_60_79(74, E,T, A,B, C,D, X10, X12, X2, X7); - BODY_60_79(75, D,E, T,A, B,C, X11, X13, X3, X8); - BODY_60_79(76, C,D, E,T, A,B, X12, X14, X4, X9); - BODY_60_79(77, B,C, D,E, T,A, X13, X15, X5, X10); - BODY_60_79(78, A,B, C,D, E,T, X14, X0, X6, X11); - BODY_60_79(79, T,A, B,C, D,E, X15, X1, X7, X12); + BODY_16_19(16, C, D, E, T, A, B, X0, X0, X2, X8, X13); + BODY_16_19(17, B, C, D, E, T, A, X1, X1, X3, X9, X14); + BODY_16_19(18, A, B, C, D, E, T, X2, X2, X4, X10, X15); + BODY_16_19(19, T, A, B, C, D, E, X3, X3, X5, X11, X0); + + BODY_20_31(20, E, T, A, B, C, D, X4, X4, X6, X12, X1); + BODY_20_31(21, D, E, T, A, B, C, X5, X5, X7, X13, X2); + BODY_20_31(22, C, D, E, T, A, B, X6, X6, X8, X14, X3); + BODY_20_31(23, B, C, D, E, T, A, X7, X7, X9, X15, X4); + BODY_20_31(24, A, B, C, D, E, T, X8, X8, X10, X0, X5); + BODY_20_31(25, T, A, B, C, D, E, X9, X9, X11, X1, X6); + BODY_20_31(26, E, T, A, B, C, D, X10, X10, X12, X2, X7); + BODY_20_31(27, D, E, T, A, B, C, X11, X11, X13, X3, X8); + BODY_20_31(28, C, D, E, T, A, B, X12, X12, X14, X4, X9); + BODY_20_31(29, B, C, D, E, T, A, X13, X13, X15, X5, X10); + BODY_20_31(30, A, B, C, D, E, T, X14, X14, X0, X6, X11); + BODY_20_31(31, T, A, B, C, D, E, X15, X15, X1, X7, X12); + + BODY_32_39(32, E, T, A, B, C, D, X0, X2, X8, X13); + BODY_32_39(33, D, E, T, A, B, C, X1, X3, X9, X14); + BODY_32_39(34, C, D, E, T, A, B, X2, X4, X10, X15); + BODY_32_39(35, B, C, D, E, T, A, X3, X5, X11, X0); + BODY_32_39(36, A, B, C, D, E, T, X4, X6, X12, X1); + BODY_32_39(37, T, A, B, C, D, E, X5, X7, X13, X2); + BODY_32_39(38, E, T, A, B, C, D, X6, X8, X14, X3); + BODY_32_39(39, D, E, T, A, B, C, X7, X9, X15, X4); + + BODY_40_59(40, C, D, E, T, A, B, X8, X10, X0, X5); + BODY_40_59(41, B, C, D, E, T, A, X9, X11, X1, X6); + BODY_40_59(42, A, B, C, D, E, T, X10, X12, X2, X7); + BODY_40_59(43, T, A, B, C, D, E, X11, X13, X3, X8); + BODY_40_59(44, E, T, A, B, C, D, X12, X14, X4, X9); + BODY_40_59(45, D, E, T, A, B, C, X13, X15, X5, X10); + BODY_40_59(46, C, D, E, T, A, B, X14, X0, X6, X11); + BODY_40_59(47, B, C, D, E, T, A, X15, X1, X7, X12); + BODY_40_59(48, A, B, C, D, E, T, X0, X2, X8, X13); + BODY_40_59(49, T, A, B, C, D, E, X1, X3, X9, X14); + BODY_40_59(50, E, T, A, B, C, D, X2, X4, X10, X15); + BODY_40_59(51, D, E, T, A, B, C, X3, X5, X11, X0); + BODY_40_59(52, C, D, E, T, A, B, X4, X6, X12, X1); + BODY_40_59(53, B, C, D, E, T, A, X5, X7, X13, X2); + BODY_40_59(54, A, B, C, D, E, T, X6, X8, X14, X3); + BODY_40_59(55, T, A, B, C, D, E, X7, X9, X15, X4); + BODY_40_59(56, E, T, A, B, C, D, X8, X10, X0, X5); + BODY_40_59(57, D, E, T, A, B, C, X9, X11, X1, X6); + BODY_40_59(58, C, D, E, T, A, B, X10, X12, X2, X7); + BODY_40_59(59, B, C, D, E, T, A, X11, X13, X3, X8); + + BODY_60_79(60, A, B, C, D, E, T, X12, X14, X4, X9); + BODY_60_79(61, T, A, B, C, D, E, X13, X15, X5, X10); + BODY_60_79(62, E, T, A, B, C, D, X14, X0, X6, X11); + BODY_60_79(63, D, E, T, A, B, C, X15, X1, X7, X12); + BODY_60_79(64, C, D, E, T, A, B, X0, X2, X8, X13); + BODY_60_79(65, B, C, D, E, T, A, X1, X3, X9, X14); + BODY_60_79(66, A, B, C, D, E, T, X2, X4, X10, X15); + BODY_60_79(67, T, A, B, C, D, E, X3, X5, X11, X0); + BODY_60_79(68, E, T, A, B, C, D, X4, X6, X12, X1); + BODY_60_79(69, D, E, T, A, B, C, X5, X7, X13, X2); + BODY_60_79(70, C, D, E, T, A, B, X6, X8, X14, X3); + BODY_60_79(71, B, C, D, E, T, A, X7, X9, X15, X4); + BODY_60_79(72, A, B, C, D, E, T, X8, X10, X0, X5); + BODY_60_79(73, T, A, B, C, D, E, X9, X11, X1, X6); + BODY_60_79(74, E, T, A, B, C, D, X10, X12, X2, X7); + BODY_60_79(75, D, E, T, A, B, C, X11, X13, X3, X8); + BODY_60_79(76, C, D, E, T, A, B, X12, X14, X4, X9); + BODY_60_79(77, B, C, D, E, T, A, X13, X15, X5, X10); + BODY_60_79(78, A, B, C, D, E, T, X14, X0, X6, X11); + BODY_60_79(79, T, A, B, C, D, E, X15, X1, X7, X12); c->h0 = (c->h0 + E)&0xffffffffL; c->h1 = (c->h1 + T)&0xffffffffL; @@ -356,31 +356,31 @@ sha1_block_data_order(SHA_CTX *c, const void *p, size_t num) #else /* OPENSSL_SMALL_FOOTPRINT */ #define BODY_00_15(xi) do { \ - T=E+K_00_19+F_00_19(B,C,D); \ + T=E+K_00_19+F_00_19(B, C, D); \ E=D, D=C, C=ROTATE(B,30), B=A; \ A=ROTATE(A,5)+T+xi; } while(0) -#define BODY_16_19(xa,xb,xc,xd) do { \ - Xupdate(T,xa,xa,xb,xc,xd); \ - T+=E+K_00_19+F_00_19(B,C,D); \ +#define BODY_16_19(xa, xb, xc, xd) do { \ + Xupdate(T, xa, xa, xb, xc, xd); \ + T+=E+K_00_19+F_00_19(B, C, D); \ E=D, D=C, C=ROTATE(B,30), B=A; \ A=ROTATE(A,5)+T; } while(0) -#define BODY_20_39(xa,xb,xc,xd) do { \ - Xupdate(T,xa,xa,xb,xc,xd); \ - T+=E+K_20_39+F_20_39(B,C,D); \ +#define BODY_20_39(xa, xb, xc, xd) do { \ + Xupdate(T, xa, xa, xb, xc, xd); \ + T+=E+K_20_39+F_20_39(B, C, D); \ E=D, D=C, C=ROTATE(B,30), B=A; \ A=ROTATE(A,5)+T; } while(0) -#define BODY_40_59(xa,xb,xc,xd) do { \ - Xupdate(T,xa,xa,xb,xc,xd); \ - T+=E+K_40_59+F_40_59(B,C,D); \ +#define BODY_40_59(xa, xb, xc, xd) do { \ + Xupdate(T, xa, xa, xb, xc, xd); \ + T+=E+K_40_59+F_40_59(B, C, D); \ E=D, D=C, C=ROTATE(B,30), B=A; \ A=ROTATE(A,5)+T; } while(0) -#define BODY_60_79(xa,xb,xc,xd) do { \ - Xupdate(T,xa,xa,xb,xc,xd); \ - T=E+K_60_79+F_60_79(B,C,D); \ +#define BODY_60_79(xa, xb, xc, xd) do { \ + Xupdate(T, xa, xa, xb, xc, xd); \ + T=E+K_60_79+F_60_79(B, C, D); \ E=D, D=C, C=ROTATE(B,30), B=A; \ A=ROTATE(A,5)+T+xa; } while(0) @@ -389,7 +389,7 @@ static void sha1_block_data_order(SHA_CTX *c, const void *p, size_t num) { const unsigned char *data = p; - unsigned MD32_REG_T A, B,C, D,E, T, l; + unsigned MD32_REG_T A, B, C, D, E, T, l; int i; SHA_LONG X[16];