From 90b06ac786f859895ac503cf42759c2706205700 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Fri, 21 Aug 2009 11:08:25 -0700 Subject: only use faster SHA-1 code on machines with good libc Macs don't have byteswap.h or endian.h. Change conditionals to only use the faster SHA-1 code on little-endian machines with byteswap.h. --- libmincrypt/sha.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'libmincrypt') diff --git a/libmincrypt/sha.c b/libmincrypt/sha.c index 33d1cb3f1..e089d791f 100644 --- a/libmincrypt/sha.c +++ b/libmincrypt/sha.c @@ -25,13 +25,15 @@ ** ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include - #include "mincrypt/sha.h" -#if __BYTE_ORDER == __LITTLE_ENDIAN +// Some machines lack byteswap.h and endian.h. These have to use the +// slower code, even if they're little-endian. + +#if defined(HAVE_ENDIAN_H) && defined(HAVE_LITTLE_ENDIAN) + +#include +#include // This version is about 28% faster than the generic version below, // but assumes little-endianness. @@ -186,7 +188,7 @@ const uint8_t* SHA_final(SHA_CTX* ctx) { return ctx->buf.b; } -#else // __BYTE_ORDER == BIG_ENDIAN +#else // #if defined(HAVE_ENDIAN_H) && defined(HAVE_LITTLE_ENDIAN) #define rol(bits, value) (((value) << (bits)) | ((value) >> (32 - (bits)))) -- cgit v1.2.2-2-gfde8