MIPS assembly pack: add support for SmartMIPS ASE.

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

diff --git a/crypto/sha/sha256.c b/crypto/sha/sha256.c
index 9b69ff38d2d57aa35934007e7e7c01088fed4cab..d43ee653a35eff197adf2ff8d798369f597c9cb3 100644 (file)
--- a/crypto/sha/sha256.c
+++ b/crypto/sha/sha256.c
@@ -14,7 +14,8 @@
 #include <openssl/sha.h>
 #include <openssl/opensslv.h>
 
-const char *SHA256_version="SHA-256" OPENSSL_VERSION_PTEXT;
+__fips_constseg
+const char SHA256_version[]="SHA-256" OPENSSL_VERSION_PTEXT;
 
 int SHA224_Init (SHA256_CTX *c)
        {
@@ -84,21 +85,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]; 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]; 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]; HOST_l2c(ll,(s));   }        \
                break;                  \
        }                               \
        } while (0)
@@ -115,6 +116,7 @@ void sha256_block_data_order (SHA256_CTX *ctx, const void *in, size_t num);
 #include "md32_common.h"
 
 #ifndef SHA256_ASM
+__fips_constseg
 static const SHA_LONG K256[64] = {
        0x428a2f98UL,0x71374491UL,0xb5c0fbcfUL,0xe9b5dba5UL,
        0x3956c25bUL,0x59f111f1UL,0x923f82a4UL,0xab1c5ed5UL,