diff options
| author | David Benjamin <davidben@chromium.org> | 2015-12-07 06:09:33 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-12-16 22:57:31 +0300 |
| commit | 5a19d7dfa8abe611da91d3b90f3313611bc9b3c4 (patch) | |
| tree | 82bc1b7a7411c3d4013cfce11669569df6ae25d6 /crypto/md4 | |
| parent | 78fefbf3bbb3ac6ddf537fc927b15b4c41db7f6c (diff) | |
Use the straight-forward ROTATE macro.
I would hope any sensible compiler would recognize the rotation. (If
not, we should at least pull this into crypto/internal.h.) Confirmed
that clang at least produces the exact same instructions for
sha256_block_data_order for release + NO_ASM. This is also mostly moot
as SHA-1 and SHA-256 both have assembly versions on x86 that sidestep
most of this.
For the digests, take it out of md32_common.h since it doesn't use the
macro. md32_common.h isn't sure whether it's a multiply-included header
or not. It should be, but it has an #include guard (doesn't quite do
what you'd want) and will get HOST_c2l, etc., confused if one tries to
include it twice.
Change-Id: I1632801de6473ffd2c6557f3412521ec5d6b305c
Reviewed-on: https://boringssl-review.googlesource.com/6650
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/md4')
| -rw-r--r-- | crypto/md4/md4.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/md4/md4.c b/crypto/md4/md4.c index 0a8ea1d6..52296ebb 100644 --- a/crypto/md4/md4.c +++ b/crypto/md4/md4.c @@ -103,6 +103,8 @@ void md4_block_data_order(uint32_t *state, const uint8_t *data, size_t num); #define G(b, c, d) (((b) & (c)) | ((b) & (d)) | ((c) & (d))) #define H(b, c, d) ((b) ^ (c) ^ (d)) +#define ROTATE(a, n) (((a) << (n)) | ((a) >> (32 - (n)))) + #define R0(a, b, c, d, k, s, t) \ { \ a += ((k) + (t)+F((b), (c), (d))); \ |