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/des | |
| 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/des')
| -rw-r--r-- | crypto/des/internal.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/crypto/des/internal.h b/crypto/des/internal.h index 91559ff4..00b45586 100644 --- a/crypto/des/internal.h +++ b/crypto/des/internal.h @@ -202,24 +202,7 @@ how to use xors :-) I got it to its final state. #define ITERATIONS 16 #define HALF_ITERATIONS 8 -#if defined(_MSC_VER) -#define ROTATE(a, n) (_lrotr(a, n)) -#elif defined(__ICC) -#define ROTATE(a, n) (_rotr(a, n)) -#elif defined(__GNUC__) && __GNUC__ >= 2 && !defined(OPENSSL_NO_ASM) && \ - !defined(__STRICT_ANSI__) && \ - (defined(OPENSSL_X86) || defined(OPENSSL_X86_64)) -#define ROTATE(a, n) \ - ({ \ - unsigned int ret; \ - asm("rorl %1,%0" : "=r"(ret) : "I"(n), "0"(a) : "cc"); \ - ret; \ - }) -#endif - -#ifndef ROTATE #define ROTATE(a, n) (((a) >> (n)) + ((a) << (32 - (n)))) -#endif #if defined(__cplusplus) |