Fix "possible loss of data" Win64 compiler warnings.

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

diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c
index 914458c000d7c84faf57dca82999f0525d3df670..d1aa7614b2f6bab444b0cd4d98c23330b82aaf68 100644 (file)
--- a/crypto/sha/sha512.c
+++ b/crypto/sha/sha512.c
@@ -61,6 +61,19 @@ const char SHA512_version[]="SHA-512" OPENSSL_VERSION_PTEXT;
 
 int SHA384_Init (SHA512_CTX *c)
        {
+#if defined(SHA512_ASM) && (defined(__arm__) || defined(__arm))
+       /* maintain dword order required by assembler module */
+       unsigned int *h = (unsigned int *)c->h;
+
+       h[0]  = 0xcbbb9d5d; h[1]  = 0xc1059ed8;
+       h[2]  = 0x629a292a; h[3]  = 0x367cd507;
+       h[4]  = 0x9159015a; h[5]  = 0x3070dd17;
+       h[6]  = 0x152fecd8; h[7]  = 0xf70e5939;
+       h[8]  = 0x67332667; h[9]  = 0xffc00b31;
+       h[10] = 0x8eb44a87; h[11] = 0x68581511;
+       h[12] = 0xdb0c2e0d; h[13] = 0x64f98fa7;
+       h[14] = 0x47b5481d; h[15] = 0xbefa4fa4;
+#else
        c->h[0]=U64(0xcbbb9d5dc1059ed8);
        c->h[1]=U64(0x629a292a367cd507);
        c->h[2]=U64(0x9159015a3070dd17);
@@ -69,6 +82,7 @@ int SHA384_Init (SHA512_CTX *c)
        c->h[5]=U64(0x8eb44a8768581511);
        c->h[6]=U64(0xdb0c2e0d64f98fa7);
        c->h[7]=U64(0x47b5481dbefa4fa4);
+#endif
         c->Nl=0;        c->Nh=0;
         c->num=0;       c->md_len=SHA384_DIGEST_LENGTH;
         return 1;
@@ -76,6 +90,19 @@ int SHA384_Init (SHA512_CTX *c)
 
 int SHA512_Init (SHA512_CTX *c)
        {
+#if defined(SHA512_ASM) && (defined(__arm__) || defined(__arm))
+       /* maintain dword order required by assembler module */
+       unsigned int *h = (unsigned int *)c->h;
+
+       h[0]  = 0x6a09e667; h[1]  = 0xf3bcc908;
+       h[2]  = 0xbb67ae85; h[3]  = 0x84caa73b;
+       h[4]  = 0x3c6ef372; h[5]  = 0xfe94f82b;
+       h[6]  = 0xa54ff53a; h[7]  = 0x5f1d36f1;
+       h[8]  = 0x510e527f; h[9]  = 0xade682d1;
+       h[10] = 0x9b05688c; h[11] = 0x2b3e6c1f;
+       h[12] = 0x1f83d9ab; h[13] = 0xfb41bd6b;
+       h[14] = 0x5be0cd19; h[15] = 0x137e2179;
+#else
        c->h[0]=U64(0x6a09e667f3bcc908);
        c->h[1]=U64(0xbb67ae8584caa73b);
        c->h[2]=U64(0x3c6ef372fe94f82b);
@@ -84,6 +111,7 @@ int SHA512_Init (SHA512_CTX *c)
        c->h[5]=U64(0x9b05688c2b3e6c1f);
        c->h[6]=U64(0x1f83d9abfb41bd6b);
        c->h[7]=U64(0x5be0cd19137e2179);
+#endif
         c->Nl=0;        c->Nh=0;
         c->num=0;       c->md_len=SHA512_DIGEST_LENGTH;
         return 1;
@@ -132,6 +160,24 @@ int SHA512_Final (unsigned char *md, SHA512_CTX *c)
 
        if (md==0) return 0;
 
+#if defined(SHA512_ASM) && (defined(__arm__) || defined(__arm))
+       /* recall assembler dword order... */
+       n = c->md_len;
+       if (n == SHA384_DIGEST_LENGTH || n == SHA512_DIGEST_LENGTH)
+               {
+               unsigned int *h = (unsigned int *)c->h, t;
+
+               for (n/=4;n;n--)
+                       {
+                       t = *(h++);
+                       *(md++) = (unsigned char)(t>>24);
+                       *(md++) = (unsigned char)(t>>16);
+                       *(md++) = (unsigned char)(t>>8);
+                       *(md++) = (unsigned char)(t);
+                       }
+               }
+       else    return 0;
+#else
        switch (c->md_len)
                {
                /* Let compiler decide if it's appropriate to unroll... */
@@ -168,7 +214,7 @@ int SHA512_Final (unsigned char *md, SHA512_CTX *c)
                /* ... as well as make sure md_len is not abused. */
                default:        return 0;
                }
-
+#endif
        return 1;
        }
 
@@ -194,7 +240,7 @@ int SHA512_Update (SHA512_CTX *c, const void *_data, size_t len)
 
                if (len < n)
                        {
-                       memcpy (p+c->num,data,len), c->num += len;
+                       memcpy (p+c->num,data,len), c->num += (unsigned int)len;
                        return 1;
                        }
                else    {
@@ -304,7 +350,7 @@ static const SHA_LONG64 K512[80] = {
 #ifndef PEDANTIC
 # if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
 #  if defined(__x86_64) || defined(__x86_64__)
-#   define ROTR(a,n)   ({ unsigned long ret;           \
+#   define ROTR(a,n)   ({ SHA_LONG64 ret;              \
                                asm ("rorq %1,%0"       \
                                : "=r"(ret)             \
                                : "J"(n),"0"(a)         \
@@ -318,19 +364,19 @@ static const SHA_LONG64 K512[80] = {
 #  elif (defined(__i386) || defined(__i386__)) && !defined(B_ENDIAN)
 #   if defined(I386_ONLY)
 #    define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\
-                       unsigned int hi,lo;                     \
+                        unsigned int hi=p[0],lo=p[1];          \
                                asm("xchgb %%ah,%%al;xchgb %%dh,%%dl;"\
                                    "roll $16,%%eax; roll $16,%%edx; "\
                                    "xchgb %%ah,%%al;xchgb %%dh,%%dl;" \
                                : "=a"(lo),"=d"(hi)             \
-                               : "0"(p[1]),"1"(p[0]) : "cc");  \
+                               : "0"(lo),"1"(hi) : "cc");      \
                                ((SHA_LONG64)hi)<<32|lo;        })
 #   else
 #    define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\
-                       unsigned int hi,lo;                     \
+                        unsigned int hi=p[0],lo=p[1];          \
                                asm ("bswapl %0; bswapl %1;"    \
                                : "=r"(lo),"=r"(hi)             \
-                               : "0"(p[1]),"1"(p[0]));         \
+                               : "0"(lo),"1"(hi));             \
                                ((SHA_LONG64)hi)<<32|lo;        })
 #   endif
 #  elif (defined(_ARCH_PPC) && defined(__64BIT__)) || defined(_ARCH_PPC64)
@@ -341,6 +387,7 @@ static const SHA_LONG64 K512[80] = {
 #  endif
 # elif defined(_MSC_VER)
 #  if defined(_WIN64)  /* applies to both IA-64 and AMD64 */
+#   pragma intrinsic(_rotr64)
 #   define ROTR(a,n)   _rotr64((a),n)
 #  endif
 #  if defined(_M_IX86) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
@@ -585,4 +632,10 @@ static void sha512_block_data_order (SHA512_CTX *ctx, const void *in, size_t num
 
 #endif /* SHA512_ASM */
 
-#endif /* OPENSSL_NO_SHA512 */
+#else /* !OPENSSL_NO_SHA512 */
+
+#if defined(PEDANTIC) || defined(__DECC) || defined(OPENSSL_SYS_MACOSX)
+static void *dummy=&dummy;
+#endif
+
+#endif /* !OPENSSL_NO_SHA512 */