Commit 1110cea0 authored by Richard Levitte's avatar Richard Levitte
Browse files

Update for Stratus VOS. 

PR: 1130
parent 0ed64ce3

crypto/md32_common.h

+5 −3
Original line number Diff line number Diff line
@@ -344,10 +344,12 @@ 
#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)



#if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)

# ifndef B_ENDIAN

   /* See comment in DATA_ORDER_IS_BIG_ENDIAN section. */

#  define HOST_c2l(c,l)	((l)=*((const unsigned int *)(c)), (c)+=4, l)

#  define HOST_l2c(l,c)	(*((unsigned int *)(c))=(l), (c)+=4, l)

# endif

#endif



#ifndef HOST_c2l

#define HOST_c2l(c,l)	(l =(((unsigned long)(*((c)++)))    ),		\

crypto/md4/md4_locl.h

+3 −1
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ void md4_block_host_order (MD4_CTX *c, const void *p,size_t num); 
void md4_block_data_order (MD4_CTX *c, const void *p,size_t num);



#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)

# if !defined(B_ENDIAN)

/*

 * *_block_host_order is expected to handle aligned data while

 * *_block_data_order - unaligned. As algorithm and host (x86)
@@ -92,6 +93,7 @@ void md4_block_data_order (MD4_CTX *c, const void *p,size_t num); 
 */

# define md4_block_data_order md4_block_host_order

# endif

#endif



#define DATA_ORDER_IS_LITTLE_ENDIAN

crypto/md5/md5_locl.h

+6 −2
Original line number Diff line number Diff line
@@ -67,7 +67,9 @@ 


#ifdef MD5_ASM

# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || defined(__x86_64) || defined(__x86_64__)

#  if !defined(B_ENDIAN)

#   define md5_block_host_order md5_block_asm_host_order

#  endif

# elif defined(__sparc) && defined(OPENSSL_SYS_ULTRASPARC)

   void md5_block_asm_data_order_aligned (MD5_CTX *c, const MD5_LONG *p,size_t num);

#  define HASH_BLOCK_DATA_ORDER_ALIGNED md5_block_asm_data_order_aligned
@@ -78,6 +80,7 @@ void md5_block_host_order (MD5_CTX *c, const void *p,size_t num); 
void md5_block_data_order (MD5_CTX *c, const void *p,size_t num);



#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || defined(__x86_64) || defined(__x86_64__)

# if !defined(B_ENDIAN)

/*

 * *_block_host_order is expected to handle aligned data while

 * *_block_data_order - unaligned. As algorithm and host (x86)
@@ -101,6 +104,7 @@ void md5_block_data_order (MD5_CTX *c, const void *p,size_t num); 
 */

# define md5_block_data_order md5_block_host_order

# endif

#endif



#define DATA_ORDER_IS_LITTLE_ENDIAN

crypto/ripemd/rmd_locl.h

+6 −2
Original line number Diff line number Diff line
@@ -72,16 +72,20 @@ 
 */

#ifdef RMD160_ASM

# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)

#  if !defined(B_ENDIAN)

#   define ripemd160_block_host_order ripemd160_block_asm_host_order

#  endif

# endif

#endif



void ripemd160_block_host_order (RIPEMD160_CTX *c, const void *p,size_t num);

void ripemd160_block_data_order (RIPEMD160_CTX *c, const void *p,size_t num);



#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)

# if !defined(B_ENDIAN)

#  define ripemd160_block_data_order ripemd160_block_host_order

# endif

#endif



#define DATA_ORDER_IS_LITTLE_ENDIAN

crypto/sha/sha_locl.h

+13 −11
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
# endif



# ifdef SHA1_ASM

#  if !defined(B_ENDIAN)

#   if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)

#    define sha1_block_host_order		sha1_block_asm_host_order

#    define DONT_IMPLEMENT_BLOCK_HOST_ORDER
@@ -127,6 +128,7 @@ 
#    define sha1_block_data_order		sha1_block_asm_data_order

#    define DONT_IMPLEMENT_BLOCK_DATA_ORDER

#   endif

#  endif

# endif

  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);