提交 1110cea0 编写于 作者: R Richard Levitte

Update for Stratus VOS.

PR: 1130
上级 0ed64ce3
...@@ -344,9 +344,11 @@ ...@@ -344,9 +344,11 @@
#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN) #elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
#if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) #if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
# ifndef B_ENDIAN
/* See comment in DATA_ORDER_IS_BIG_ENDIAN section. */ /* See comment in DATA_ORDER_IS_BIG_ENDIAN section. */
# define HOST_c2l(c,l) ((l)=*((const unsigned int *)(c)), (c)+=4, l) # 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) # define HOST_l2c(l,c) (*((unsigned int *)(c))=(l), (c)+=4, l)
# endif
#endif #endif
#ifndef HOST_c2l #ifndef HOST_c2l
......
...@@ -69,6 +69,7 @@ void md4_block_host_order (MD4_CTX *c, const void *p,size_t num); ...@@ -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); 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(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)
# if !defined(B_ENDIAN)
/* /*
* *_block_host_order is expected to handle aligned data while * *_block_host_order is expected to handle aligned data while
* *_block_data_order - unaligned. As algorithm and host (x86) * *_block_data_order - unaligned. As algorithm and host (x86)
...@@ -90,7 +91,8 @@ void md4_block_data_order (MD4_CTX *c, const void *p,size_t num); ...@@ -90,7 +91,8 @@ void md4_block_data_order (MD4_CTX *c, const void *p,size_t num);
* *
* <appro@fy.chalmers.se> * <appro@fy.chalmers.se>
*/ */
#define md4_block_data_order md4_block_host_order # define md4_block_data_order md4_block_host_order
# endif
#endif #endif
#define DATA_ORDER_IS_LITTLE_ENDIAN #define DATA_ORDER_IS_LITTLE_ENDIAN
......
...@@ -67,7 +67,9 @@ ...@@ -67,7 +67,9 @@
#ifdef MD5_ASM #ifdef MD5_ASM
# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || defined(__x86_64) || defined(__x86_64__) # 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 # define md5_block_host_order md5_block_asm_host_order
# endif
# elif defined(__sparc) && defined(OPENSSL_SYS_ULTRASPARC) # elif defined(__sparc) && defined(OPENSSL_SYS_ULTRASPARC)
void md5_block_asm_data_order_aligned (MD5_CTX *c, const MD5_LONG *p,size_t num); 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 # 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); ...@@ -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); 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(__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_host_order is expected to handle aligned data while
* *_block_data_order - unaligned. As algorithm and host (x86) * *_block_data_order - unaligned. As algorithm and host (x86)
...@@ -99,7 +102,8 @@ void md5_block_data_order (MD5_CTX *c, const void *p,size_t num); ...@@ -99,7 +102,8 @@ void md5_block_data_order (MD5_CTX *c, const void *p,size_t num);
* *
* <appro@fy.chalmers.se> * <appro@fy.chalmers.se>
*/ */
#define md5_block_data_order md5_block_host_order # define md5_block_data_order md5_block_host_order
# endif
#endif #endif
#define DATA_ORDER_IS_LITTLE_ENDIAN #define DATA_ORDER_IS_LITTLE_ENDIAN
......
...@@ -72,15 +72,19 @@ ...@@ -72,15 +72,19 @@
*/ */
#ifdef RMD160_ASM #ifdef RMD160_ASM
# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) # if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)
# if !defined(B_ENDIAN)
# define ripemd160_block_host_order ripemd160_block_asm_host_order # define ripemd160_block_host_order ripemd160_block_asm_host_order
# endif # endif
# endif
#endif #endif
void ripemd160_block_host_order (RIPEMD160_CTX *c, const void *p,size_t num); 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); 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(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)
#define ripemd160_block_data_order ripemd160_block_host_order # if !defined(B_ENDIAN)
# define ripemd160_block_data_order ripemd160_block_host_order
# endif
#endif #endif
#define DATA_ORDER_IS_LITTLE_ENDIAN #define DATA_ORDER_IS_LITTLE_ENDIAN
......
...@@ -115,6 +115,7 @@ ...@@ -115,6 +115,7 @@
# endif # endif
# ifdef SHA1_ASM # ifdef SHA1_ASM
# if !defined(B_ENDIAN)
# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) # if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)
# define sha1_block_host_order sha1_block_asm_host_order # define sha1_block_host_order sha1_block_asm_host_order
# define DONT_IMPLEMENT_BLOCK_HOST_ORDER # define DONT_IMPLEMENT_BLOCK_HOST_ORDER
...@@ -127,6 +128,7 @@ ...@@ -127,6 +128,7 @@
# define sha1_block_data_order sha1_block_asm_data_order # define sha1_block_data_order sha1_block_asm_data_order
# define DONT_IMPLEMENT_BLOCK_DATA_ORDER # define DONT_IMPLEMENT_BLOCK_DATA_ORDER
# endif # endif
# endif
# endif # endif
void sha1_block_host_order (SHA_CTX *c, const void *p,size_t 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); void sha1_block_data_order (SHA_CTX *c, const void *p,size_t num);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册