Merge pull request #23 from cr-marcstevens/bigendian

* Protect against outside definitions of SHA1DC_BIGENDIAN, one can fo…

Author: cr-marcstevens

lib/sha1.c

@@ -16,18 +16,22 @@
 
 /* 
  Because Little-Endian architectures are most common,
- we only set BIGENDIAN if one of these conditions is met.
+ we only set SHA1DC_BIGENDIAN if one of these conditions is met.
  Note that all MSFT platforms are little endian,
  so none of these will be defined under the MSC compiler.
  If you are compiling on a big endian platform and your compiler does not define one of these,
  you will have to add whatever macros your tool chain defines to indicate Big-Endianness.
  */
-#if (defined(__BYTE_ORDER) && (__BYTE_ORDER==__BIG_ENDIAN)) || \
+#ifdefSHA1DC_BIGENDIAN
+#undef SHA1DC_BIGENDIAN
+#endif
+#if (!defined SHA1DC_FORCE_LITTLEENDIAN) && \
+ ((defined(__BYTE_ORDER) && (__BYTE_ORDER==__BIG_ENDIAN)) || \
  (defined(__BYTE_ORDER__) && (__BYTE_ORDER__==__BIG_ENDIAN__)) || \
  defined(__BIG_ENDIAN__) || defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) || \
- defined(_MIPSEB) || defined(__MIPSEB) || defined(__MIPSEB__)
+ defined(_MIPSEB) || defined(__MIPSEB) || defined(__MIPSEB__)|| defined(SHA1DC_FORCE_BIGENDIAN))
 
-#defineBIGENDIAN (1)
+#defineSHA1DC_BIGENDIAN
 
 #endif/*ENDIANNESS SELECTION*/
 
@@ -39,11 +43,11 @@
 
 #definesha1_mix(W, t) (rotate_left(W[t - 3] ^ W[t - 8] ^ W[t - 14] ^ W[t - 16], 1))
 
-#if defined(BIGENDIAN)
+#ifdefSHA1DC_BIGENDIAN
 #definesha1_load(m, t, temp){temp = m[t]}
 #else
 #definesha1_load(m, t, temp){temp = m[t]; sha1_bswap32(temp)}
-#endif/*define(BIGENDIAN)*/
+#endif
 
 #definesha1_store(W, t, x) *(volatile uint32_t *)&W[t] = x
 

lib/sha1.h

@@ -5,6 +5,9 @@
 * https://opensource.org/licenses/MIT
 ***/
 
+#ifndefSHA1DC_SHA1_H
+#defineSHA1DC_SHA1_H
+
 #if defined(__cplusplus)
 extern"C"{
 #endif
@@ -103,3 +106,5 @@ int SHA1DCFinal(unsigned char[20], SHA1_CTX*);
 #if defined(__cplusplus)
 }
 #endif
+
+#endif

lib/ubc_check.h

@@ -20,8 +20,8 @@
 // thus one needs to do the recompression check for each DV that has its bit set
 */
 
-#ifndefUBC_CHECK_H
-#defineUBC_CHECK_H
+#ifndefSHA1DC_UBC_CHECK_H
+#defineSHA1DC_UBC_CHECK_H
 
 #if defined(__cplusplus)
 extern"C"{
@@ -43,4 +43,4 @@ void ubc_check(const uint32_t W[80], uint32_t dvmask[DVMASKSIZE]);
 }
 #endif
 
-#endif/* UBC_CHECK_H */
+#endif