Fix bug [SHA1 IA-64 being disabled] introduced with Stratus VOS update.

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

diff --git a/crypto/sha/sha_locl.h b/crypto/sha/sha_locl.h
index 6f64e57627570083938dfd1d81a4213ddfe7d90e..6281313a455680e84c5a3b8bebeb7e1549571d87 100644 (file)
--- a/crypto/sha/sha_locl.h
+++ b/crypto/sha/sha_locl.h
@@ -74,12 +74,12 @@
 #define HASH_CBLOCK             SHA_CBLOCK
 #define HASH_LBLOCK             SHA_LBLOCK
 #define HASH_MAKE_STRING(c,s)   do {   \
 #define HASH_CBLOCK             SHA_CBLOCK
 #define HASH_LBLOCK             SHA_LBLOCK
 #define HASH_MAKE_STRING(c,s)   do {   \

-       unsigned long l;                \
-       l=(c)->h0; HOST_l2c(l,(s));     \
-       l=(c)->h1; HOST_l2c(l,(s));     \
-       l=(c)->h2; HOST_l2c(l,(s));     \
-       l=(c)->h3; HOST_l2c(l,(s));     \
-       l=(c)->h4; HOST_l2c(l,(s));     \
+       unsigned long ll;               \
+       ll=(c)->h0; HOST_l2c(ll,(s));   \
+       ll=(c)->h1; HOST_l2c(ll,(s));   \
+       ll=(c)->h2; HOST_l2c(ll,(s));   \
+       ll=(c)->h3; HOST_l2c(ll,(s));   \
+       ll=(c)->h4; HOST_l2c(ll,(s));   \

        } while (0)
 
 #if defined(SHA_0)
        } while (0)
 
 #if defined(SHA_0)


@@ -92,8 +92,8 @@
 # define HASH_BLOCK_DATA_ORDER         sha_block_data_order
 # define Xupdate(a,ix,ia,ib,ic,id)     (ix=(a)=(ia^ib^ic^id))
 
 # define HASH_BLOCK_DATA_ORDER         sha_block_data_order
 # define Xupdate(a,ix,ia,ib,ic,id)     (ix=(a)=(ia^ib^ic^id))
 

-  void sha_block_host_order (SHA_CTX *c, const void *p,int num);
-  void sha_block_data_order (SHA_CTX *c, const void *p,int num);
+  void sha_block_host_order (SHA_CTX *c, const void *p,size_t num);
+  void sha_block_data_order (SHA_CTX *c, const void *p,size_t num);

 
 #elif defined(SHA_1)
 
 
 #elif defined(SHA_1)
 


@@ -103,31 +103,41 @@
 # define HASH_INIT                     SHA1_Init
 # define HASH_BLOCK_HOST_ORDER         sha1_block_host_order
 # define HASH_BLOCK_DATA_ORDER         sha1_block_data_order
 # define HASH_INIT                     SHA1_Init
 # define HASH_BLOCK_HOST_ORDER         sha1_block_host_order
 # define HASH_BLOCK_DATA_ORDER         sha1_block_data_order

-# define Xupdate(a,ix,ia,ib,ic,id)     ( (a)=(ia^ib^ic^id),    \
+# if defined(__MWERKS__) && defined(__MC68K__)
+   /* Metrowerks for Motorola fails otherwise:-( <appro@fy.chalmers.se> */
+#  define Xupdate(a,ix,ia,ib,ic,id)    do { (a)=(ia^ib^ic^id);         \
+                                            ix=(a)=ROTATE((a),1);      \
+                                       } while (0)
+# else
+#  define Xupdate(a,ix,ia,ib,ic,id)    ( (a)=(ia^ib^ic^id),    \

                                          ix=(a)=ROTATE((a),1)  \
                                        )
                                          ix=(a)=ROTATE((a),1)  \
                                        )

+# endif

 
 # ifdef SHA1_ASM
 
 # ifdef SHA1_ASM

-#  if defined(__i386) || defined(_M_IX86) || defined(__INTEL__)
+#  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 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
 #  endif
 # endif

-  void sha1_block_host_order (SHA_CTX *c, const void *p,int num);
-  void sha1_block_data_order (SHA_CTX *c, const void *p,int num);
+  void sha1_block_host_order (SHA_CTX *c, const void *p,size_t num);
+  void sha1_block_data_order (SHA_CTX *c, const void *p,size_t num);

 
 #else
 # error "Either SHA_0 or SHA_1 must be defined."
 #endif
 
 
 #else
 # error "Either SHA_0 or SHA_1 must be defined."
 #endif
 

-#ifndef FLAT_INC
-#include "../md32_common.h"
-#else

 #include "md32_common.h"
 #include "md32_common.h"

-#endif

 
 #define INIT_DATA_h0 0x67452301UL
 #define INIT_DATA_h1 0xefcdab89UL
 
 #define INIT_DATA_h0 0x67452301UL
 #define INIT_DATA_h1 0xefcdab89UL


@@ -135,7 +145,7 @@
 #define INIT_DATA_h3 0x10325476UL
 #define INIT_DATA_h4 0xc3d2e1f0UL
 
 #define INIT_DATA_h3 0x10325476UL
 #define INIT_DATA_h4 0xc3d2e1f0UL
 

-void HASH_INIT (SHA_CTX *c)
+int HASH_INIT (SHA_CTX *c)

        {
        c->h0=INIT_DATA_h0;
        c->h1=INIT_DATA_h1;
        {
        c->h0=INIT_DATA_h0;
        c->h1=INIT_DATA_h1;


@@ -145,6 +155,7 @@ void HASH_INIT (SHA_CTX *c)
        c->Nl=0;
        c->Nh=0;
        c->num=0;
        c->Nl=0;
        c->Nh=0;
        c->num=0;

+       return 1;

        }
 
 #define K_00_19        0x5a827999UL
        }
 
 #define K_00_19        0x5a827999UL


@@ -164,6 +175,8 @@ void HASH_INIT (SHA_CTX *c)
 #define F_40_59(b,c,d) (((b) & (c)) | (((b)|(c)) & (d))) 
 #define        F_60_79(b,c,d)  F_20_39(b,c,d)
 
 #define F_40_59(b,c,d) (((b) & (c)) | (((b)|(c)) & (d))) 
 #define        F_60_79(b,c,d)  F_20_39(b,c,d)
 

+#ifndef OPENSSL_SMALL_FOOTPRINT
+

 #define BODY_00_15(i,a,b,c,d,e,f,xi) \
        (f)=xi+(e)+K_00_19+ROTATE((a),5)+F_00_19((b),(c),(d)); \
        (b)=ROTATE((b),30);
 #define BODY_00_15(i,a,b,c,d,e,f,xi) \
        (f)=xi+(e)+K_00_19+ROTATE((a),5)+F_00_19((b),(c),(d)); \
        (b)=ROTATE((b),30);


@@ -193,18 +206,39 @@ void HASH_INIT (SHA_CTX *c)
        (f)=xa+(e)+K_60_79+ROTATE((a),5)+F_60_79((b),(c),(d)); \
        (b)=ROTATE((b),30);
 
        (f)=xa+(e)+K_60_79+ROTATE((a),5)+F_60_79((b),(c),(d)); \
        (b)=ROTATE((b),30);
 

+#ifdef X
+#undef X
+#endif
+#ifndef MD32_XARRAY
+  /*
+   * Originally X was an array. As it's automatic it's natural
+   * to expect RISC compiler to accomodate at least part of it in
+   * the register bank, isn't it? Unfortunately not all compilers
+   * "find" this expectation reasonable:-( On order to make such
+   * compilers generate better code I replace X[] with a bunch of
+   * X0, X1, etc. See the function body below...
+   *                                   <appro@fy.chalmers.se>
+   */
+# define X(i)  XX##i
+#else
+  /*
+   * However! Some compilers (most notably HP C) get overwhelmed by
+   * that many local variables so that we have to have the way to
+   * fall down to the original behavior.
+   */
+# define X(i)  XX[i]
+#endif
+

 #ifndef DONT_IMPLEMENT_BLOCK_HOST_ORDER
 #ifndef DONT_IMPLEMENT_BLOCK_HOST_ORDER

-void HASH_BLOCK_HOST_ORDER (SHA_CTX *c, const void *d, int num)
+void HASH_BLOCK_HOST_ORDER (SHA_CTX *c, const void *d, size_t num)

        {
        const SHA_LONG *W=d;
        {
        const SHA_LONG *W=d;

-       register unsigned long A,B,C,D,E,T;
-#ifdef SHA_XARRAY
-       SHA_LONG        X[16];
-# define X(i) X[(i)]
+       register unsigned MD32_REG_T A,B,C,D,E,T;
+#ifndef MD32_XARRAY
+       unsigned MD32_REG_T     XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
+                               XX8, XX9,XX10,XX11,XX12,XX13,XX14,XX15;

 #else
 #else

-       unsigned long    X0, X1, X2, X3, X4, X5, X6, X7,
-                        X8, X9,X10,X11,X12,X13,X14,X15;
-# define X(i) X##i
+       SHA_LONG        XX[16];

 #endif
 
        A=c->h0;
 #endif
 
        A=c->h0;


@@ -307,7 +341,7 @@ void HASH_BLOCK_HOST_ORDER (SHA_CTX *c, const void *d, int num)
        c->h3=(c->h3+B)&0xffffffffL;
        c->h4=(c->h4+C)&0xffffffffL;
 
        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;
 
        A=c->h0;
        B=c->h1;


@@ -321,17 +355,15 @@ void HASH_BLOCK_HOST_ORDER (SHA_CTX *c, const void *d, int num)
 #endif
 
 #ifndef DONT_IMPLEMENT_BLOCK_DATA_ORDER
 #endif
 
 #ifndef DONT_IMPLEMENT_BLOCK_DATA_ORDER

-void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, int num)
+void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num)

        {
        const unsigned char *data=p;
        {
        const unsigned char *data=p;

-       register unsigned long A,B,C,D,E,T,l;
-#ifdef SHA_XARRAY
-       SHA_LONG        X[16];
-# define X(i) X[(i)]
+       register unsigned MD32_REG_T A,B,C,D,E,T,l;
+#ifndef MD32_XARRAY
+       unsigned MD32_REG_T     XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
+                               XX8, XX9,XX10,XX11,XX12,XX13,XX14,XX15;

 #else
 #else

-       unsigned long    X0, X1, X2, X3, X4, X5, X6, X7,
-                        X8, X9,X10,X11,X12,X13,X14,X15;
-# define X(i) X##i
+       SHA_LONG        XX[16];

 #endif
 
        A=c->h0;
 #endif
 
        A=c->h0;


@@ -436,7 +468,129 @@ void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, int num)
        c->h3=(c->h3+B)&0xffffffffL;
        c->h4=(c->h4+C)&0xffffffffL;
 
        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;
+       C=c->h2;
+       D=c->h3;
+       E=c->h4;
+
+               }
+       }
+#endif
+
+#else  /* OPENSSL_SMALL_FOOTPRINT */
+
+#define BODY_00_15(xi)          do {   \
+       T=E+K_00_19+F_00_19(B,C,D);     \
+       E=D, D=C, C=ROTATE(B,30), B=A;  \
+       A=ROTATE(A,5)+T+xi;         } while(0)
+
+#define BODY_16_19(xa,xb,xc,xd)         do {   \
+       Xupdate(T,xa,xa,xb,xc,xd);      \
+       T+=E+K_00_19+F_00_19(B,C,D);    \
+       E=D, D=C, C=ROTATE(B,30), B=A;  \
+       A=ROTATE(A,5)+T;            } while(0)
+
+#define BODY_20_39(xa,xb,xc,xd)         do {   \
+       Xupdate(T,xa,xa,xb,xc,xd);      \
+       T+=E+K_20_39+F_20_39(B,C,D);    \
+       E=D, D=C, C=ROTATE(B,30), B=A;  \
+       A=ROTATE(A,5)+T;            } while(0)
+
+#define BODY_40_59(xa,xb,xc,xd)         do {   \
+       Xupdate(T,xa,xa,xb,xc,xd);      \
+       T+=E+K_40_59+F_40_59(B,C,D);    \
+       E=D, D=C, C=ROTATE(B,30), B=A;  \
+       A=ROTATE(A,5)+T;            } while(0)
+
+#define BODY_60_79(xa,xb,xc,xd)         do {   \
+       Xupdate(T,xa,xa,xb,xc,xd);      \
+       T=E+K_60_79+F_60_79(B,C,D);     \
+       E=D, D=C, C=ROTATE(B,30), B=A;  \
+       A=ROTATE(A,5)+T+xa;         } while(0)
+
+#ifndef DONT_IMPLEMENT_BLOCK_HOST_ORDER
+void HASH_BLOCK_HOST_ORDER (SHA_CTX *c, const void *d, size_t num)
+       {
+       const SHA_LONG *W=d;
+       register unsigned MD32_REG_T A,B,C,D,E,T;
+       int i;
+       SHA_LONG        X[16];
+
+       A=c->h0;
+       B=c->h1;
+       C=c->h2;
+       D=c->h3;
+       E=c->h4;
+
+       for (;;)
+               {
+       for (i=0;i<16;i++)
+       { X[i]=W[i]; BODY_00_15(X[i]); }
+       for (i=0;i<4;i++)
+       { BODY_16_19(X[i],       X[i+2],      X[i+8],     X[(i+13)&15]); }
+       for (;i<24;i++)
+       { BODY_20_39(X[i&15],    X[(i+2)&15], X[(i+8)&15],X[(i+13)&15]); }
+       for (i=0;i<20;i++)
+       { BODY_40_59(X[(i+8)&15],X[(i+10)&15],X[i&15],    X[(i+5)&15]);  }
+       for (i=4;i<24;i++)
+       { BODY_60_79(X[(i+8)&15],X[(i+10)&15],X[i&15],    X[(i+5)&15]);  }
+       
+       c->h0=(c->h0+A)&0xffffffffL; 
+       c->h1=(c->h1+B)&0xffffffffL;
+       c->h2=(c->h2+C)&0xffffffffL;
+       c->h3=(c->h3+D)&0xffffffffL;
+       c->h4=(c->h4+E)&0xffffffffL;
+
+       if (--num == 0) break;
+
+       A=c->h0;
+       B=c->h1;
+       C=c->h2;
+       D=c->h3;
+       E=c->h4;
+
+       W+=SHA_LBLOCK;
+               }
+       }
+#endif
+
+#ifndef DONT_IMPLEMENT_BLOCK_DATA_ORDER
+void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num)
+       {
+       const unsigned char *data=p;
+       register unsigned MD32_REG_T A,B,C,D,E,T,l;
+       int i;
+       SHA_LONG        X[16];
+
+       A=c->h0;
+       B=c->h1;
+       C=c->h2;
+       D=c->h3;
+       E=c->h4;
+
+       for (;;)
+               {
+       for (i=0;i<16;i++)
+       { HOST_c2l(data,l); X[i]=l; BODY_00_15(X[i]); }
+       for (i=0;i<4;i++)
+       { BODY_16_19(X[i],       X[i+2],      X[i+8],     X[(i+13)&15]); }
+       for (;i<24;i++)
+       { BODY_20_39(X[i&15],    X[(i+2)&15], X[(i+8)&15],X[(i+13)&15]); }
+       for (i=0;i<20;i++)
+       { BODY_40_59(X[(i+8)&15],X[(i+10)&15],X[i&15],    X[(i+5)&15]);  }
+       for (i=4;i<24;i++)
+       { BODY_60_79(X[(i+8)&15],X[(i+10)&15],X[i&15],    X[(i+5)&15]);  }
+
+       c->h0=(c->h0+A)&0xffffffffL; 
+       c->h1=(c->h1+B)&0xffffffffL;
+       c->h2=(c->h2+C)&0xffffffffL;
+       c->h3=(c->h3+D)&0xffffffffL;
+       c->h4=(c->h4+E)&0xffffffffL;
+
+       if (--num == 0) break;

 
        A=c->h0;
        B=c->h1;
 
        A=c->h0;
        B=c->h1;


@@ -447,3 +601,5 @@ void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, int num)
                }
        }
 #endif
                }
        }
 #endif

+
+#endif