generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Eliminate false preprocessor dependencies introduced with VOS support.

Browse Source
This commit is contained in:
Andy Polyakov 2005-10-25 15:55:06 +00:00
parent aa8b03b415
commit 6c1fc273f3
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/md32_common.h
View File

@ -288,6 +288,7 @@
# if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) # if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
# if ((defined(__i386) || defined(__i386__)) && !defined(I386_ONLY)) || \ # if ((defined(__i386) || defined(__i386__)) && !defined(I386_ONLY)) || \
(defined(__x86_64) || defined(__x86_64__)) (defined(__x86_64) || defined(__x86_64__))
# if !defined(B_ENDIAN)
/* /*
* This gives ~30-40% performance improvement in SHA-256 compiled * This gives ~30-40% performance improvement in SHA-256 compiled
* with gcc [on P4]. Well, first macro to be frank. We can pull * with gcc [on P4]. Well, first macro to be frank. We can pull
@ -300,6 +301,7 @@
# define HOST_l2c(l,c) ({ unsigned int r=(l); \ # define HOST_l2c(l,c) ({ unsigned int r=(l); \
asm ("bswapl %0":"=r"(r):"0"(r)); \ asm ("bswapl %0":"=r"(r):"0"(r)); \
*((unsigned int *)(c))=r; (c)+=4; r; }) *((unsigned int *)(c))=r; (c)+=4; r; })
# endif
# endif # endif
# endif # endif
#endif #endif

3
crypto/md4/md4_locl.h
View File

@ -68,7 +68,8 @@
void md4_block_host_order (MD4_CTX *c, const void *p,size_t num); 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__) || \
defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
# if !defined(B_ENDIAN) # if !defined(B_ENDIAN)
/* /*
* *_block_host_order is expected to handle aligned data while * *_block_host_order is expected to handle aligned data while

10
crypto/md5/md5_locl.h
View File

@ -66,10 +66,9 @@
#endif #endif
#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__) || \
# if !defined(B_ENDIAN) defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
# 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
@ -82,7 +81,8 @@
void md5_block_host_order (MD5_CTX *c, const void *p,size_t num); 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__) || defined(_M_AMD64) || defined(_M_X64)
# if !defined(B_ENDIAN) # if !defined(B_ENDIAN)
/* /*
* *_block_host_order is expected to handle aligned data while * *_block_host_order is expected to handle aligned data while

7
crypto/ripemd/rmd_locl.h
View File

@ -72,16 +72,15 @@
*/ */
#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__) || \
defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
# if !defined(B_ENDIAN) # if !defined(B_ENDIAN)
# define ripemd160_block_data_order ripemd160_block_host_order # define ripemd160_block_data_order ripemd160_block_host_order
# endif # endif

12
crypto/sha/sha_locl.h
View File

@ -116,13 +116,11 @@
# ifdef SHA1_ASM # ifdef SHA1_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 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 # 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 # define HASH_BLOCK_DATA_ORDER_ALIGNED sha1_block_asm_data_order
# define HASH_BLOCK_DATA_ORDER_ALIGNED sha1_block_asm_data_order
# endif
# elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64) # elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
# 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