diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-05-01 14:14:34 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-05-02 12:35:01 +0200 |
| commit | b1a07c38540105077878ad80a6a87c96fdbc18f1 (patch) | |
| tree | 06e9a22266b2cb40edb7bf4b4b2c2c7ec2fdf018 | |
| parent | 8e9f1bb99e035e30450c85595150408dc1ac3d82 (diff) | |
Remove obsolete defined(__INTEL__) condition.
This macro was defined by no-longer-supported __MWERKS__ compiler.
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | crypto/cryptlib.c | 1 | ||||
| -rw-r--r-- | crypto/evp/e_aes.c | 3 | ||||
| -rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha1.c | 3 | ||||
| -rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha256.c | 3 | ||||
| -rw-r--r-- | crypto/evp/e_rc4_hmac_md5.c | 3 | ||||
| -rw-r--r-- | crypto/md5/md5_locl.h | 2 | ||||
| -rw-r--r-- | crypto/ripemd/rmd_locl.h | 2 | ||||
| -rw-r--r-- | engines/e_padlock.c | 3 | ||||
| -rw-r--r-- | ssl/record/rec_layer_s3.c | 3 |
9 files changed, 8 insertions, 15 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 7e1d780f6c..aaa3fce4fb 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -117,7 +117,6 @@ #include <openssl/safestack.h> #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ - defined(__INTEL__) || \ defined(__x86_64) || defined(__x86_64__) || \ defined(_M_AMD64) || defined(_M_X64) diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 4d40efe8d5..3f00f0fb88 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -202,8 +202,7 @@ void AES_xts_decrypt(const char *inp, char *out, size_t len, ((defined(__i386) || defined(__i386__) || \ defined(_M_IX86)) && defined(OPENSSL_IA32_SSE2))|| \ defined(__x86_64) || defined(__x86_64__) || \ - defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) ) + defined(_M_AMD64) || defined(_M_X64) ) extern unsigned int OPENSSL_ia32cap_P[]; diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c index 4d8c973c5f..394a380aa0 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha1.c +++ b/crypto/evp/e_aes_cbc_hmac_sha1.c @@ -90,8 +90,7 @@ typedef struct { #if defined(AES_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ - defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) ) + defined(_M_AMD64) || defined(_M_X64) ) extern unsigned int OPENSSL_ia32cap_P[]; # define AESNI_CAPABLE (1<<(57-32)) diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c index 075a8e8cf7..956cd58a05 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -91,8 +91,7 @@ typedef struct { #if defined(AES_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ - defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) ) + defined(_M_AMD64) || defined(_M_X64) ) extern unsigned int OPENSSL_ia32cap_P[]; # define AESNI_CAPABLE (1<<(57-32)) diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c index ded3090eb4..52e27d5f04 100644 --- a/crypto/evp/e_rc4_hmac_md5.c +++ b/crypto/evp/e_rc4_hmac_md5.c @@ -102,8 +102,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, # if !defined(OPENSSL_NO_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ - defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) ) + defined(_M_AMD64) || defined(_M_X64) ) # define STITCHED_CALL # endif diff --git a/crypto/md5/md5_locl.h b/crypto/md5/md5_locl.h index f2d80a035c..44c478302a 100644 --- a/crypto/md5/md5_locl.h +++ b/crypto/md5/md5_locl.h @@ -61,7 +61,7 @@ #include <openssl/md5.h> #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) # define md5_block_data_order md5_block_asm_data_order # elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64) diff --git a/crypto/ripemd/rmd_locl.h b/crypto/ripemd/rmd_locl.h index c08178c0eb..89e2fd35d8 100644 --- a/crypto/ripemd/rmd_locl.h +++ b/crypto/ripemd/rmd_locl.h @@ -66,7 +66,7 @@ * <appro@fy.chalmers.se> */ #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 # endif #endif diff --git a/engines/e_padlock.c b/engines/e_padlock.c index dab6c44b1e..844a78fc6d 100644 --- a/engines/e_padlock.c +++ b/engines/e_padlock.c @@ -99,8 +99,7 @@ # if !defined(I386_ONLY) && !defined(OPENSSL_NO_ASM) # if defined(__i386__) || defined(__i386) || \ defined(__x86_64__) || defined(__x86_64) || \ - defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) + defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) # define COMPILE_HW_PADLOCK # ifdef OPENSSL_NO_DYNAMIC_ENGINE static ENGINE *ENGINE_padlock(void); diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c index 4a5907b6f3..12df578be7 100644 --- a/ssl/record/rec_layer_s3.c +++ b/ssl/record/rec_layer_s3.c @@ -125,8 +125,7 @@ #if defined(OPENSSL_SMALL_FOOTPRINT) || \ !( defined(AES_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ - defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) ) \ + defined(_M_AMD64) || defined(_M_X64) ) ) # undef EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK # define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0 |