[prev in list] [next in list] [prev in thread] [next in thread]
List: openssl-cvs
Subject: [CVS] OpenSSL: openssl/crypto/ md32_common.h openssl/crypto/md4/ md4_l...
From: "Andy Polyakov" <appro () openssl ! org>
Date: 2005-10-25 15:55:07
Message-ID: 20051025155507.42DE51AC6545 () master ! openssl ! org
[Download RAW message or body]
OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________________________
Server: cvs.openssl.org Name: Andy Polyakov
Root: /v/openssl/cvs Email: appro@openssl.org
Module: openssl Date: 25-Oct-2005 17:55:07
Branch: HEAD Handle: 2005102516550501
Modified files:
openssl/crypto md32_common.h
openssl/crypto/md4 md4_locl.h
openssl/crypto/md5 md5_locl.h
openssl/crypto/ripemd rmd_locl.h
openssl/crypto/sha sha_locl.h
Log:
Eliminate false preprocessor dependencies introduced with VOS support.
Summary:
Revision Changes Path
1.37 +2 -0 openssl/crypto/md32_common.h
1.5 +2 -1 openssl/crypto/md4/md4_locl.h
1.23 +5 -5 openssl/crypto/md5/md5_locl.h
1.10 +3 -4 openssl/crypto/ripemd/rmd_locl.h
1.24 +5 -7 openssl/crypto/sha/sha_locl.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openssl/crypto/md32_common.h
============================================================================
$ cvs diff -u -r1.36 -r1.37 md32_common.h
--- openssl/crypto/md32_common.h 19 Sep 2005 13:12:00 -0000 1.36
+++ openssl/crypto/md32_common.h 25 Oct 2005 15:55:05 -0000 1.37
@@ -288,6 +288,7 @@
# if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && \
!defined(OPENSSL_NO_INLINE_ASM) # if ((defined(__i386) || defined(__i386__)) && \
!defined(I386_ONLY)) || \ (defined(__x86_64) || defined(__x86_64__))
+# if !defined(B_ENDIAN)
/*
* This gives ~30-40% performance improvement in SHA-256 compiled
* 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); \
asm ("bswapl %0":"=r"(r):"0"(r)); \
*((unsigned int *)(c))=r; (c)+=4; r; })
+# endif
# endif
# endif
#endif
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/md4/md4_locl.h
============================================================================
$ cvs diff -u -r1.4 -r1.5 md4_locl.h
--- openssl/crypto/md4/md4_locl.h 23 Jun 2005 21:27:19 -0000 1.4
+++ openssl/crypto/md4/md4_locl.h 25 Oct 2005 15:55:05 -0000 1.5
@@ -68,7 +68,8 @@
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(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) \
|| \ + defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
defined(_M_X64) # if !defined(B_ENDIAN)
/*
* *_block_host_order is expected to handle aligned data while
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/md5/md5_locl.h
============================================================================
$ cvs diff -u -r1.22 -r1.23 md5_locl.h
--- openssl/crypto/md5/md5_locl.h 19 Jul 2005 22:37:57 -0000 1.22
+++ openssl/crypto/md5/md5_locl.h 25 Oct 2005 15:55:06 -0000 1.23
@@ -66,10 +66,9 @@
#endif
#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
+# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
defined(__INTEL__) || \ + defined(__x86_64) || defined(__x86_64__) || \
defined(_M_AMD64) || defined(_M_X64) +# define md5_block_host_order \
md5_block_asm_host_order # 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
@@ -82,7 +81,8 @@
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(__i386) || \
defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || \ + \
defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) # \
if !defined(B_ENDIAN) /*
* *_block_host_order is expected to handle aligned data while
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/ripemd/rmd_locl.h
============================================================================
$ cvs diff -u -r1.9 -r1.10 rmd_locl.h
--- openssl/crypto/ripemd/rmd_locl.h 23 Jun 2005 21:27:21 -0000 1.9
+++ openssl/crypto/ripemd/rmd_locl.h 25 Oct 2005 15:55:06 -0000 1.10
@@ -72,16 +72,15 @@
*/
#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
+# define ripemd160_block_host_order ripemd160_block_asm_host_order
# 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(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) \
|| \ + defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
defined(_M_X64) # if !defined(B_ENDIAN)
# define ripemd160_block_data_order ripemd160_block_host_order
# endif
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/sha/sha_locl.h
============================================================================
$ cvs diff -u -r1.23 -r1.24 sha_locl.h
--- openssl/crypto/sha/sha_locl.h 19 Jul 2005 23:04:57 -0000 1.23
+++ openssl/crypto/sha/sha_locl.h 25 Oct 2005 15:55:06 -0000 1.24
@@ -116,13 +116,11 @@
# ifdef SHA1_ASM
# 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
+# 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
# elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
# define sha1_block_host_order sha1_block_asm_host_order
# define DONT_IMPLEMENT_BLOCK_HOST_ORDER
@@ .
______________________________________________________________________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List openssl-cvs@openssl.org
Automated List Manager majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic