summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/mincrypt/sha.h3
-rw-r--r--libmincrypt/sha.c14
2 files changed, 9 insertions, 8 deletions
diff --git a/include/mincrypt/sha.h b/include/mincrypt/sha.h
index 2bcc52224..af63e8775 100644
--- a/include/mincrypt/sha.h
+++ b/include/mincrypt/sha.h
@@ -29,7 +29,6 @@
#define _EMBEDDED_SHA_H_
#include <inttypes.h>
-#include <endian.h>
#ifdef __cplusplus
extern "C" {
@@ -38,7 +37,7 @@ extern "C" {
typedef struct SHA_CTX {
uint64_t count;
uint32_t state[5];
-#if __BYTE_ORDER == __LITTLE_ENDIAN
+#if defined(HAVE_ENDIAN_H) && defined(HAVE_LITTLE_ENDIAN)
union {
uint8_t b[64];
uint32_t w[16];
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 <byteswap.h>
-#include <endian.h>
-#include <memory.h>
-
#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 <byteswap.h>
+#include <memory.h>
// 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))))