提交 b1a07c38 编写于 作者: A Andy Polyakov

Remove obsolete defined(__INTEL__) condition.

This macro was defined by no-longer-supported __MWERKS__ compiler.
Reviewed-by: NRichard Levitte <levitte@openssl.org>
上级 8e9f1bb9
...@@ -117,7 +117,6 @@ ...@@ -117,7 +117,6 @@
#include <openssl/safestack.h> #include <openssl/safestack.h>
#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
defined(__INTEL__) || \
defined(__x86_64) || defined(__x86_64__) || \ defined(__x86_64) || defined(__x86_64__) || \
defined(_M_AMD64) || defined(_M_X64) defined(_M_AMD64) || defined(_M_X64)
......
...@@ -202,8 +202,7 @@ void AES_xts_decrypt(const char *inp, char *out, size_t len, ...@@ -202,8 +202,7 @@ void AES_xts_decrypt(const char *inp, char *out, size_t len,
((defined(__i386) || defined(__i386__) || \ ((defined(__i386) || defined(__i386__) || \
defined(_M_IX86)) && defined(OPENSSL_IA32_SSE2))|| \ defined(_M_IX86)) && defined(OPENSSL_IA32_SSE2))|| \
defined(__x86_64) || defined(__x86_64__) || \ defined(__x86_64) || defined(__x86_64__) || \
defined(_M_AMD64) || defined(_M_X64) || \ defined(_M_AMD64) || defined(_M_X64) )
defined(__INTEL__) )
extern unsigned int OPENSSL_ia32cap_P[]; extern unsigned int OPENSSL_ia32cap_P[];
......
...@@ -90,8 +90,7 @@ typedef struct { ...@@ -90,8 +90,7 @@ typedef struct {
#if defined(AES_ASM) && ( \ #if defined(AES_ASM) && ( \
defined(__x86_64) || defined(__x86_64__) || \ defined(__x86_64) || defined(__x86_64__) || \
defined(_M_AMD64) || defined(_M_X64) || \ defined(_M_AMD64) || defined(_M_X64) )
defined(__INTEL__) )
extern unsigned int OPENSSL_ia32cap_P[]; extern unsigned int OPENSSL_ia32cap_P[];
# define AESNI_CAPABLE (1<<(57-32)) # define AESNI_CAPABLE (1<<(57-32))
......
...@@ -91,8 +91,7 @@ typedef struct { ...@@ -91,8 +91,7 @@ typedef struct {
#if defined(AES_ASM) && ( \ #if defined(AES_ASM) && ( \
defined(__x86_64) || defined(__x86_64__) || \ defined(__x86_64) || defined(__x86_64__) || \
defined(_M_AMD64) || defined(_M_X64) || \ defined(_M_AMD64) || defined(_M_X64) )
defined(__INTEL__) )
extern unsigned int OPENSSL_ia32cap_P[]; extern unsigned int OPENSSL_ia32cap_P[];
# define AESNI_CAPABLE (1<<(57-32)) # define AESNI_CAPABLE (1<<(57-32))
......
...@@ -102,8 +102,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, ...@@ -102,8 +102,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
# if !defined(OPENSSL_NO_ASM) && ( \ # if !defined(OPENSSL_NO_ASM) && ( \
defined(__x86_64) || defined(__x86_64__) || \ defined(__x86_64) || defined(__x86_64__) || \
defined(_M_AMD64) || defined(_M_X64) || \ defined(_M_AMD64) || defined(_M_X64) )
defined(__INTEL__) )
# define STITCHED_CALL # define STITCHED_CALL
# endif # endif
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
#include <openssl/md5.h> #include <openssl/md5.h>
#ifdef MD5_ASM #ifdef MD5_ASM
# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || \ # if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
# define md5_block_data_order md5_block_asm_data_order # define md5_block_data_order md5_block_asm_data_order
# elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64) # elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
* <appro@fy.chalmers.se> * <appro@fy.chalmers.se>
*/ */
#ifdef RMD160_ASM #ifdef RMD160_ASM
# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) # if defined(__i386) || defined(__i386__) || defined(_M_IX86)
# define ripemd160_block_data_order ripemd160_block_asm_data_order # define ripemd160_block_data_order ripemd160_block_asm_data_order
# endif # endif
#endif #endif
......
...@@ -99,8 +99,7 @@ ...@@ -99,8 +99,7 @@
# if !defined(I386_ONLY) && !defined(OPENSSL_NO_ASM) # if !defined(I386_ONLY) && !defined(OPENSSL_NO_ASM)
# if defined(__i386__) || defined(__i386) || \ # if defined(__i386__) || defined(__i386) || \
defined(__x86_64__) || defined(__x86_64) || \ defined(__x86_64__) || defined(__x86_64) || \
defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || \ defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64)
defined(__INTEL__)
# define COMPILE_HW_PADLOCK # define COMPILE_HW_PADLOCK
# ifdef OPENSSL_NO_DYNAMIC_ENGINE # ifdef OPENSSL_NO_DYNAMIC_ENGINE
static ENGINE *ENGINE_padlock(void); static ENGINE *ENGINE_padlock(void);
......
...@@ -125,8 +125,7 @@ ...@@ -125,8 +125,7 @@
#if defined(OPENSSL_SMALL_FOOTPRINT) || \ #if defined(OPENSSL_SMALL_FOOTPRINT) || \
!( defined(AES_ASM) && ( \ !( defined(AES_ASM) && ( \
defined(__x86_64) || defined(__x86_64__) || \ defined(__x86_64) || defined(__x86_64__) || \
defined(_M_AMD64) || defined(_M_X64) || \ defined(_M_AMD64) || defined(_M_X64) )
defined(__INTEL__) ) \
) )
# undef EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK # undef EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
# define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0 # define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册