summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2023-03-26 19:19:28 +0000
committerjsing <>2023-03-26 19:19:28 +0000
commit1ea899cd6e12e0aaf9f428f911453a2611039518 (patch)
tree81ca206e18914b5ae2183f6e942ae69800c5928d /src
parent346c49c75dd5682ad10632f41eb38f4aad9df83d (diff)
downloadopenbsd-1ea899cd6e12e0aaf9f428f911453a2611039518.tar.gz
openbsd-1ea899cd6e12e0aaf9f428f911453a2611039518.tar.bz2
openbsd-1ea899cd6e12e0aaf9f428f911453a2611039518.zip
Whack sha1dgst.c with the style(9) stick again.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/sha/sha1dgst.c439
1 files changed, 246 insertions, 193 deletions
diff --git a/src/lib/libcrypto/sha/sha1dgst.c b/src/lib/libcrypto/sha/sha1dgst.c
index 81141d89da..c9a6838285 100644
--- a/src/lib/libcrypto/sha/sha1dgst.c
+++ b/src/lib/libcrypto/sha/sha1dgst.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sha1dgst.c,v 1.18 2023/03/26 19:04:06 jsing Exp $ */ 1/* $OpenBSD: sha1dgst.c,v 1.19 2023/03/26 19:19:28 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -95,7 +95,7 @@ __BEGIN_HIDDEN_DECLS
95static 95static
96#endif 96#endif
97 97
98void sha1_block_data_order (SHA_CTX *c, const void *p,size_t num); 98void sha1_block_data_order (SHA_CTX *c, const void *p, size_t num);
99 99
100__END_HIDDEN_DECLS 100__END_HIDDEN_DECLS
101 101
@@ -107,16 +107,17 @@ __END_HIDDEN_DECLS
107#define INIT_DATA_h3 0x10325476UL 107#define INIT_DATA_h3 0x10325476UL
108#define INIT_DATA_h4 0xc3d2e1f0UL 108#define INIT_DATA_h4 0xc3d2e1f0UL
109 109
110int SHA1_Init(SHA_CTX *c) 110int
111 { 111SHA1_Init(SHA_CTX *c)
112 memset (c,0,sizeof(*c)); 112{
113 c->h0=INIT_DATA_h0; 113 memset (c, 0, sizeof(*c));
114 c->h1=INIT_DATA_h1; 114 c->h0 = INIT_DATA_h0;
115 c->h2=INIT_DATA_h2; 115 c->h1 = INIT_DATA_h1;
116 c->h3=INIT_DATA_h3; 116 c->h2 = INIT_DATA_h2;
117 c->h4=INIT_DATA_h4; 117 c->h3 = INIT_DATA_h3;
118 c->h4 = INIT_DATA_h4;
118 return 1; 119 return 1;
119 } 120}
120 121
121#define K_00_19 0x5a827999UL 122#define K_00_19 0x5a827999UL
122#define K_20_39 0x6ed9eba1UL 123#define K_20_39 0x6ed9eba1UL
@@ -130,9 +131,9 @@ int SHA1_Init(SHA_CTX *c)
130 * I've just become aware of another tweak to be made, again from Wei Dai, 131 * I've just become aware of another tweak to be made, again from Wei Dai,
131 * in F_40_59, (x&a)|(y&a) -> (x|y)&a 132 * in F_40_59, (x&a)|(y&a) -> (x|y)&a
132 */ 133 */
133#define F_00_19(b,c,d) ((((c) ^ (d)) & (b)) ^ (d)) 134#define F_00_19(b,c,d) ((((c) ^ (d)) & (b)) ^ (d))
134#define F_20_39(b,c,d) ((b) ^ (c) ^ (d)) 135#define F_20_39(b,c,d) ((b) ^ (c) ^ (d))
135#define F_40_59(b,c,d) (((b) & (c)) | (((b)|(c)) & (d))) 136#define F_40_59(b,c,d) (((b) & (c)) | (((b)|(c)) & (d)))
136#define F_60_79(b,c,d) F_20_39(b,c,d) 137#define F_60_79(b,c,d) F_20_39(b,c,d)
137 138
138#ifndef OPENSSL_SMALL_FOOTPRINT 139#ifndef OPENSSL_SMALL_FOOTPRINT
@@ -191,157 +192,201 @@ int SHA1_Init(SHA_CTX *c)
191 192
192#if !defined(SHA1_ASM) 193#if !defined(SHA1_ASM)
193#include <endian.h> 194#include <endian.h>
194static void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num) 195static void
195 { 196HASH_BLOCK_DATA_ORDER(SHA_CTX *c, const void *p, size_t num)
196 const unsigned char *data=p; 197{
197 unsigned MD32_REG_T A,B,C,D,E,T,l; 198 const unsigned char *data = p;
199 unsigned MD32_REG_T A, B,C, D,E, T, l;
198#ifndef MD32_XARRAY 200#ifndef MD32_XARRAY
199 unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7, 201 unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
200 XX8, XX9,XX10,XX11,XX12,XX13,XX14,XX15; 202 XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
201#else 203#else
202 SHA_LONG XX[16]; 204 SHA_LONG XX[16];
203#endif 205#endif
204 206
205 A=c->h0; 207 A = c->h0;
206 B=c->h1; 208 B = c->h1;
207 C=c->h2; 209 C = c->h2;
208 D=c->h3; 210 D = c->h3;
209 E=c->h4; 211 E = c->h4;
210 212
211 for (;;) 213 for (;;) {
212 { 214
213 215 if (BYTE_ORDER != LITTLE_ENDIAN &&
214 if (BYTE_ORDER != LITTLE_ENDIAN && 216 sizeof(SHA_LONG) == 4 && ((size_t)p % 4) == 0) {
215 sizeof(SHA_LONG)==4 && ((size_t)p%4)==0) 217 const SHA_LONG *W = (const SHA_LONG *)data;
216 { 218
217 const SHA_LONG *W=(const SHA_LONG *)data; 219 X( 0) = W[0];
218 220 X( 1) = W[1];
219 X( 0) = W[0]; X( 1) = W[ 1]; 221 BODY_00_15( 0, A,B, C,D, E,T, X( 0));
220 BODY_00_15( 0,A,B,C,D,E,T,X( 0)); X( 2) = W[ 2]; 222 X( 2) = W[2];
221 BODY_00_15( 1,T,A,B,C,D,E,X( 1)); X( 3) = W[ 3]; 223 BODY_00_15( 1, T,A, B,C, D,E, X( 1));
222 BODY_00_15( 2,E,T,A,B,C,D,X( 2)); X( 4) = W[ 4]; 224 X( 3) = W[3];
223 BODY_00_15( 3,D,E,T,A,B,C,X( 3)); X( 5) = W[ 5]; 225 BODY_00_15( 2, E,T, A,B, C,D, X( 2));
224 BODY_00_15( 4,C,D,E,T,A,B,X( 4)); X( 6) = W[ 6]; 226 X( 4) = W[4];
225 BODY_00_15( 5,B,C,D,E,T,A,X( 5)); X( 7) = W[ 7]; 227 BODY_00_15( 3, D,E, T,A, B,C, X( 3));
226 BODY_00_15( 6,A,B,C,D,E,T,X( 6)); X( 8) = W[ 8]; 228 X( 5) = W[5];
227 BODY_00_15( 7,T,A,B,C,D,E,X( 7)); X( 9) = W[ 9]; 229 BODY_00_15( 4, C,D, E,T, A,B, X( 4));
228 BODY_00_15( 8,E,T,A,B,C,D,X( 8)); X(10) = W[10]; 230 X( 6) = W[6];
229 BODY_00_15( 9,D,E,T,A,B,C,X( 9)); X(11) = W[11]; 231 BODY_00_15( 5, B,C, D,E, T,A, X( 5));
230 BODY_00_15(10,C,D,E,T,A,B,X(10)); X(12) = W[12]; 232 X( 7) = W[7];
231 BODY_00_15(11,B,C,D,E,T,A,X(11)); X(13) = W[13]; 233 BODY_00_15( 6, A,B, C,D, E,T, X( 6));
232 BODY_00_15(12,A,B,C,D,E,T,X(12)); X(14) = W[14]; 234 X( 8) = W[8];
233 BODY_00_15(13,T,A,B,C,D,E,X(13)); X(15) = W[15]; 235 BODY_00_15( 7, T,A, B,C, D,E, X( 7));
234 BODY_00_15(14,E,T,A,B,C,D,X(14)); 236 X( 9) = W[9];
235 BODY_00_15(15,D,E,T,A,B,C,X(15)); 237 BODY_00_15( 8, E,T, A,B, C,D, X( 8));
236 238 X(10) = W[10];
237 data += SHA_CBLOCK; 239 BODY_00_15( 9, D,E, T,A, B,C, X( 9));
238 } 240 X(11) = W[11];
239 else 241 BODY_00_15(10, C,D, E,T, A,B, X(10));
240 { 242 X(12) = W[12];
241 HOST_c2l(data,l); X( 0)=l; HOST_c2l(data,l); X( 1)=l; 243 BODY_00_15(11, B,C, D,E, T,A, X(11));
242 BODY_00_15( 0,A,B,C,D,E,T,X( 0)); HOST_c2l(data,l); X( 2)=l; 244 X(13) = W[13];
243 BODY_00_15( 1,T,A,B,C,D,E,X( 1)); HOST_c2l(data,l); X( 3)=l; 245 BODY_00_15(12, A,B, C,D, E,T, X(12));
244 BODY_00_15( 2,E,T,A,B,C,D,X( 2)); HOST_c2l(data,l); X( 4)=l; 246 X(14) = W[14];
245 BODY_00_15( 3,D,E,T,A,B,C,X( 3)); HOST_c2l(data,l); X( 5)=l; 247 BODY_00_15(13, T,A, B,C, D,E, X(13));
246 BODY_00_15( 4,C,D,E,T,A,B,X( 4)); HOST_c2l(data,l); X( 6)=l; 248 X(15) = W[15];
247 BODY_00_15( 5,B,C,D,E,T,A,X( 5)); HOST_c2l(data,l); X( 7)=l; 249 BODY_00_15(14, E,T, A,B, C,D, X(14));
248 BODY_00_15( 6,A,B,C,D,E,T,X( 6)); HOST_c2l(data,l); X( 8)=l; 250 BODY_00_15(15, D,E, T,A, B,C, X(15));
249 BODY_00_15( 7,T,A,B,C,D,E,X( 7)); HOST_c2l(data,l); X( 9)=l; 251
250 BODY_00_15( 8,E,T,A,B,C,D,X( 8)); HOST_c2l(data,l); X(10)=l; 252 data += SHA_CBLOCK;
251 BODY_00_15( 9,D,E,T,A,B,C,X( 9)); HOST_c2l(data,l); X(11)=l; 253 } else {
252 BODY_00_15(10,C,D,E,T,A,B,X(10)); HOST_c2l(data,l); X(12)=l; 254 HOST_c2l(data, l);
253 BODY_00_15(11,B,C,D,E,T,A,X(11)); HOST_c2l(data,l); X(13)=l; 255 X( 0) = l;
254 BODY_00_15(12,A,B,C,D,E,T,X(12)); HOST_c2l(data,l); X(14)=l; 256 HOST_c2l(data, l);
255 BODY_00_15(13,T,A,B,C,D,E,X(13)); HOST_c2l(data,l); X(15)=l; 257 X( 1) = l;
256 BODY_00_15(14,E,T,A,B,C,D,X(14)); 258 BODY_00_15( 0, A,B, C,D, E,T, X( 0));
257 BODY_00_15(15,D,E,T,A,B,C,X(15)); 259 HOST_c2l(data, l);
260 X( 2) = l;
261 BODY_00_15( 1, T,A, B,C, D,E, X( 1));
262 HOST_c2l(data, l);
263 X( 3) = l;
264 BODY_00_15( 2, E,T, A,B, C,D, X( 2));
265 HOST_c2l(data, l);
266 X( 4) = l;
267 BODY_00_15( 3, D,E, T,A, B,C, X( 3));
268 HOST_c2l(data, l);
269 X( 5) = l;
270 BODY_00_15( 4, C,D, E,T, A,B, X( 4));
271 HOST_c2l(data, l);
272 X( 6) = l;
273 BODY_00_15( 5, B,C, D,E, T,A, X( 5));
274 HOST_c2l(data, l);
275 X( 7) = l;
276 BODY_00_15( 6, A,B, C,D, E,T, X( 6));
277 HOST_c2l(data, l);
278 X( 8) = l;
279 BODY_00_15( 7, T,A, B,C, D,E, X( 7));
280 HOST_c2l(data, l);
281 X( 9) = l;
282 BODY_00_15( 8, E,T, A,B, C,D, X( 8));
283 HOST_c2l(data, l);
284 X(10) = l;
285 BODY_00_15( 9, D,E, T,A, B,C, X( 9));
286 HOST_c2l(data, l);
287 X(11) = l;
288 BODY_00_15(10, C,D, E,T, A,B, X(10));
289 HOST_c2l(data, l);
290 X(12) = l;
291 BODY_00_15(11, B,C, D,E, T,A, X(11));
292 HOST_c2l(data, l);
293 X(13) = l;
294 BODY_00_15(12, A,B, C,D, E,T, X(12));
295 HOST_c2l(data, l);
296 X(14) = l;
297 BODY_00_15(13, T,A, B,C, D,E, X(13));
298 HOST_c2l(data, l);
299 X(15) = l;
300 BODY_00_15(14, E,T, A,B, C,D, X(14));
301 BODY_00_15(15, D,E, T,A, B,C, X(15));
258 } 302 }
259 303
260 BODY_16_19(16,C,D,E,T,A,B,X( 0),X( 0),X( 2),X( 8),X(13)); 304 BODY_16_19(16, C,D, E,T, A,B, X( 0), X( 0), X( 2), X( 8), X(13));
261 BODY_16_19(17,B,C,D,E,T,A,X( 1),X( 1),X( 3),X( 9),X(14)); 305 BODY_16_19(17, B,C, D,E, T,A, X( 1), X( 1), X( 3), X( 9), X(14));
262 BODY_16_19(18,A,B,C,D,E,T,X( 2),X( 2),X( 4),X(10),X(15)); 306 BODY_16_19(18, A,B, C,D, E,T, X( 2), X( 2), X( 4), X(10), X(15));
263 BODY_16_19(19,T,A,B,C,D,E,X( 3),X( 3),X( 5),X(11),X( 0)); 307 BODY_16_19(19, T,A, B,C, D,E, X( 3), X( 3), X( 5), X(11), X( 0));
264 308
265 BODY_20_31(20,E,T,A,B,C,D,X( 4),X( 4),X( 6),X(12),X( 1)); 309 BODY_20_31(20, E,T, A,B, C,D, X( 4), X( 4), X( 6), X(12), X( 1));
266 BODY_20_31(21,D,E,T,A,B,C,X( 5),X( 5),X( 7),X(13),X( 2)); 310 BODY_20_31(21, D,E, T,A, B,C, X( 5), X( 5), X( 7), X(13), X( 2));
267 BODY_20_31(22,C,D,E,T,A,B,X( 6),X( 6),X( 8),X(14),X( 3)); 311 BODY_20_31(22, C,D, E,T, A,B, X( 6), X( 6), X( 8), X(14), X( 3));
268 BODY_20_31(23,B,C,D,E,T,A,X( 7),X( 7),X( 9),X(15),X( 4)); 312 BODY_20_31(23, B,C, D,E, T,A, X( 7), X( 7), X( 9), X(15), X( 4));
269 BODY_20_31(24,A,B,C,D,E,T,X( 8),X( 8),X(10),X( 0),X( 5)); 313 BODY_20_31(24, A,B, C,D, E,T, X( 8), X( 8), X(10), X( 0), X( 5));
270 BODY_20_31(25,T,A,B,C,D,E,X( 9),X( 9),X(11),X( 1),X( 6)); 314 BODY_20_31(25, T,A, B,C, D,E, X( 9), X( 9), X(11), X( 1), X( 6));
271 BODY_20_31(26,E,T,A,B,C,D,X(10),X(10),X(12),X( 2),X( 7)); 315 BODY_20_31(26, E,T, A,B, C,D, X(10), X(10), X(12), X( 2), X( 7));
272 BODY_20_31(27,D,E,T,A,B,C,X(11),X(11),X(13),X( 3),X( 8)); 316 BODY_20_31(27, D,E, T,A, B,C, X(11), X(11), X(13), X( 3), X( 8));
273 BODY_20_31(28,C,D,E,T,A,B,X(12),X(12),X(14),X( 4),X( 9)); 317 BODY_20_31(28, C,D, E,T, A,B, X(12), X(12), X(14), X( 4), X( 9));
274 BODY_20_31(29,B,C,D,E,T,A,X(13),X(13),X(15),X( 5),X(10)); 318 BODY_20_31(29, B,C, D,E, T,A, X(13), X(13), X(15), X( 5), X(10));
275 BODY_20_31(30,A,B,C,D,E,T,X(14),X(14),X( 0),X( 6),X(11)); 319 BODY_20_31(30, A,B, C,D, E,T, X(14), X(14), X( 0), X( 6), X(11));
276 BODY_20_31(31,T,A,B,C,D,E,X(15),X(15),X( 1),X( 7),X(12)); 320 BODY_20_31(31, T,A, B,C, D,E, X(15), X(15), X( 1), X( 7), X(12));
277 321
278 BODY_32_39(32,E,T,A,B,C,D,X( 0),X( 2),X( 8),X(13)); 322 BODY_32_39(32, E,T, A,B, C,D, X( 0), X( 2), X( 8), X(13));
279 BODY_32_39(33,D,E,T,A,B,C,X( 1),X( 3),X( 9),X(14)); 323 BODY_32_39(33, D,E, T,A, B,C, X( 1), X( 3), X( 9), X(14));
280 BODY_32_39(34,C,D,E,T,A,B,X( 2),X( 4),X(10),X(15)); 324 BODY_32_39(34, C,D, E,T, A,B, X( 2), X( 4), X(10), X(15));
281 BODY_32_39(35,B,C,D,E,T,A,X( 3),X( 5),X(11),X( 0)); 325 BODY_32_39(35, B,C, D,E, T,A, X( 3), X( 5), X(11), X( 0));
282 BODY_32_39(36,A,B,C,D,E,T,X( 4),X( 6),X(12),X( 1)); 326 BODY_32_39(36, A,B, C,D, E,T, X( 4), X( 6), X(12), X( 1));
283 BODY_32_39(37,T,A,B,C,D,E,X( 5),X( 7),X(13),X( 2)); 327 BODY_32_39(37, T,A, B,C, D,E, X( 5), X( 7), X(13), X( 2));
284 BODY_32_39(38,E,T,A,B,C,D,X( 6),X( 8),X(14),X( 3)); 328 BODY_32_39(38, E,T, A,B, C,D, X( 6), X( 8), X(14), X( 3));
285 BODY_32_39(39,D,E,T,A,B,C,X( 7),X( 9),X(15),X( 4)); 329 BODY_32_39(39, D,E, T,A, B,C, X( 7), X( 9), X(15), X( 4));
286 330
287 BODY_40_59(40,C,D,E,T,A,B,X( 8),X(10),X( 0),X( 5)); 331 BODY_40_59(40, C,D, E,T, A,B, X( 8), X(10), X( 0), X( 5));
288 BODY_40_59(41,B,C,D,E,T,A,X( 9),X(11),X( 1),X( 6)); 332 BODY_40_59(41, B,C, D,E, T,A, X( 9), X(11), X( 1), X( 6));
289 BODY_40_59(42,A,B,C,D,E,T,X(10),X(12),X( 2),X( 7)); 333 BODY_40_59(42, A,B, C,D, E,T, X(10), X(12), X( 2), X( 7));
290 BODY_40_59(43,T,A,B,C,D,E,X(11),X(13),X( 3),X( 8)); 334 BODY_40_59(43, T,A, B,C, D,E, X(11), X(13), X( 3), X( 8));
291 BODY_40_59(44,E,T,A,B,C,D,X(12),X(14),X( 4),X( 9)); 335 BODY_40_59(44, E,T, A,B, C,D, X(12), X(14), X( 4), X( 9));
292 BODY_40_59(45,D,E,T,A,B,C,X(13),X(15),X( 5),X(10)); 336 BODY_40_59(45, D,E, T,A, B,C, X(13), X(15), X( 5), X(10));
293 BODY_40_59(46,C,D,E,T,A,B,X(14),X( 0),X( 6),X(11)); 337 BODY_40_59(46, C,D, E,T, A,B, X(14), X( 0), X( 6), X(11));
294 BODY_40_59(47,B,C,D,E,T,A,X(15),X( 1),X( 7),X(12)); 338 BODY_40_59(47, B,C, D,E, T,A, X(15), X( 1), X( 7), X(12));
295 BODY_40_59(48,A,B,C,D,E,T,X( 0),X( 2),X( 8),X(13)); 339 BODY_40_59(48, A,B, C,D, E,T, X( 0), X( 2), X( 8), X(13));
296 BODY_40_59(49,T,A,B,C,D,E,X( 1),X( 3),X( 9),X(14)); 340 BODY_40_59(49, T,A, B,C, D,E, X( 1), X( 3), X( 9), X(14));
297 BODY_40_59(50,E,T,A,B,C,D,X( 2),X( 4),X(10),X(15)); 341 BODY_40_59(50, E,T, A,B, C,D, X( 2), X( 4), X(10), X(15));
298 BODY_40_59(51,D,E,T,A,B,C,X( 3),X( 5),X(11),X( 0)); 342 BODY_40_59(51, D,E, T,A, B,C, X( 3), X( 5), X(11), X( 0));
299 BODY_40_59(52,C,D,E,T,A,B,X( 4),X( 6),X(12),X( 1)); 343 BODY_40_59(52, C,D, E,T, A,B, X( 4), X( 6), X(12), X( 1));
300 BODY_40_59(53,B,C,D,E,T,A,X( 5),X( 7),X(13),X( 2)); 344 BODY_40_59(53, B,C, D,E, T,A, X( 5), X( 7), X(13), X( 2));
301 BODY_40_59(54,A,B,C,D,E,T,X( 6),X( 8),X(14),X( 3)); 345 BODY_40_59(54, A,B, C,D, E,T, X( 6), X( 8), X(14), X( 3));
302 BODY_40_59(55,T,A,B,C,D,E,X( 7),X( 9),X(15),X( 4)); 346 BODY_40_59(55, T,A, B,C, D,E, X( 7), X( 9), X(15), X( 4));
303 BODY_40_59(56,E,T,A,B,C,D,X( 8),X(10),X( 0),X( 5)); 347 BODY_40_59(56, E,T, A,B, C,D, X( 8), X(10), X( 0), X( 5));
304 BODY_40_59(57,D,E,T,A,B,C,X( 9),X(11),X( 1),X( 6)); 348 BODY_40_59(57, D,E, T,A, B,C, X( 9), X(11), X( 1), X( 6));
305 BODY_40_59(58,C,D,E,T,A,B,X(10),X(12),X( 2),X( 7)); 349 BODY_40_59(58, C,D, E,T, A,B, X(10), X(12), X( 2), X( 7));
306 BODY_40_59(59,B,C,D,E,T,A,X(11),X(13),X( 3),X( 8)); 350 BODY_40_59(59, B,C, D,E, T,A, X(11), X(13), X( 3), X( 8));
307 351
308 BODY_60_79(60,A,B,C,D,E,T,X(12),X(14),X( 4),X( 9)); 352 BODY_60_79(60, A,B, C,D, E,T, X(12), X(14), X( 4), X( 9));
309 BODY_60_79(61,T,A,B,C,D,E,X(13),X(15),X( 5),X(10)); 353 BODY_60_79(61, T,A, B,C, D,E, X(13), X(15), X( 5), X(10));
310 BODY_60_79(62,E,T,A,B,C,D,X(14),X( 0),X( 6),X(11)); 354 BODY_60_79(62, E,T, A,B, C,D, X(14), X( 0), X( 6), X(11));
311 BODY_60_79(63,D,E,T,A,B,C,X(15),X( 1),X( 7),X(12)); 355 BODY_60_79(63, D,E, T,A, B,C, X(15), X( 1), X( 7), X(12));
312 BODY_60_79(64,C,D,E,T,A,B,X( 0),X( 2),X( 8),X(13)); 356 BODY_60_79(64, C,D, E,T, A,B, X( 0), X( 2), X( 8), X(13));
313 BODY_60_79(65,B,C,D,E,T,A,X( 1),X( 3),X( 9),X(14)); 357 BODY_60_79(65, B,C, D,E, T,A, X( 1), X( 3), X( 9), X(14));
314 BODY_60_79(66,A,B,C,D,E,T,X( 2),X( 4),X(10),X(15)); 358 BODY_60_79(66, A,B, C,D, E,T, X( 2), X( 4), X(10), X(15));
315 BODY_60_79(67,T,A,B,C,D,E,X( 3),X( 5),X(11),X( 0)); 359 BODY_60_79(67, T,A, B,C, D,E, X( 3), X( 5), X(11), X( 0));
316 BODY_60_79(68,E,T,A,B,C,D,X( 4),X( 6),X(12),X( 1)); 360 BODY_60_79(68, E,T, A,B, C,D, X( 4), X( 6), X(12), X( 1));
317 BODY_60_79(69,D,E,T,A,B,C,X( 5),X( 7),X(13),X( 2)); 361 BODY_60_79(69, D,E, T,A, B,C, X( 5), X( 7), X(13), X( 2));
318 BODY_60_79(70,C,D,E,T,A,B,X( 6),X( 8),X(14),X( 3)); 362 BODY_60_79(70, C,D, E,T, A,B, X( 6), X( 8), X(14), X( 3));
319 BODY_60_79(71,B,C,D,E,T,A,X( 7),X( 9),X(15),X( 4)); 363 BODY_60_79(71, B,C, D,E, T,A, X( 7), X( 9), X(15), X( 4));
320 BODY_60_79(72,A,B,C,D,E,T,X( 8),X(10),X( 0),X( 5)); 364 BODY_60_79(72, A,B, C,D, E,T, X( 8), X(10), X( 0), X( 5));
321 BODY_60_79(73,T,A,B,C,D,E,X( 9),X(11),X( 1),X( 6)); 365 BODY_60_79(73, T,A, B,C, D,E, X( 9), X(11), X( 1), X( 6));
322 BODY_60_79(74,E,T,A,B,C,D,X(10),X(12),X( 2),X( 7)); 366 BODY_60_79(74, E,T, A,B, C,D, X(10), X(12), X( 2), X( 7));
323 BODY_60_79(75,D,E,T,A,B,C,X(11),X(13),X( 3),X( 8)); 367 BODY_60_79(75, D,E, T,A, B,C, X(11), X(13), X( 3), X( 8));
324 BODY_60_79(76,C,D,E,T,A,B,X(12),X(14),X( 4),X( 9)); 368 BODY_60_79(76, C,D, E,T, A,B, X(12), X(14), X( 4), X( 9));
325 BODY_60_79(77,B,C,D,E,T,A,X(13),X(15),X( 5),X(10)); 369 BODY_60_79(77, B,C, D,E, T,A, X(13), X(15), X( 5), X(10));
326 BODY_60_79(78,A,B,C,D,E,T,X(14),X( 0),X( 6),X(11)); 370 BODY_60_79(78, A,B, C,D, E,T, X(14), X( 0), X( 6), X(11));
327 BODY_60_79(79,T,A,B,C,D,E,X(15),X( 1),X( 7),X(12)); 371 BODY_60_79(79, T,A, B,C, D,E, X(15), X( 1), X( 7), X(12));
328 372
329 c->h0=(c->h0+E)&0xffffffffL; 373 c->h0 = (c->h0 + E)&0xffffffffL;
330 c->h1=(c->h1+T)&0xffffffffL; 374 c->h1 = (c->h1 + T)&0xffffffffL;
331 c->h2=(c->h2+A)&0xffffffffL; 375 c->h2 = (c->h2 + A)&0xffffffffL;
332 c->h3=(c->h3+B)&0xffffffffL; 376 c->h3 = (c->h3 + B)&0xffffffffL;
333 c->h4=(c->h4+C)&0xffffffffL; 377 c->h4 = (c->h4 + C)&0xffffffffL;
334 378
335 if (--num == 0) break; 379 if (--num == 0)
336 380 break;
337 A=c->h0; 381
338 B=c->h1; 382 A = c->h0;
339 C=c->h2; 383 B = c->h1;
340 D=c->h3; 384 C = c->h2;
341 E=c->h4; 385 D = c->h3;
342 386 E = c->h4;
343 } 387
344 } 388 }
389}
345#endif 390#endif
346 391
347#else /* OPENSSL_SMALL_FOOTPRINT */ 392#else /* OPENSSL_SMALL_FOOTPRINT */
@@ -376,48 +421,56 @@ static void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num)
376 A=ROTATE(A,5)+T+xa; } while(0) 421 A=ROTATE(A,5)+T+xa; } while(0)
377 422
378#if !defined(SHA1_ASM) 423#if !defined(SHA1_ASM)
379static void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num) 424static void
380 { 425HASH_BLOCK_DATA_ORDER(SHA_CTX *c, const void *p, size_t num)
381 const unsigned char *data=p; 426{
382 unsigned MD32_REG_T A,B,C,D,E,T,l; 427 const unsigned char *data = p;
428 unsigned MD32_REG_T A, B,C, D,E, T, l;
383 int i; 429 int i;
384 SHA_LONG X[16]; 430 SHA_LONG X[16];
385 431
386 A=c->h0; 432 A = c->h0;
387 B=c->h1; 433 B = c->h1;
388 C=c->h2; 434 C = c->h2;
389 D=c->h3; 435 D = c->h3;
390 E=c->h4; 436 E = c->h4;
391 437
392 for (;;) 438 for (;;) {
393 { 439 for (i = 0; i < 16; i++) {
394 for (i=0;i<16;i++) 440 HOST_c2l(data, l);
395 { HOST_c2l(data,l); X[i]=l; BODY_00_15(X[i]); } 441 X[i] = l;
396 for (i=0;i<4;i++) 442 BODY_00_15(X[i]);
397 { BODY_16_19(X[i], X[i+2], X[i+8], X[(i+13)&15]); } 443 }
398 for (;i<24;i++) 444 for (i = 0; i < 4; i++) {
399 { BODY_20_39(X[i&15], X[(i+2)&15], X[(i+8)&15],X[(i+13)&15]); } 445 BODY_16_19(X[i], X[i + 2], X[i + 8], X[(i + 13)&15]);
400 for (i=0;i<20;i++) 446 }
401 { BODY_40_59(X[(i+8)&15],X[(i+10)&15],X[i&15], X[(i+5)&15]); } 447 for (; i < 24; i++) {
402 for (i=4;i<24;i++) 448 BODY_20_39(X[i&15], X[(i + 2)&15], X[(i + 8)&15], X[(i + 13)&15]);
403 { BODY_60_79(X[(i+8)&15],X[(i+10)&15],X[i&15], X[(i+5)&15]); }
404
405 c->h0=(c->h0+A)&0xffffffffL;
406 c->h1=(c->h1+B)&0xffffffffL;
407 c->h2=(c->h2+C)&0xffffffffL;
408 c->h3=(c->h3+D)&0xffffffffL;
409 c->h4=(c->h4+E)&0xffffffffL;
410
411 if (--num == 0) break;
412
413 A=c->h0;
414 B=c->h1;
415 C=c->h2;
416 D=c->h3;
417 E=c->h4;
418
419 } 449 }
450 for (i = 0; i < 20; i++) {
451 BODY_40_59(X[(i + 8)&15], X[(i + 10)&15], X[i&15], X[(i + 5)&15]);
452 }
453 for (i = 4; i < 24; i++) {
454 BODY_60_79(X[(i + 8)&15], X[(i + 10)&15], X[i&15], X[(i + 5)&15]);
455 }
456
457 c->h0 = (c->h0 + A)&0xffffffffL;
458 c->h1 = (c->h1 + B)&0xffffffffL;
459 c->h2 = (c->h2 + C)&0xffffffffL;
460 c->h3 = (c->h3 + D)&0xffffffffL;
461 c->h4 = (c->h4 + E)&0xffffffffL;
462
463 if (--num == 0)
464 break;
465
466 A = c->h0;
467 B = c->h1;
468 C = c->h2;
469 D = c->h3;
470 E = c->h4;
471
420 } 472 }
473}
421#endif 474#endif
422 475
423#endif 476#endif