[openssl-commits] [openssl] master update
Andy Polyakov
appro at openssl.org
Mon May 2 11:46:30 UTC 2016
The branch master has been updated
via cba792a1e941788cba7dc700a2ef59420e7f2522 (commit)
via b1a07c38540105077878ad80a6a87c96fdbc18f1 (commit)
via 8e9f1bb99e035e30450c85595150408dc1ac3d82 (commit)
from 24c2cd3967ed23acc0bd31a3781c4525e2e42a2c (commit)
- Log -----------------------------------------------------------------
commit cba792a1e941788cba7dc700a2ef59420e7f2522
Author: Andy Polyakov <appro at openssl.org>
Date: Sun May 1 13:35:31 2016 +0200
Android build fixes.
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit b1a07c38540105077878ad80a6a87c96fdbc18f1
Author: Andy Polyakov <appro at openssl.org>
Date: Sun May 1 14:14:34 2016 +0200
Remove obsolete defined(__INTEL__) condition.
This macro was defined by no-longer-supported __MWERKS__ compiler.
Reviewed-by: Richard Levitte <levitte at openssl.org>
commit 8e9f1bb99e035e30450c85595150408dc1ac3d82
Author: Andy Polyakov <appro at openssl.org>
Date: Sun May 1 14:09:15 2016 +0200
chacha/asm/chacha-x86.pl: make it compile on legacy systems.
Usage of $ymm variable is a bit misleading here, it doesn't refer
to %ymm register bank, but rather to VEX instruction encoding,
which AMD XOP code path depends on.
Reviewed-by: Richard Levitte <levitte at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 16 +++++-----------
Configurations/unix-Makefile.tmpl | 2 +-
crypto/async/arch/async_posix.h | 2 +-
crypto/chacha/asm/chacha-x86.pl | 4 +++-
crypto/cryptlib.c | 1 -
crypto/evp/e_aes.c | 3 +--
crypto/evp/e_aes_cbc_hmac_sha1.c | 3 +--
crypto/evp/e_aes_cbc_hmac_sha256.c | 3 +--
crypto/evp/e_rc4_hmac_md5.c | 3 +--
crypto/md5/md5_locl.h | 2 +-
crypto/ripemd/rmd_locl.h | 2 +-
engines/e_padlock.c | 3 +--
ssl/record/rec_layer_s3.c | 3 +--
13 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 9d3f3ff..601dbe5 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -896,17 +896,14 @@ sub vms_info {
# Special note about unconditional -fPIC and -pie. The underlying
# reason is that Lollipop refuses to run non-PIE. But what about
# older systems and NDKs? -fPIC was never problem, so the only
- # concern if -pie. Older toolchains, e.g. r4, appear to handle it
+ # concern is -pie. Older toolchains, e.g. r4, appear to handle it
# and binaries turn mostly functional. "Mostly" means that oldest
# Androids, such as Froyo, fail to handle executable, but newer
# systems are perfectly capable of executing binaries targeting
# Froyo. Keep in mind that in the nutshell Android builds are
# about JNI, i.e. shared libraries, not applications.
- cflags => picker(default => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall",
- debug => "-O0 -g",
- release => "-O3"),
- lflags => "-pie",
- shared_cflag => "",
+ cflags => add(picker(default => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack")),
+ bin_cflags => "-pie",
},
"android-x86" => {
inherit_from => [ "android", asm("x86_asm") ],
@@ -945,11 +942,8 @@ sub vms_info {
"android64" => {
inherit_from => [ "linux-generic64" ],
- cflags => picker(default => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall",
- debug => "-O0 -g",
- release => "-O3"),
- lflags => "-pie",
- shared_cflag => "",
+ cflags => add(picker(default => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack")),
+ bin_cflags => "-pie",
},
"android64-aarch64" => {
inherit_from => [ "android64", asm("aarch64_asm") ],
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 164b533..974a978 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -172,7 +172,7 @@ LIB_LDFLAGS={- $target{shared_ldflag}." ".$config{shared_ldflag}
RCFLAGS={- $target{shared_rcflag} -}
DSO_CFLAGS={- $target{shared_cflag} || "" -}
DSO_LDFLAGS=$(LIB_LDFLAGS)
-BIN_CFLAGS={- "" -}
+BIN_CFLAGS={- $target{bin_cflags} -}
PERL={- $config{perl} -}
diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
index de80f95..1a611ba 100644
--- a/crypto/async/arch/async_posix.h
+++ b/crypto/async/arch/async_posix.h
@@ -53,7 +53,7 @@
#define OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H
#include <openssl/e_os2.h>
-#if (defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_CYGWIN)) && defined(OPENSSL_THREADS) && !defined(OPENSSL_NO_ASYNC)
+#if (defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_CYGWIN)) && defined(OPENSSL_THREADS) && !defined(OPENSSL_NO_ASYNC) && !defined(__ANDROID__)
# include <unistd.h>
diff --git a/crypto/chacha/asm/chacha-x86.pl b/crypto/chacha/asm/chacha-x86.pl
index 8b9696f..d18663b 100755
--- a/crypto/chacha/asm/chacha-x86.pl
+++ b/crypto/chacha/asm/chacha-x86.pl
@@ -437,8 +437,10 @@ my ($ap,$bp,$cp,$dp)=map(($_&~3)+(($_-1)&3),($ai,$bi,$ci,$di)); # previous
&function_begin("ChaCha20_ssse3");
&set_label("ssse3_shortcut");
+if ($ymm) {
&test (&DWP(4,"ebp"),1<<11); # test XOP bit
&jnz (&label("xop_shortcut"));
+}
&mov ($out,&wparam(0));
&mov ($inp,&wparam(1));
@@ -770,7 +772,7 @@ sub SSSE3ROUND { # critical path is 20 "SIMD ticks" per round
}
&asciz ("ChaCha20 for x86, CRYPTOGAMS by <appro\@openssl.org>");
-if ($xmm) {
+if ($ymm) {
my ($xa,$xa_,$xb,$xb_,$xc,$xc_,$xd,$xd_)=map("xmm$_",(0..7));
my ($out,$inp,$len)=("edi","esi","ecx");
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 7e1d780..aaa3fce 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 4d40efe..3f00f0f 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 4d8c973..394a380 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 075a8e8..956cd58 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 ded3090..52e27d5 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 f2d80a0..44c4783 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 c08178c..89e2fd3 100644
--- a/crypto/ripemd/rmd_locl.h
+++ b/crypto/ripemd/rmd_locl.h
@@ -66,7 +66,7 @@
* <appro at 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 dab6c44..844a78f 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 4a5907b..12df578 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
More information about the openssl-commits
mailing list