bn_mont.c fix [from HEAD].

[oweals/openssl.git] / crypto / sha / sha_locl.h

diff --git a/crypto/sha/sha_locl.h b/crypto/sha/sha_locl.h
index 01fc6e22eb7cf58b9a427a39eb96e47e3ec2c348..6281313a455680e84c5a3b8bebeb7e1549571d87 100644 (file)
--- a/crypto/sha/sha_locl.h
+++ b/crypto/sha/sha_locl.h
@@ -116,11 +116,18 @@
 
 # ifdef SHA1_ASM
 #  if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)
+#   if !defined(B_ENDIAN)
+#    define sha1_block_host_order              sha1_block_asm_host_order
+#    define DONT_IMPLEMENT_BLOCK_HOST_ORDER
+#    define sha1_block_data_order              sha1_block_asm_data_order
+#    define DONT_IMPLEMENT_BLOCK_DATA_ORDER
+#    define HASH_BLOCK_DATA_ORDER_ALIGNED      sha1_block_asm_data_order
+#   endif
+#  elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
 #   define sha1_block_host_order               sha1_block_asm_host_order
 #   define DONT_IMPLEMENT_BLOCK_HOST_ORDER
 #   define sha1_block_data_order               sha1_block_asm_data_order
 #   define DONT_IMPLEMENT_BLOCK_DATA_ORDER
-#   define HASH_BLOCK_DATA_ORDER_ALIGNED       sha1_block_asm_data_order
 #  endif
 # endif
   void sha1_block_host_order (SHA_CTX *c, const void *p,size_t num);
@@ -334,7 +341,7 @@ void HASH_BLOCK_HOST_ORDER (SHA_CTX *c, const void *d, size_t num)
        c->h3=(c->h3+B)&0xffffffffL;
        c->h4=(c->h4+C)&0xffffffffL;
 
-       if (--num <= 0) break;
+       if (--num == 0) break;
 
        A=c->h0;
        B=c->h1;
@@ -461,7 +468,7 @@ void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num)
        c->h3=(c->h3+B)&0xffffffffL;
        c->h4=(c->h4+C)&0xffffffffL;
 
-       if (--num <= 0) break;
+       if (--num == 0) break;
 
        A=c->h0;
        B=c->h1;
@@ -537,7 +544,7 @@ void HASH_BLOCK_HOST_ORDER (SHA_CTX *c, const void *d, size_t num)
        c->h3=(c->h3+D)&0xffffffffL;
        c->h4=(c->h4+E)&0xffffffffL;
 
-       if (--num <= 0) break;
+       if (--num == 0) break;
 
        A=c->h0;
        B=c->h1;
@@ -583,7 +590,7 @@ void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num)
        c->h3=(c->h3+D)&0xffffffffL;
        c->h4=(c->h4+E)&0xffffffffL;
 
-       if (--num <= 0) break;
+       if (--num == 0) break;
 
        A=c->h0;
        B=c->h1;