4 files changed, 4 insertions, 40 deletions
diff --git a/src/lib/libcrypto/md32_common.h b/src/lib/libcrypto/md32_common.h
index 5276abfadc..3e02776d30 100644
--- a/src/lib/libcrypto/md32_common.h
+++ b/src/lib/libcrypto/md32_common.h
@@ -142,18 +142,7 @@
 */
 #undef ROTATE
 #ifndef PEDANTIC
-# if defined(_MSC_VER) || defined(__ICC)
+# if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-#  define ROTATE(a,n)   _lrotl(a,n)
-# elif defined(__MWERKS__)
-#  if defined(__POWERPC__)
-#   define ROTATE(a,n)  __rlwinm(a,n,0,31)
-#  elif defined(__MC68K__)
-/* Motorola specific tweak. <appro@fy.chalmers.se> */
-#   define ROTATE(a,n)  ( n<24 ? __rol(a,n) : __ror(a,32-n) )
-#  else
-#   define ROTATE(a,n)  __rol(a,n)
-#  endif
-# elif defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
  /*
   * Some GNU C inline assembler templates. Note that these are
   * rotates by *constant* number of bits! But that's exactly
diff --git a/src/lib/libcrypto/sha/sha_locl.h b/src/lib/libcrypto/sha/sha_locl.h
index d673255f78..6c6cd64282 100644
--- a/src/lib/libcrypto/sha/sha_locl.h
+++ b/src/lib/libcrypto/sha/sha_locl.h
@@ -94,16 +94,9 @@ static void sha_block_data_order (SHA_CTX *c, const void *p,size_t num);
 # define HASH_FINAL                     SHA1_Final
 # define HASH_INIT                      SHA1_Init
 # define HASH_BLOCK_DATA_ORDER          sha1_block_data_order
-# if defined(__MWERKS__) && defined(__MC68K__)
+# define Xupdate(a,ix,ia,ib,ic,id)      ( (a)=(ia^ib^ic^id),    \
-   /* 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)  \
                                        )
-# endif
 #ifndef SHA1_ASM
 static
diff --git a/src/lib/libssl/src/crypto/md32_common.h b/src/lib/libssl/src/crypto/md32_common.h
index 5276abfadc..3e02776d30 100644
--- a/src/lib/libssl/src/crypto/md32_common.h
+++ b/src/lib/libssl/src/crypto/md32_common.h
@@ -142,18 +142,7 @@
 */
 #undef ROTATE
 #ifndef PEDANTIC
-# if defined(_MSC_VER) || defined(__ICC)
+# if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-#  define ROTATE(a,n)   _lrotl(a,n)
-# elif defined(__MWERKS__)
-#  if defined(__POWERPC__)
-#   define ROTATE(a,n)  __rlwinm(a,n,0,31)
-#  elif defined(__MC68K__)
-/* Motorola specific tweak. <appro@fy.chalmers.se> */
-#   define ROTATE(a,n)  ( n<24 ? __rol(a,n) : __ror(a,32-n) )
-#  else
-#   define ROTATE(a,n)  __rol(a,n)
-#  endif
-# elif defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
  /*
   * Some GNU C inline assembler templates. Note that these are
   * rotates by *constant* number of bits! But that's exactly
diff --git a/src/lib/libssl/src/crypto/sha/sha_locl.h b/src/lib/libssl/src/crypto/sha/sha_locl.h
index d673255f78..6c6cd64282 100644
--- a/src/lib/libssl/src/crypto/sha/sha_locl.h
+++ b/src/lib/libssl/src/crypto/sha/sha_locl.h
@@ -94,16 +94,9 @@ static void sha_block_data_order (SHA_CTX *c, const void *p,size_t num);
 # define HASH_FINAL                     SHA1_Final
 # define HASH_INIT                      SHA1_Init
 # define HASH_BLOCK_DATA_ORDER          sha1_block_data_order
-# if defined(__MWERKS__) && defined(__MC68K__)
+# define Xupdate(a,ix,ia,ib,ic,id)      ( (a)=(ia^ib^ic^id),    \
-   /* 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)  \
                                        )
-# endif
 #ifndef SHA1_ASM
 static

diff --git a/src/lib/libcrypto/md32_common.h b/src/lib/libcrypto/md32_common.h index 5276abfadc..3e02776d30 100644 --- a/src/lib/libcrypto/md32_common.h +++ b/src/lib/libcrypto/md32_common.h
@@ -142,18 +142,7 @@
142	*/	142	*/
143	#undef ROTATE	143	#undef ROTATE
144	#ifndef PEDANTIC	144	#ifndef PEDANTIC
145	# if defined(_MSC_VER) \|\| defined(__ICC)	145	# if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
146	# define ROTATE(a,n) _lrotl(a,n)
147	# elif defined(__MWERKS__)
148	# if defined(__POWERPC__)
149	# define ROTATE(a,n) __rlwinm(a,n,0,31)
150	# elif defined(__MC68K__)
151	/* Motorola specific tweak. <appro@fy.chalmers.se> */
152	# define ROTATE(a,n) ( n<24 ? __rol(a,n) : __ror(a,32-n) )
153	# else
154	# define ROTATE(a,n) __rol(a,n)
155	# endif
156	# elif defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
157	/*	146	/*
158	* Some GNU C inline assembler templates. Note that these are	147	* Some GNU C inline assembler templates. Note that these are
159	* rotates by constant number of bits! But that's exactly	148	* rotates by constant number of bits! But that's exactly


diff --git a/src/lib/libcrypto/sha/sha_locl.h b/src/lib/libcrypto/sha/sha_locl.h index d673255f78..6c6cd64282 100644 --- a/src/lib/libcrypto/sha/sha_locl.h +++ b/src/lib/libcrypto/sha/sha_locl.h
@@ -94,16 +94,9 @@ static void sha_block_data_order (SHA_CTX c, const void p,size_t num);
94	# define HASH_FINAL SHA1_Final	94	# define HASH_FINAL SHA1_Final
95	# define HASH_INIT SHA1_Init	95	# define HASH_INIT SHA1_Init
96	# define HASH_BLOCK_DATA_ORDER sha1_block_data_order	96	# define HASH_BLOCK_DATA_ORDER sha1_block_data_order
97	# if defined(__MWERKS__) && defined(__MC68K__)	97	# define Xupdate(a,ix,ia,ib,ic,id) ( (a)=(ia^ib^ic^id), \
98	/* Metrowerks for Motorola fails otherwise:-( <appro@fy.chalmers.se> */
99	# define Xupdate(a,ix,ia,ib,ic,id) do { (a)=(ia^ib^ic^id); \
100	ix=(a)=ROTATE((a),1); \
101	} while (0)
102	# else
103	# define Xupdate(a,ix,ia,ib,ic,id) ( (a)=(ia^ib^ic^id), \
104	ix=(a)=ROTATE((a),1) \	98	ix=(a)=ROTATE((a),1) \
105	)	99	)
106	# endif
107		100
108	#ifndef SHA1_ASM	101	#ifndef SHA1_ASM
109	static	102	static


diff --git a/src/lib/libssl/src/crypto/md32_common.h b/src/lib/libssl/src/crypto/md32_common.h index 5276abfadc..3e02776d30 100644 --- a/src/lib/libssl/src/crypto/md32_common.h +++ b/src/lib/libssl/src/crypto/md32_common.h
@@ -142,18 +142,7 @@
142	*/	142	*/
143	#undef ROTATE	143	#undef ROTATE
144	#ifndef PEDANTIC	144	#ifndef PEDANTIC
145	# if defined(_MSC_VER) \|\| defined(__ICC)	145	# if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
146	# define ROTATE(a,n) _lrotl(a,n)
147	# elif defined(__MWERKS__)
148	# if defined(__POWERPC__)
149	# define ROTATE(a,n) __rlwinm(a,n,0,31)
150	# elif defined(__MC68K__)
151	/* Motorola specific tweak. <appro@fy.chalmers.se> */
152	# define ROTATE(a,n) ( n<24 ? __rol(a,n) : __ror(a,32-n) )
153	# else
154	# define ROTATE(a,n) __rol(a,n)
155	# endif
156	# elif defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
157	/*	146	/*
158	* Some GNU C inline assembler templates. Note that these are	147	* Some GNU C inline assembler templates. Note that these are
159	* rotates by constant number of bits! But that's exactly	148	* rotates by constant number of bits! But that's exactly


diff --git a/src/lib/libssl/src/crypto/sha/sha_locl.h b/src/lib/libssl/src/crypto/sha/sha_locl.h index d673255f78..6c6cd64282 100644 --- a/src/lib/libssl/src/crypto/sha/sha_locl.h +++ b/src/lib/libssl/src/crypto/sha/sha_locl.h
@@ -94,16 +94,9 @@ static void sha_block_data_order (SHA_CTX c, const void p,size_t num);
94	# define HASH_FINAL SHA1_Final	94	# define HASH_FINAL SHA1_Final
95	# define HASH_INIT SHA1_Init	95	# define HASH_INIT SHA1_Init
96	# define HASH_BLOCK_DATA_ORDER sha1_block_data_order	96	# define HASH_BLOCK_DATA_ORDER sha1_block_data_order
97	# if defined(__MWERKS__) && defined(__MC68K__)	97	# define Xupdate(a,ix,ia,ib,ic,id) ( (a)=(ia^ib^ic^id), \
98	/* Metrowerks for Motorola fails otherwise:-( <appro@fy.chalmers.se> */
99	# define Xupdate(a,ix,ia,ib,ic,id) do { (a)=(ia^ib^ic^id); \
100	ix=(a)=ROTATE((a),1); \
101	} while (0)
102	# else
103	# define Xupdate(a,ix,ia,ib,ic,id) ( (a)=(ia^ib^ic^id), \
104	ix=(a)=ROTATE((a),1) \	98	ix=(a)=ROTATE((a),1) \
105	)	99	)
106	# endif
107		100
108	#ifndef SHA1_ASM	101	#ifndef SHA1_ASM
109	static	102	static