summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2023-07-15 15:37:05 +0000
committerjsing <>2023-07-15 15:37:05 +0000
commit4db6baa11c3cc0472d6d584383629ddecd586d6e (patch)
treeb6b487613024e9f3095c87a7ca95c77ff7222248
parent63e12b66749be8ad7e7f06dbba6273cba0433d7f (diff)
downloadopenbsd-4db6baa11c3cc0472d6d584383629ddecd586d6e.tar.gz
openbsd-4db6baa11c3cc0472d6d584383629ddecd586d6e.tar.bz2
openbsd-4db6baa11c3cc0472d6d584383629ddecd586d6e.zip
Mop up MD32_XARRAY from md5.
MD32_XARRAY was added as a workaround for a broken HP C compiler (circa 1999). Clean it up to simplify the code. No change in generated assembly.
Diffstat
-rw-r--r--src/lib/libcrypto/md5/md5_dgst.c175
1 files changed, 84 insertions, 91 deletions
diff --git a/src/lib/libcrypto/md5/md5_dgst.c b/src/lib/libcrypto/md5/md5_dgst.c
index b0eb47219a..3cd4b1ba78 100644
--- a/src/lib/libcrypto/md5/md5_dgst.c
+++ b/src/lib/libcrypto/md5/md5_dgst.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: md5_dgst.c,v 1.18 2023/07/08 10:45:57 beck Exp $ */ 1/* $OpenBSD: md5_dgst.c,v 1.19 2023/07/15 15:37:05 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 *
@@ -166,16 +166,9 @@ void
166md5_block_data_order(MD5_CTX *c, const void *data_, size_t num) 166md5_block_data_order(MD5_CTX *c, const void *data_, size_t num)
167{ 167{
168 const unsigned char *data = data_; 168 const unsigned char *data = data_;
169 unsigned MD32_REG_T A, B,C, D, l; 169 unsigned MD32_REG_T A, B, C, D, l;
170#ifndef MD32_XARRAY 170 unsigned MD32_REG_T X0, X1, X2, X3, X4, X5, X6, X7,
171 /* See comment in crypto/sha/sha_locl.h for details. */ 171 X8, X9, X10, X11, X12, X13, X14, X15;
172 unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
173 XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
174# define X(i) XX##i
175#else
176 MD5_LONG XX[MD5_LBLOCK];
177# define X(i) XX[i]
178#endif
179 172
180 A = c->A; 173 A = c->A;
181 B = c->B; 174 B = c->B;
@@ -184,105 +177,105 @@ md5_block_data_order(MD5_CTX *c, const void *data_, size_t num)
184 177
185 for (; num--; ) { 178 for (; num--; ) {
186 HOST_c2l(data, l); 179 HOST_c2l(data, l);
187 X( 0) = l; 180 X0 = l;
188 HOST_c2l(data, l); 181 HOST_c2l(data, l);
189 X( 1) = l; 182 X1 = l;
190 /* Round 0 */ 183 /* Round 0 */
191 R0(A, B,C, D,X( 0), 7, 0xd76aa478L); 184 R0(A, B, C, D, X0, 7, 0xd76aa478L);
192 HOST_c2l(data, l); 185 HOST_c2l(data, l);
193 X( 2) = l; 186 X2 = l;
194 R0(D, A,B, C,X( 1), 12, 0xe8c7b756L); 187 R0(D, A, B, C, X1, 12, 0xe8c7b756L);
195 HOST_c2l(data, l); 188 HOST_c2l(data, l);
196 X( 3) = l; 189 X3 = l;
197 R0(C, D,A, B,X( 2), 17, 0x242070dbL); 190 R0(C, D, A, B, X2, 17, 0x242070dbL);
198 HOST_c2l(data, l); 191 HOST_c2l(data, l);
199 X( 4) = l; 192 X4 = l;
200 R0(B, C,D, A,X( 3), 22, 0xc1bdceeeL); 193 R0(B, C, D, A, X3, 22, 0xc1bdceeeL);
201 HOST_c2l(data, l); 194 HOST_c2l(data, l);
202 X( 5) = l; 195 X5 = l;
203 R0(A, B,C, D,X( 4), 7, 0xf57c0fafL); 196 R0(A, B, C, D, X4, 7, 0xf57c0fafL);
204 HOST_c2l(data, l); 197 HOST_c2l(data, l);
205 X( 6) = l; 198 X6 = l;
206 R0(D, A,B, C,X( 5), 12, 0x4787c62aL); 199 R0(D, A, B, C, X5, 12, 0x4787c62aL);
207 HOST_c2l(data, l); 200 HOST_c2l(data, l);
208 X( 7) = l; 201 X7 = l;
209 R0(C, D,A, B,X( 6), 17, 0xa8304613L); 202 R0(C, D, A, B, X6, 17, 0xa8304613L);
210 HOST_c2l(data, l); 203 HOST_c2l(data, l);
211 X( 8) = l; 204 X8 = l;
212 R0(B, C,D, A,X( 7), 22, 0xfd469501L); 205 R0(B, C, D, A, X7, 22, 0xfd469501L);
213 HOST_c2l(data, l); 206 HOST_c2l(data, l);
214 X( 9) = l; 207 X9 = l;
215 R0(A, B,C, D,X( 8), 7, 0x698098d8L); 208 R0(A, B, C, D, X8, 7, 0x698098d8L);
216 HOST_c2l(data, l); 209 HOST_c2l(data, l);
217 X(10) = l; 210 X10 = l;
218 R0(D, A,B, C,X( 9), 12, 0x8b44f7afL); 211 R0(D, A, B, C, X9, 12, 0x8b44f7afL);
219 HOST_c2l(data, l); 212 HOST_c2l(data, l);
220 X(11) = l; 213 X11 = l;
221 R0(C, D,A, B,X(10), 17, 0xffff5bb1L); 214 R0(C, D, A, B, X10, 17, 0xffff5bb1L);
222 HOST_c2l(data, l); 215 HOST_c2l(data, l);
223 X(12) = l; 216 X12 = l;
224 R0(B, C,D, A,X(11), 22, 0x895cd7beL); 217 R0(B, C, D, A, X11, 22, 0x895cd7beL);
225 HOST_c2l(data, l); 218 HOST_c2l(data, l);
226 X(13) = l; 219 X13 = l;
227 R0(A, B,C, D,X(12), 7, 0x6b901122L); 220 R0(A, B, C, D, X12, 7, 0x6b901122L);
228 HOST_c2l(data, l); 221 HOST_c2l(data, l);
229 X(14) = l; 222 X14 = l;
230 R0(D, A,B, C,X(13), 12, 0xfd987193L); 223 R0(D, A, B, C, X13, 12, 0xfd987193L);
231 HOST_c2l(data, l); 224 HOST_c2l(data, l);
232 X(15) = l; 225 X15 = l;
233 R0(C, D,A, B,X(14), 17, 0xa679438eL); 226 R0(C, D, A, B, X14, 17, 0xa679438eL);
234 R0(B, C,D, A,X(15), 22, 0x49b40821L); 227 R0(B, C, D, A, X15, 22, 0x49b40821L);
235 /* Round 1 */ 228 /* Round 1 */
236 R1(A, B,C, D,X( 1), 5, 0xf61e2562L); 229 R1(A, B, C, D, X1, 5, 0xf61e2562L);
237 R1(D, A,B, C,X( 6), 9, 0xc040b340L); 230 R1(D, A, B, C, X6, 9, 0xc040b340L);
238 R1(C, D,A, B,X(11), 14, 0x265e5a51L); 231 R1(C, D, A, B, X11, 14, 0x265e5a51L);
239 R1(B, C,D, A,X( 0), 20, 0xe9b6c7aaL); 232 R1(B, C, D, A, X0, 20, 0xe9b6c7aaL);
240 R1(A, B,C, D,X( 5), 5, 0xd62f105dL); 233 R1(A, B, C, D, X5, 5, 0xd62f105dL);
241 R1(D, A,B, C,X(10), 9, 0x02441453L); 234 R1(D, A, B, C, X10, 9, 0x02441453L);
242 R1(C, D,A, B,X(15), 14, 0xd8a1e681L); 235 R1(C, D, A, B, X15, 14, 0xd8a1e681L);
243 R1(B, C,D, A,X( 4), 20, 0xe7d3fbc8L); 236 R1(B, C, D, A, X4, 20, 0xe7d3fbc8L);
244 R1(A, B,C, D,X( 9), 5, 0x21e1cde6L); 237 R1(A, B, C, D, X9, 5, 0x21e1cde6L);
245 R1(D, A,B, C,X(14), 9, 0xc33707d6L); 238 R1(D, A, B, C, X14, 9, 0xc33707d6L);
246 R1(C, D,A, B,X( 3), 14, 0xf4d50d87L); 239 R1(C, D, A, B, X3, 14, 0xf4d50d87L);
247 R1(B, C,D, A,X( 8), 20, 0x455a14edL); 240 R1(B, C, D, A, X8, 20, 0x455a14edL);
248 R1(A, B,C, D,X(13), 5, 0xa9e3e905L); 241 R1(A, B, C, D, X13, 5, 0xa9e3e905L);
249 R1(D, A,B, C,X( 2), 9, 0xfcefa3f8L); 242 R1(D, A, B, C, X2, 9, 0xfcefa3f8L);
250 R1(C, D,A, B,X( 7), 14, 0x676f02d9L); 243 R1(C, D, A, B, X7, 14, 0x676f02d9L);
251 R1(B, C,D, A,X(12), 20, 0x8d2a4c8aL); 244 R1(B, C, D, A, X12, 20, 0x8d2a4c8aL);
252 /* Round 2 */ 245 /* Round 2 */
253 R2(A, B,C, D,X( 5), 4, 0xfffa3942L); 246 R2(A, B, C, D, X5, 4, 0xfffa3942L);
254 R2(D, A,B, C,X( 8), 11, 0x8771f681L); 247 R2(D, A, B, C, X8, 11, 0x8771f681L);
255 R2(C, D,A, B,X(11), 16, 0x6d9d6122L); 248 R2(C, D, A, B, X11, 16, 0x6d9d6122L);
256 R2(B, C,D, A,X(14), 23, 0xfde5380cL); 249 R2(B, C, D, A, X14, 23, 0xfde5380cL);
257 R2(A, B,C, D,X( 1), 4, 0xa4beea44L); 250 R2(A, B, C, D, X1, 4, 0xa4beea44L);
258 R2(D, A,B, C,X( 4), 11, 0x4bdecfa9L); 251 R2(D, A, B, C, X4, 11, 0x4bdecfa9L);
259 R2(C, D,A, B,X( 7), 16, 0xf6bb4b60L); 252 R2(C, D, A, B, X7, 16, 0xf6bb4b60L);
260 R2(B, C,D, A,X(10), 23, 0xbebfbc70L); 253 R2(B, C, D, A, X10, 23, 0xbebfbc70L);
261 R2(A, B,C, D,X(13), 4, 0x289b7ec6L); 254 R2(A, B, C, D, X13, 4, 0x289b7ec6L);
262 R2(D, A,B, C,X( 0), 11, 0xeaa127faL); 255 R2(D, A, B, C, X0, 11, 0xeaa127faL);
263 R2(C, D,A, B,X( 3), 16, 0xd4ef3085L); 256 R2(C, D, A, B, X3, 16, 0xd4ef3085L);
264 R2(B, C,D, A,X( 6), 23, 0x04881d05L); 257 R2(B, C, D, A, X6, 23, 0x04881d05L);
265 R2(A, B,C, D,X( 9), 4, 0xd9d4d039L); 258 R2(A, B, C, D, X9, 4, 0xd9d4d039L);
266 R2(D, A,B, C,X(12), 11, 0xe6db99e5L); 259 R2(D, A, B, C, X12, 11, 0xe6db99e5L);
267 R2(C, D,A, B,X(15), 16, 0x1fa27cf8L); 260 R2(C, D, A, B, X15, 16, 0x1fa27cf8L);
268 R2(B, C,D, A,X( 2), 23, 0xc4ac5665L); 261 R2(B, C, D, A, X2, 23, 0xc4ac5665L);
269 /* Round 3 */ 262 /* Round 3 */
270 R3(A, B,C, D,X( 0), 6, 0xf4292244L); 263 R3(A, B, C, D, X0, 6, 0xf4292244L);
271 R3(D, A,B, C,X( 7), 10, 0x432aff97L); 264 R3(D, A, B, C, X7, 10, 0x432aff97L);
272 R3(C, D,A, B,X(14), 15, 0xab9423a7L); 265 R3(C, D, A, B, X14, 15, 0xab9423a7L);
273 R3(B, C,D, A,X( 5), 21, 0xfc93a039L); 266 R3(B, C, D, A, X5, 21, 0xfc93a039L);
274 R3(A, B,C, D,X(12), 6, 0x655b59c3L); 267 R3(A, B, C, D, X12, 6, 0x655b59c3L);
275 R3(D, A,B, C,X( 3), 10, 0x8f0ccc92L); 268 R3(D, A, B, C, X3, 10, 0x8f0ccc92L);
276 R3(C, D,A, B,X(10), 15, 0xffeff47dL); 269 R3(C, D, A, B, X10, 15, 0xffeff47dL);
277 R3(B, C,D, A,X( 1), 21, 0x85845dd1L); 270 R3(B, C, D, A, X1, 21, 0x85845dd1L);
278 R3(A, B,C, D,X( 8), 6, 0x6fa87e4fL); 271 R3(A, B, C, D, X8, 6, 0x6fa87e4fL);
279 R3(D, A,B, C,X(15), 10, 0xfe2ce6e0L); 272 R3(D, A, B, C, X15, 10, 0xfe2ce6e0L);
280 R3(C, D,A, B,X( 6), 15, 0xa3014314L); 273 R3(C, D, A, B, X6, 15, 0xa3014314L);
281 R3(B, C,D, A,X(13), 21, 0x4e0811a1L); 274 R3(B, C, D, A, X13, 21, 0x4e0811a1L);
282 R3(A, B,C, D,X( 4), 6, 0xf7537e82L); 275 R3(A, B, C, D, X4, 6, 0xf7537e82L);
283 R3(D, A,B, C,X(11), 10, 0xbd3af235L); 276 R3(D, A, B, C, X11, 10, 0xbd3af235L);
284 R3(C, D,A, B,X( 2), 15, 0x2ad7d2bbL); 277 R3(C, D, A, B, X2, 15, 0x2ad7d2bbL);
285 R3(B, C,D, A,X( 9), 21, 0xeb86d391L); 278 R3(B, C, D, A, X9, 21, 0xeb86d391L);
286 279
287 A = c->A += A; 280 A = c->A += A;
288 B = c->B += B; 281 B = c->B += B;
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 17:41:31 +0000