aesni-x86_64.pl: make ECB subroutine Windows ABI compliant.

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

diff --git a/crypto/sha/sha256.c b/crypto/sha/sha256.c
index 9b69ff38d2d57aa35934007e7e7c01088fed4cab..4eae07484913fb7329b36f3a8554c872b54057b0 100644 (file)
--- a/crypto/sha/sha256.c
+++ b/crypto/sha/sha256.c
@@ -14,9 +14,9 @@
 #include <openssl/sha.h>
 #include <openssl/opensslv.h>
 
-const char *SHA256_version="SHA-256" OPENSSL_VERSION_PTEXT;
+const char SHA256_version[]="SHA-256" OPENSSL_VERSION_PTEXT;
 
-int SHA224_Init (SHA256_CTX *c)
+fips_md_init_ctx(SHA224, SHA256)
        {
        memset (c,0,sizeof(*c));
        c->h[0]=0xc1059ed8UL;   c->h[1]=0x367cd507UL;
@@ -27,7 +27,7 @@ int SHA224_Init (SHA256_CTX *c)
        return 1;
        }
 
-int SHA256_Init (SHA256_CTX *c)
+fips_md_init(SHA256)
        {
        memset (c,0,sizeof(*c));
        c->h[0]=0x6a09e667UL;   c->h[1]=0xbb67ae85UL;
@@ -84,21 +84,21 @@ int SHA224_Final (unsigned char *md, SHA256_CTX *c)
  */
 #define        HASH_MAKE_STRING(c,s)   do {    \
        unsigned long ll;               \
-       unsigned int  n;                \
+       unsigned int  nn;               \
        switch ((c)->md_len)            \
        {   case SHA224_DIGEST_LENGTH:  \
-               for (n=0;n<SHA224_DIGEST_LENGTH/4;n++)  \
-               {   ll=(c)->h[n]; HOST_l2c(ll,(s));   } \
+               for (nn=0;nn<SHA224_DIGEST_LENGTH/4;nn++)       \
+               {   ll=(c)->h[nn]; (void)HOST_l2c(ll,(s));   }  \
                break;                  \
            case SHA256_DIGEST_LENGTH:  \
-               for (n=0;n<SHA256_DIGEST_LENGTH/4;n++)  \
-               {   ll=(c)->h[n]; HOST_l2c(ll,(s));   } \
+               for (nn=0;nn<SHA256_DIGEST_LENGTH/4;nn++)       \
+               {   ll=(c)->h[nn]; (void)HOST_l2c(ll,(s));   }  \
                break;                  \
            default:                    \
                if ((c)->md_len > SHA256_DIGEST_LENGTH) \
                    return 0;                           \
-               for (n=0;n<(c)->md_len/4;n++)           \
-               {   ll=(c)->h[n]; HOST_l2c(ll,(s));   } \
+               for (nn=0;nn<(c)->md_len/4;nn++)                \
+               {   ll=(c)->h[nn]; (void)HOST_l2c(ll,(s));   }  \
                break;                  \
        }                               \
        } while (0)