diff options
| author | jsing <> | 2024-03-28 08:00:08 +0000 |
|---|---|---|
| committer | jsing <> | 2024-03-28 08:00:08 +0000 |
| commit | 891b03fdc7c654ebced58052ea3edfc8cccdd353 (patch) | |
| tree | 66effd62209f2548ea6d8db93682f6049e6c13ae /src | |
| parent | 078738467271801e34c8dace17e545154a096abe (diff) | |
| download | openbsd-891b03fdc7c654ebced58052ea3edfc8cccdd353.tar.gz openbsd-891b03fdc7c654ebced58052ea3edfc8cccdd353.tar.bz2 openbsd-891b03fdc7c654ebced58052ea3edfc8cccdd353.zip | |
Load in the top of the loop, as we do for other hash implementations.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/md4/md4.c | 20 | ||||
| -rw-r--r-- | src/lib/libcrypto/md5/md5.c | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/lib/libcrypto/md4/md4.c b/src/lib/libcrypto/md4/md4.c index f25595c155..42c5b21428 100644 --- a/src/lib/libcrypto/md4/md4.c +++ b/src/lib/libcrypto/md4/md4.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: md4.c,v 1.16 2024/03/27 06:15:18 jsing Exp $ */ | 1 | /* $OpenBSD: md4.c,v 1.17 2024/03/28 08:00:07 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 | * |
| @@ -118,12 +118,12 @@ md4_block_data_order(MD4_CTX *c, const void *_in, size_t num) | |||
| 118 | unsigned int X0, X1, X2, X3, X4, X5, X6, X7, | 118 | unsigned int X0, X1, X2, X3, X4, X5, X6, X7, |
| 119 | X8, X9, X10, X11, X12, X13, X14, X15; | 119 | X8, X9, X10, X11, X12, X13, X14, X15; |
| 120 | 120 | ||
| 121 | A = c->A; | ||
| 122 | B = c->B; | ||
| 123 | C = c->C; | ||
| 124 | D = c->D; | ||
| 125 | |||
| 126 | while (num-- > 0) { | 121 | while (num-- > 0) { |
| 122 | A = c->A; | ||
| 123 | B = c->B; | ||
| 124 | C = c->C; | ||
| 125 | D = c->D; | ||
| 126 | |||
| 127 | if ((uintptr_t)in % 4 == 0) { | 127 | if ((uintptr_t)in % 4 == 0) { |
| 128 | /* Input is 32 bit aligned. */ | 128 | /* Input is 32 bit aligned. */ |
| 129 | in32 = (const MD4_LONG *)in; | 129 | in32 = (const MD4_LONG *)in; |
| @@ -217,10 +217,10 @@ md4_block_data_order(MD4_CTX *c, const void *_in, size_t num) | |||
| 217 | md4_round3(&C, D, A, B, X7, 11); | 217 | md4_round3(&C, D, A, B, X7, 11); |
| 218 | md4_round3(&B, C, D, A, X15, 15); | 218 | md4_round3(&B, C, D, A, X15, 15); |
| 219 | 219 | ||
| 220 | A = c->A += A; | 220 | c->A += A; |
| 221 | B = c->B += B; | 221 | c->B += B; |
| 222 | C = c->C += C; | 222 | c->C += C; |
| 223 | D = c->D += D; | 223 | c->D += D; |
| 224 | } | 224 | } |
| 225 | } | 225 | } |
| 226 | 226 | ||
diff --git a/src/lib/libcrypto/md5/md5.c b/src/lib/libcrypto/md5/md5.c index 6b1afb4444..35d1ac9144 100644 --- a/src/lib/libcrypto/md5/md5.c +++ b/src/lib/libcrypto/md5/md5.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: md5.c,v 1.21 2024/03/26 05:55:15 jsing Exp $ */ | 1 | /* $OpenBSD: md5.c,v 1.22 2024/03/28 08:00:08 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 | * |
| @@ -137,12 +137,12 @@ md5_block_data_order(MD5_CTX *c, const void *_in, size_t num) | |||
| 137 | MD5_LONG X0, X1, X2, X3, X4, X5, X6, X7, | 137 | MD5_LONG X0, X1, X2, X3, X4, X5, X6, X7, |
| 138 | X8, X9, X10, X11, X12, X13, X14, X15; | 138 | X8, X9, X10, X11, X12, X13, X14, X15; |
| 139 | 139 | ||
| 140 | A = c->A; | ||
| 141 | B = c->B; | ||
| 142 | C = c->C; | ||
| 143 | D = c->D; | ||
| 144 | |||
| 145 | while (num-- > 0) { | 140 | while (num-- > 0) { |
| 141 | A = c->A; | ||
| 142 | B = c->B; | ||
| 143 | C = c->C; | ||
| 144 | D = c->D; | ||
| 145 | |||
| 146 | if ((uintptr_t)in % 4 == 0) { | 146 | if ((uintptr_t)in % 4 == 0) { |
| 147 | /* Input is 32 bit aligned. */ | 147 | /* Input is 32 bit aligned. */ |
| 148 | in32 = (const MD5_LONG *)in; | 148 | in32 = (const MD5_LONG *)in; |
| @@ -251,10 +251,10 @@ md5_block_data_order(MD5_CTX *c, const void *_in, size_t num) | |||
| 251 | md5_round4(&C, D, A, B, X2, 0x2ad7d2bbL, 15); | 251 | md5_round4(&C, D, A, B, X2, 0x2ad7d2bbL, 15); |
| 252 | md5_round4(&B, C, D, A, X9, 0xeb86d391L, 21); | 252 | md5_round4(&B, C, D, A, X9, 0xeb86d391L, 21); |
| 253 | 253 | ||
| 254 | A = c->A += A; | 254 | c->A += A; |
| 255 | B = c->B += B; | 255 | c->B += B; |
| 256 | C = c->C += C; | 256 | c->C += C; |
| 257 | D = c->D += D; | 257 | c->D += D; |
| 258 | } | 258 | } |
| 259 | } | 259 | } |
| 260 | #endif | 260 | #endif |
