From 69dbe788d5a7f3ed9bf305809e144e8679fb794c Mon Sep 17 00:00:00 2001 From: jsing Date: Sun, 26 Mar 2023 19:19:28 +0000 Subject: [PATCH] Whack sha1dgst.c with the style(9) stick again. --- lib/libcrypto/sha/sha1dgst.c | 439 ++++++++++++++++++++--------------- 1 file changed, 246 insertions(+), 193 deletions(-) diff --git a/lib/libcrypto/sha/sha1dgst.c b/lib/libcrypto/sha/sha1dgst.c index 81141d89daa..c9a68382858 100644 --- a/lib/libcrypto/sha/sha1dgst.c +++ b/lib/libcrypto/sha/sha1dgst.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sha1dgst.c,v 1.18 2023/03/26 19:04:06 jsing Exp $ */ +/* $OpenBSD: sha1dgst.c,v 1.19 2023/03/26 19:19:28 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -95,7 +95,7 @@ __BEGIN_HIDDEN_DECLS static #endif -void sha1_block_data_order (SHA_CTX *c, const void *p,size_t num); +void sha1_block_data_order (SHA_CTX *c, const void *p, size_t num); __END_HIDDEN_DECLS @@ -107,16 +107,17 @@ __END_HIDDEN_DECLS #define INIT_DATA_h3 0x10325476UL #define INIT_DATA_h4 0xc3d2e1f0UL -int SHA1_Init(SHA_CTX *c) - { - memset (c,0,sizeof(*c)); - c->h0=INIT_DATA_h0; - c->h1=INIT_DATA_h1; - c->h2=INIT_DATA_h2; - c->h3=INIT_DATA_h3; - c->h4=INIT_DATA_h4; +int +SHA1_Init(SHA_CTX *c) +{ + memset (c, 0, sizeof(*c)); + c->h0 = INIT_DATA_h0; + c->h1 = INIT_DATA_h1; + c->h2 = INIT_DATA_h2; + c->h3 = INIT_DATA_h3; + c->h4 = INIT_DATA_h4; return 1; - } +} #define K_00_19 0x5a827999UL #define K_20_39 0x6ed9eba1UL @@ -130,9 +131,9 @@ int 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_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_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 @@ -191,157 +192,201 @@ int SHA1_Init(SHA_CTX *c) #if !defined(SHA1_ASM) #include -static void HASH_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; +static void +HASH_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; #ifndef MD32_XARRAY - unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7, - XX8, XX9,XX10,XX11,XX12,XX13,XX14,XX15; + unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7, + XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15; #else SHA_LONG XX[16]; #endif - A=c->h0; - B=c->h1; - C=c->h2; - D=c->h3; - E=c->h4; - - for (;;) - { - - if (BYTE_ORDER != LITTLE_ENDIAN && - sizeof(SHA_LONG)==4 && ((size_t)p%4)==0) - { - const SHA_LONG *W=(const SHA_LONG *)data; - - X( 0) = W[0]; X( 1) = W[ 1]; - BODY_00_15( 0,A,B,C,D,E,T,X( 0)); X( 2) = W[ 2]; - BODY_00_15( 1,T,A,B,C,D,E,X( 1)); X( 3) = W[ 3]; - BODY_00_15( 2,E,T,A,B,C,D,X( 2)); X( 4) = W[ 4]; - BODY_00_15( 3,D,E,T,A,B,C,X( 3)); X( 5) = W[ 5]; - BODY_00_15( 4,C,D,E,T,A,B,X( 4)); X( 6) = W[ 6]; - BODY_00_15( 5,B,C,D,E,T,A,X( 5)); X( 7) = W[ 7]; - BODY_00_15( 6,A,B,C,D,E,T,X( 6)); X( 8) = W[ 8]; - BODY_00_15( 7,T,A,B,C,D,E,X( 7)); X( 9) = W[ 9]; - BODY_00_15( 8,E,T,A,B,C,D,X( 8)); X(10) = W[10]; - BODY_00_15( 9,D,E,T,A,B,C,X( 9)); X(11) = W[11]; - BODY_00_15(10,C,D,E,T,A,B,X(10)); X(12) = W[12]; - BODY_00_15(11,B,C,D,E,T,A,X(11)); X(13) = W[13]; - BODY_00_15(12,A,B,C,D,E,T,X(12)); X(14) = W[14]; - BODY_00_15(13,T,A,B,C,D,E,X(13)); X(15) = W[15]; - BODY_00_15(14,E,T,A,B,C,D,X(14)); - BODY_00_15(15,D,E,T,A,B,C,X(15)); - - data += SHA_CBLOCK; - } - else - { - HOST_c2l(data,l); X( 0)=l; HOST_c2l(data,l); X( 1)=l; - BODY_00_15( 0,A,B,C,D,E,T,X( 0)); HOST_c2l(data,l); X( 2)=l; - BODY_00_15( 1,T,A,B,C,D,E,X( 1)); HOST_c2l(data,l); X( 3)=l; - BODY_00_15( 2,E,T,A,B,C,D,X( 2)); HOST_c2l(data,l); X( 4)=l; - BODY_00_15( 3,D,E,T,A,B,C,X( 3)); HOST_c2l(data,l); X( 5)=l; - BODY_00_15( 4,C,D,E,T,A,B,X( 4)); HOST_c2l(data,l); X( 6)=l; - BODY_00_15( 5,B,C,D,E,T,A,X( 5)); HOST_c2l(data,l); X( 7)=l; - BODY_00_15( 6,A,B,C,D,E,T,X( 6)); HOST_c2l(data,l); X( 8)=l; - BODY_00_15( 7,T,A,B,C,D,E,X( 7)); HOST_c2l(data,l); X( 9)=l; - BODY_00_15( 8,E,T,A,B,C,D,X( 8)); HOST_c2l(data,l); X(10)=l; - BODY_00_15( 9,D,E,T,A,B,C,X( 9)); HOST_c2l(data,l); X(11)=l; - BODY_00_15(10,C,D,E,T,A,B,X(10)); HOST_c2l(data,l); X(12)=l; - BODY_00_15(11,B,C,D,E,T,A,X(11)); HOST_c2l(data,l); X(13)=l; - BODY_00_15(12,A,B,C,D,E,T,X(12)); HOST_c2l(data,l); X(14)=l; - BODY_00_15(13,T,A,B,C,D,E,X(13)); HOST_c2l(data,l); X(15)=l; - BODY_00_15(14,E,T,A,B,C,D,X(14)); - BODY_00_15(15,D,E,T,A,B,C,X(15)); + A = c->h0; + B = c->h1; + C = c->h2; + D = c->h3; + E = c->h4; + + for (;;) { + + if (BYTE_ORDER != LITTLE_ENDIAN && + sizeof(SHA_LONG) == 4 && ((size_t)p % 4) == 0) { + const SHA_LONG *W = (const SHA_LONG *)data; + + X( 0) = W[0]; + X( 1) = W[1]; + BODY_00_15( 0, A,B, C,D, E,T, X( 0)); + X( 2) = W[2]; + BODY_00_15( 1, T,A, B,C, D,E, X( 1)); + X( 3) = W[3]; + BODY_00_15( 2, E,T, A,B, C,D, X( 2)); + X( 4) = W[4]; + BODY_00_15( 3, D,E, T,A, B,C, X( 3)); + X( 5) = W[5]; + BODY_00_15( 4, C,D, E,T, A,B, X( 4)); + X( 6) = W[6]; + BODY_00_15( 5, B,C, D,E, T,A, X( 5)); + X( 7) = W[7]; + BODY_00_15( 6, A,B, C,D, E,T, X( 6)); + X( 8) = W[8]; + BODY_00_15( 7, T,A, B,C, D,E, X( 7)); + X( 9) = W[9]; + BODY_00_15( 8, E,T, A,B, C,D, X( 8)); + X(10) = W[10]; + BODY_00_15( 9, D,E, T,A, B,C, X( 9)); + X(11) = W[11]; + BODY_00_15(10, C,D, E,T, A,B, X(10)); + X(12) = W[12]; + BODY_00_15(11, B,C, D,E, T,A, X(11)); + X(13) = W[13]; + BODY_00_15(12, A,B, C,D, E,T, X(12)); + X(14) = W[14]; + BODY_00_15(13, T,A, B,C, D,E, X(13)); + X(15) = W[15]; + BODY_00_15(14, E,T, A,B, C,D, X(14)); + BODY_00_15(15, D,E, T,A, B,C, X(15)); + + data += SHA_CBLOCK; + } else { + HOST_c2l(data, l); + X( 0) = l; + HOST_c2l(data, l); + X( 1) = l; + BODY_00_15( 0, A,B, C,D, E,T, X( 0)); + HOST_c2l(data, l); + X( 2) = l; + BODY_00_15( 1, T,A, B,C, D,E, X( 1)); + HOST_c2l(data, l); + X( 3) = l; + BODY_00_15( 2, E,T, A,B, C,D, X( 2)); + HOST_c2l(data, l); + X( 4) = l; + BODY_00_15( 3, D,E, T,A, B,C, X( 3)); + HOST_c2l(data, l); + X( 5) = l; + BODY_00_15( 4, C,D, E,T, A,B, X( 4)); + HOST_c2l(data, l); + X( 6) = l; + BODY_00_15( 5, B,C, D,E, T,A, X( 5)); + HOST_c2l(data, l); + X( 7) = l; + BODY_00_15( 6, A,B, C,D, E,T, X( 6)); + HOST_c2l(data, l); + X( 8) = l; + BODY_00_15( 7, T,A, B,C, D,E, X( 7)); + HOST_c2l(data, l); + X( 9) = l; + BODY_00_15( 8, E,T, A,B, C,D, X( 8)); + HOST_c2l(data, l); + X(10) = l; + BODY_00_15( 9, D,E, T,A, B,C, X( 9)); + HOST_c2l(data, l); + X(11) = l; + BODY_00_15(10, C,D, E,T, A,B, X(10)); + HOST_c2l(data, l); + X(12) = l; + BODY_00_15(11, B,C, D,E, T,A, X(11)); + HOST_c2l(data, l); + X(13) = l; + BODY_00_15(12, A,B, C,D, E,T, X(12)); + HOST_c2l(data, l); + X(14) = l; + BODY_00_15(13, T,A, B,C, D,E, X(13)); + HOST_c2l(data, l); + X(15) = l; + BODY_00_15(14, E,T, A,B, C,D, X(14)); + BODY_00_15(15, D,E, T,A, B,C, X(15)); } - BODY_16_19(16,C,D,E,T,A,B,X( 0),X( 0),X( 2),X( 8),X(13)); - BODY_16_19(17,B,C,D,E,T,A,X( 1),X( 1),X( 3),X( 9),X(14)); - BODY_16_19(18,A,B,C,D,E,T,X( 2),X( 2),X( 4),X(10),X(15)); - BODY_16_19(19,T,A,B,C,D,E,X( 3),X( 3),X( 5),X(11),X( 0)); - - BODY_20_31(20,E,T,A,B,C,D,X( 4),X( 4),X( 6),X(12),X( 1)); - BODY_20_31(21,D,E,T,A,B,C,X( 5),X( 5),X( 7),X(13),X( 2)); - BODY_20_31(22,C,D,E,T,A,B,X( 6),X( 6),X( 8),X(14),X( 3)); - BODY_20_31(23,B,C,D,E,T,A,X( 7),X( 7),X( 9),X(15),X( 4)); - BODY_20_31(24,A,B,C,D,E,T,X( 8),X( 8),X(10),X( 0),X( 5)); - BODY_20_31(25,T,A,B,C,D,E,X( 9),X( 9),X(11),X( 1),X( 6)); - BODY_20_31(26,E,T,A,B,C,D,X(10),X(10),X(12),X( 2),X( 7)); - BODY_20_31(27,D,E,T,A,B,C,X(11),X(11),X(13),X( 3),X( 8)); - BODY_20_31(28,C,D,E,T,A,B,X(12),X(12),X(14),X( 4),X( 9)); - BODY_20_31(29,B,C,D,E,T,A,X(13),X(13),X(15),X( 5),X(10)); - BODY_20_31(30,A,B,C,D,E,T,X(14),X(14),X( 0),X( 6),X(11)); - BODY_20_31(31,T,A,B,C,D,E,X(15),X(15),X( 1),X( 7),X(12)); - - BODY_32_39(32,E,T,A,B,C,D,X( 0),X( 2),X( 8),X(13)); - BODY_32_39(33,D,E,T,A,B,C,X( 1),X( 3),X( 9),X(14)); - BODY_32_39(34,C,D,E,T,A,B,X( 2),X( 4),X(10),X(15)); - BODY_32_39(35,B,C,D,E,T,A,X( 3),X( 5),X(11),X( 0)); - BODY_32_39(36,A,B,C,D,E,T,X( 4),X( 6),X(12),X( 1)); - BODY_32_39(37,T,A,B,C,D,E,X( 5),X( 7),X(13),X( 2)); - BODY_32_39(38,E,T,A,B,C,D,X( 6),X( 8),X(14),X( 3)); - BODY_32_39(39,D,E,T,A,B,C,X( 7),X( 9),X(15),X( 4)); - - BODY_40_59(40,C,D,E,T,A,B,X( 8),X(10),X( 0),X( 5)); - BODY_40_59(41,B,C,D,E,T,A,X( 9),X(11),X( 1),X( 6)); - BODY_40_59(42,A,B,C,D,E,T,X(10),X(12),X( 2),X( 7)); - BODY_40_59(43,T,A,B,C,D,E,X(11),X(13),X( 3),X( 8)); - BODY_40_59(44,E,T,A,B,C,D,X(12),X(14),X( 4),X( 9)); - BODY_40_59(45,D,E,T,A,B,C,X(13),X(15),X( 5),X(10)); - BODY_40_59(46,C,D,E,T,A,B,X(14),X( 0),X( 6),X(11)); - BODY_40_59(47,B,C,D,E,T,A,X(15),X( 1),X( 7),X(12)); - BODY_40_59(48,A,B,C,D,E,T,X( 0),X( 2),X( 8),X(13)); - BODY_40_59(49,T,A,B,C,D,E,X( 1),X( 3),X( 9),X(14)); - BODY_40_59(50,E,T,A,B,C,D,X( 2),X( 4),X(10),X(15)); - BODY_40_59(51,D,E,T,A,B,C,X( 3),X( 5),X(11),X( 0)); - BODY_40_59(52,C,D,E,T,A,B,X( 4),X( 6),X(12),X( 1)); - BODY_40_59(53,B,C,D,E,T,A,X( 5),X( 7),X(13),X( 2)); - BODY_40_59(54,A,B,C,D,E,T,X( 6),X( 8),X(14),X( 3)); - BODY_40_59(55,T,A,B,C,D,E,X( 7),X( 9),X(15),X( 4)); - BODY_40_59(56,E,T,A,B,C,D,X( 8),X(10),X( 0),X( 5)); - BODY_40_59(57,D,E,T,A,B,C,X( 9),X(11),X( 1),X( 6)); - BODY_40_59(58,C,D,E,T,A,B,X(10),X(12),X( 2),X( 7)); - BODY_40_59(59,B,C,D,E,T,A,X(11),X(13),X( 3),X( 8)); - - BODY_60_79(60,A,B,C,D,E,T,X(12),X(14),X( 4),X( 9)); - BODY_60_79(61,T,A,B,C,D,E,X(13),X(15),X( 5),X(10)); - BODY_60_79(62,E,T,A,B,C,D,X(14),X( 0),X( 6),X(11)); - BODY_60_79(63,D,E,T,A,B,C,X(15),X( 1),X( 7),X(12)); - BODY_60_79(64,C,D,E,T,A,B,X( 0),X( 2),X( 8),X(13)); - BODY_60_79(65,B,C,D,E,T,A,X( 1),X( 3),X( 9),X(14)); - BODY_60_79(66,A,B,C,D,E,T,X( 2),X( 4),X(10),X(15)); - BODY_60_79(67,T,A,B,C,D,E,X( 3),X( 5),X(11),X( 0)); - BODY_60_79(68,E,T,A,B,C,D,X( 4),X( 6),X(12),X( 1)); - BODY_60_79(69,D,E,T,A,B,C,X( 5),X( 7),X(13),X( 2)); - BODY_60_79(70,C,D,E,T,A,B,X( 6),X( 8),X(14),X( 3)); - BODY_60_79(71,B,C,D,E,T,A,X( 7),X( 9),X(15),X( 4)); - BODY_60_79(72,A,B,C,D,E,T,X( 8),X(10),X( 0),X( 5)); - BODY_60_79(73,T,A,B,C,D,E,X( 9),X(11),X( 1),X( 6)); - BODY_60_79(74,E,T,A,B,C,D,X(10),X(12),X( 2),X( 7)); - BODY_60_79(75,D,E,T,A,B,C,X(11),X(13),X( 3),X( 8)); - BODY_60_79(76,C,D,E,T,A,B,X(12),X(14),X( 4),X( 9)); - BODY_60_79(77,B,C,D,E,T,A,X(13),X(15),X( 5),X(10)); - BODY_60_79(78,A,B,C,D,E,T,X(14),X( 0),X( 6),X(11)); - BODY_60_79(79,T,A,B,C,D,E,X(15),X( 1),X( 7),X(12)); - - c->h0=(c->h0+E)&0xffffffffL; - c->h1=(c->h1+T)&0xffffffffL; - c->h2=(c->h2+A)&0xffffffffL; - c->h3=(c->h3+B)&0xffffffffL; - c->h4=(c->h4+C)&0xffffffffL; - - if (--num == 0) break; - - A=c->h0; - B=c->h1; - C=c->h2; - D=c->h3; - E=c->h4; - - } + BODY_16_19(16, C,D, E,T, A,B, X( 0), X( 0), X( 2), X( 8), X(13)); + BODY_16_19(17, B,C, D,E, T,A, X( 1), X( 1), X( 3), X( 9), X(14)); + BODY_16_19(18, A,B, C,D, E,T, X( 2), X( 2), X( 4), X(10), X(15)); + BODY_16_19(19, T,A, B,C, D,E, X( 3), X( 3), X( 5), X(11), X( 0)); + + BODY_20_31(20, E,T, A,B, C,D, X( 4), X( 4), X( 6), X(12), X( 1)); + BODY_20_31(21, D,E, T,A, B,C, X( 5), X( 5), X( 7), X(13), X( 2)); + BODY_20_31(22, C,D, E,T, A,B, X( 6), X( 6), X( 8), X(14), X( 3)); + BODY_20_31(23, B,C, D,E, T,A, X( 7), X( 7), X( 9), X(15), X( 4)); + BODY_20_31(24, A,B, C,D, E,T, X( 8), X( 8), X(10), X( 0), X( 5)); + BODY_20_31(25, T,A, B,C, D,E, X( 9), X( 9), X(11), X( 1), X( 6)); + BODY_20_31(26, E,T, A,B, C,D, X(10), X(10), X(12), X( 2), X( 7)); + BODY_20_31(27, D,E, T,A, B,C, X(11), X(11), X(13), X( 3), X( 8)); + BODY_20_31(28, C,D, E,T, A,B, X(12), X(12), X(14), X( 4), X( 9)); + BODY_20_31(29, B,C, D,E, T,A, X(13), X(13), X(15), X( 5), X(10)); + BODY_20_31(30, A,B, C,D, E,T, X(14), X(14), X( 0), X( 6), X(11)); + BODY_20_31(31, T,A, B,C, D,E, X(15), X(15), X( 1), X( 7), X(12)); + + BODY_32_39(32, E,T, A,B, C,D, X( 0), X( 2), X( 8), X(13)); + BODY_32_39(33, D,E, T,A, B,C, X( 1), X( 3), X( 9), X(14)); + BODY_32_39(34, C,D, E,T, A,B, X( 2), X( 4), X(10), X(15)); + BODY_32_39(35, B,C, D,E, T,A, X( 3), X( 5), X(11), X( 0)); + BODY_32_39(36, A,B, C,D, E,T, X( 4), X( 6), X(12), X( 1)); + BODY_32_39(37, T,A, B,C, D,E, X( 5), X( 7), X(13), X( 2)); + BODY_32_39(38, E,T, A,B, C,D, X( 6), X( 8), X(14), X( 3)); + BODY_32_39(39, D,E, T,A, B,C, X( 7), X( 9), X(15), X( 4)); + + BODY_40_59(40, C,D, E,T, A,B, X( 8), X(10), X( 0), X( 5)); + BODY_40_59(41, B,C, D,E, T,A, X( 9), X(11), X( 1), X( 6)); + BODY_40_59(42, A,B, C,D, E,T, X(10), X(12), X( 2), X( 7)); + BODY_40_59(43, T,A, B,C, D,E, X(11), X(13), X( 3), X( 8)); + BODY_40_59(44, E,T, A,B, C,D, X(12), X(14), X( 4), X( 9)); + BODY_40_59(45, D,E, T,A, B,C, X(13), X(15), X( 5), X(10)); + BODY_40_59(46, C,D, E,T, A,B, X(14), X( 0), X( 6), X(11)); + BODY_40_59(47, B,C, D,E, T,A, X(15), X( 1), X( 7), X(12)); + BODY_40_59(48, A,B, C,D, E,T, X( 0), X( 2), X( 8), X(13)); + BODY_40_59(49, T,A, B,C, D,E, X( 1), X( 3), X( 9), X(14)); + BODY_40_59(50, E,T, A,B, C,D, X( 2), X( 4), X(10), X(15)); + BODY_40_59(51, D,E, T,A, B,C, X( 3), X( 5), X(11), X( 0)); + BODY_40_59(52, C,D, E,T, A,B, X( 4), X( 6), X(12), X( 1)); + BODY_40_59(53, B,C, D,E, T,A, X( 5), X( 7), X(13), X( 2)); + BODY_40_59(54, A,B, C,D, E,T, X( 6), X( 8), X(14), X( 3)); + BODY_40_59(55, T,A, B,C, D,E, X( 7), X( 9), X(15), X( 4)); + BODY_40_59(56, E,T, A,B, C,D, X( 8), X(10), X( 0), X( 5)); + BODY_40_59(57, D,E, T,A, B,C, X( 9), X(11), X( 1), X( 6)); + BODY_40_59(58, C,D, E,T, A,B, X(10), X(12), X( 2), X( 7)); + BODY_40_59(59, B,C, D,E, T,A, X(11), X(13), X( 3), X( 8)); + + BODY_60_79(60, A,B, C,D, E,T, X(12), X(14), X( 4), X( 9)); + BODY_60_79(61, T,A, B,C, D,E, X(13), X(15), X( 5), X(10)); + BODY_60_79(62, E,T, A,B, C,D, X(14), X( 0), X( 6), X(11)); + BODY_60_79(63, D,E, T,A, B,C, X(15), X( 1), X( 7), X(12)); + BODY_60_79(64, C,D, E,T, A,B, X( 0), X( 2), X( 8), X(13)); + BODY_60_79(65, B,C, D,E, T,A, X( 1), X( 3), X( 9), X(14)); + BODY_60_79(66, A,B, C,D, E,T, X( 2), X( 4), X(10), X(15)); + BODY_60_79(67, T,A, B,C, D,E, X( 3), X( 5), X(11), X( 0)); + BODY_60_79(68, E,T, A,B, C,D, X( 4), X( 6), X(12), X( 1)); + BODY_60_79(69, D,E, T,A, B,C, X( 5), X( 7), X(13), X( 2)); + BODY_60_79(70, C,D, E,T, A,B, X( 6), X( 8), X(14), X( 3)); + BODY_60_79(71, B,C, D,E, T,A, X( 7), X( 9), X(15), X( 4)); + BODY_60_79(72, A,B, C,D, E,T, X( 8), X(10), X( 0), X( 5)); + BODY_60_79(73, T,A, B,C, D,E, X( 9), X(11), X( 1), X( 6)); + BODY_60_79(74, E,T, A,B, C,D, X(10), X(12), X( 2), X( 7)); + BODY_60_79(75, D,E, T,A, B,C, X(11), X(13), X( 3), X( 8)); + BODY_60_79(76, C,D, E,T, A,B, X(12), X(14), X( 4), X( 9)); + BODY_60_79(77, B,C, D,E, T,A, X(13), X(15), X( 5), X(10)); + BODY_60_79(78, A,B, C,D, E,T, X(14), X( 0), X( 6), X(11)); + BODY_60_79(79, T,A, B,C, D,E, X(15), X( 1), X( 7), X(12)); + + c->h0 = (c->h0 + E)&0xffffffffL; + c->h1 = (c->h1 + T)&0xffffffffL; + c->h2 = (c->h2 + A)&0xffffffffL; + c->h3 = (c->h3 + B)&0xffffffffL; + c->h4 = (c->h4 + C)&0xffffffffL; + + if (--num == 0) + break; + + A = c->h0; + B = c->h1; + C = c->h2; + D = c->h3; + E = c->h4; + } +} #endif #else /* OPENSSL_SMALL_FOOTPRINT */ @@ -376,48 +421,56 @@ static void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num) A=ROTATE(A,5)+T+xa; } while(0) #if !defined(SHA1_ASM) -static void HASH_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; +static void +HASH_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; int i; SHA_LONG X[16]; - A=c->h0; - B=c->h1; - C=c->h2; - D=c->h3; - E=c->h4; - - for (;;) - { - for (i=0;i<16;i++) - { HOST_c2l(data,l); X[i]=l; BODY_00_15(X[i]); } - for (i=0;i<4;i++) - { BODY_16_19(X[i], X[i+2], X[i+8], X[(i+13)&15]); } - for (;i<24;i++) - { BODY_20_39(X[i&15], X[(i+2)&15], X[(i+8)&15],X[(i+13)&15]); } - for (i=0;i<20;i++) - { BODY_40_59(X[(i+8)&15],X[(i+10)&15],X[i&15], X[(i+5)&15]); } - for (i=4;i<24;i++) - { BODY_60_79(X[(i+8)&15],X[(i+10)&15],X[i&15], X[(i+5)&15]); } - - c->h0=(c->h0+A)&0xffffffffL; - c->h1=(c->h1+B)&0xffffffffL; - c->h2=(c->h2+C)&0xffffffffL; - c->h3=(c->h3+D)&0xffffffffL; - c->h4=(c->h4+E)&0xffffffffL; - - if (--num == 0) break; - - A=c->h0; - B=c->h1; - C=c->h2; - D=c->h3; - E=c->h4; - + A = c->h0; + B = c->h1; + C = c->h2; + D = c->h3; + E = c->h4; + + for (;;) { + for (i = 0; i < 16; i++) { + HOST_c2l(data, l); + X[i] = l; + BODY_00_15(X[i]); + } + for (i = 0; i < 4; i++) { + BODY_16_19(X[i], X[i + 2], X[i + 8], X[(i + 13)&15]); + } + for (; i < 24; i++) { + BODY_20_39(X[i&15], X[(i + 2)&15], X[(i + 8)&15], X[(i + 13)&15]); } + for (i = 0; i < 20; i++) { + BODY_40_59(X[(i + 8)&15], X[(i + 10)&15], X[i&15], X[(i + 5)&15]); + } + for (i = 4; i < 24; i++) { + BODY_60_79(X[(i + 8)&15], X[(i + 10)&15], X[i&15], X[(i + 5)&15]); + } + + c->h0 = (c->h0 + A)&0xffffffffL; + c->h1 = (c->h1 + B)&0xffffffffL; + c->h2 = (c->h2 + C)&0xffffffffL; + c->h3 = (c->h3 + D)&0xffffffffL; + c->h4 = (c->h4 + E)&0xffffffffL; + + if (--num == 0) + break; + + A = c->h0; + B = c->h1; + C = c->h2; + D = c->h3; + E = c->h4; + } +} #endif #endif -- 2.20.1