Make MD5 work on Alpha, and fix a bug.

Submitted by: Andy Polyakov

diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index 3c086a8aae8dc6195d97bd7664742847a9a3d00d..8c0a085369f8176a63fbfb874e15e1c89b274ced 100644 (file)
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -315,7 +315,7 @@
 #  endif
 #endif
 
-#if !defined(HASH_BLOCK_DATA_ORDER_ALIGNED) && HASH_BLOCK_DATA_ORDER_ALIGNED!=1
+#if !defined(HASH_BLOCK_DATA_ORDER_ALIGNED) || HASH_BLOCK_DATA_ORDER_ALIGNED==1
 #ifndef HASH_BLOCK_DATA_ORDER
 #error "HASH_BLOCK_DATA_ORDER must be defined!"
 #endif

diff --git a/crypto/md5/md5_locl.h b/crypto/md5/md5_locl.h
index 510e5735e1654dcec049ef306349e987a18197a3..bafd305ad0529eb6dd4f6c3f71d847cb378b1567 100644 (file)
--- a/crypto/md5/md5_locl.h
+++ b/crypto/md5/md5_locl.h
@@ -112,7 +112,7 @@ void md5_block_data_order (MD5_CTX *c, const void *p,int num);
 #define HASH_TRANSFORM         MD5_Transform
 #define HASH_FINAL             MD5_Final
 #define HASH_BLOCK_HOST_ORDER  md5_block_host_order
-#if defined(B_ENDIAN) || defined(md5_block_data_order)
+#if !defined(L_ENDIAN) || defined(md5_block_data_order)
 #define        HASH_BLOCK_DATA_ORDER   md5_block_data_order
 /*
  * Little-endians (Intel and Alpha) feel better without this.