Fix for Win32.

[openssl.git] / crypto / sha / sha256.c

diff --git a/crypto/sha/sha256.c b/crypto/sha/sha256.c
index 21aa5d7d0ddb79c7c3d30c8e9d9f5df683dc093c..bbc20da0e97f9e030f6412846880cb23978206dc 100644 (file)
--- a/crypto/sha/sha256.c
+++ b/crypto/sha/sha256.c
@@ -4,10 +4,12 @@
  * according to the OpenSSL license [found in ../../LICENSE].
  * ====================================================================
  */
+#include <openssl/opensslconf.h>
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA256)
+
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/opensslconf.h>
 #include <openssl/crypto.h>
 #include <openssl/sha.h>
 #include <openssl/opensslv.h>
@@ -177,6 +179,8 @@ static void sha256_block (SHA256_CTX *ctx, const void *in, size_t num, int host)
                        h = g;  g = f;  f = e;  e = d + T1;
                        d = c;  c = b;  b = a;  a = T1 + T2;
                        }
+
+               data += SHA256_CBLOCK;
                }
        else
                {
@@ -207,7 +211,6 @@ static void sha256_block (SHA256_CTX *ctx, const void *in, size_t num, int host)
        ctx->h[0] += a; ctx->h[1] += b; ctx->h[2] += c; ctx->h[3] += d;
        ctx->h[4] += e; ctx->h[5] += f; ctx->h[6] += g; ctx->h[7] += h;
 
-                       data += SHA256_CBLOCK;
                        }
 }
 
@@ -256,6 +259,8 @@ static void sha256_block (SHA256_CTX *ctx, const void *in, size_t num, int host)
                T1 = X[13] = W[13];     ROUND_00_15(13,d,e,f,g,h,a,b,c);
                T1 = X[14] = W[14];     ROUND_00_15(14,c,d,e,f,g,h,a,b);
                T1 = X[15] = W[15];     ROUND_00_15(15,b,c,d,e,f,g,h,a);
+
+               data += SHA256_CBLOCK;
                }
        else
                {
@@ -294,7 +299,6 @@ static void sha256_block (SHA256_CTX *ctx, const void *in, size_t num, int host)
        ctx->h[0] += a; ctx->h[1] += b; ctx->h[2] += c; ctx->h[3] += d;
        ctx->h[4] += e; ctx->h[5] += f; ctx->h[6] += g; ctx->h[7] += h;
 
-                       data += SHA256_CBLOCK;
                        }
        }
 
@@ -311,3 +315,5 @@ void HASH_BLOCK_HOST_ORDER (SHA256_CTX *ctx, const void *in, size_t num)
 
 void HASH_BLOCK_DATA_ORDER (SHA256_CTX *ctx, const void *in, size_t num)
 {   sha256_block (ctx,in,num,0);   }
+
+#endif /* OPENSSL_NO_SHA256 */