summaryrefslogtreecommitdiff
path: root/main/openssl/Crypto-config-host.mk
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-11-14 09:52:32 +0100
committerArne Schwabe <arne@rfc2549.org>2014-11-14 09:52:32 +0100
commitb28828796ad6d65ac463b41bba153f74e4531a6b (patch)
tree154b9f7436ae575e324f3374a5145e451bf649a8 /main/openssl/Crypto-config-host.mk
parente7a6c1a987ebee1ddb2f908ca028d613a5c52490 (diff)
Update OpenSSL version
Diffstat (limited to 'main/openssl/Crypto-config-host.mk')
-rw-r--r--main/openssl/Crypto-config-host.mk15
1 files changed, 14 insertions, 1 deletions
diff --git a/main/openssl/Crypto-config-host.mk b/main/openssl/Crypto-config-host.mk
index 5b643792..1e94f10b 100644
--- a/main/openssl/Crypto-config-host.mk
+++ b/main/openssl/Crypto-config-host.mk
@@ -1,6 +1,6 @@
# Auto-generated - DO NOT EDIT!
# To regenerate, edit openssl.config, then run:
-# ./import_openssl.sh import /path/to/openssl-1.0.1h.tar.gz
+# ./import_openssl.sh import /path/to/openssl-1.0.1j.tar.gz
#
# This script will append to the following variables:
#
@@ -184,6 +184,7 @@ common_src_files := \
crypto/conf/conf_mall.c \
crypto/conf/conf_mod.c \
crypto/conf/conf_sap.c \
+ crypto/constant_time_locl.h \
crypto/cpt_err.c \
crypto/cryptlib.c \
crypto/cversion.c \
@@ -540,6 +541,9 @@ common_c_includes := \
external/openssl/include \
external/openssl/include/openssl \
+arm_clang_asflags := \
+ -no-integrated-as \
+
arm_cflags := \
-DAES_ASM \
-DBSAES_ASM \
@@ -570,6 +574,9 @@ arm_exclude_files := \
crypto/aes/aes_core.c \
crypto/mem_clr.c \
+arm64_clang_asflags := \
+ -no-integrated-as \
+
arm64_cflags := \
-DDES_UNROLL \
-DOPENSSL_CPUID_OBJ \
@@ -588,6 +595,8 @@ arm64_src_files := \
arm64_exclude_files :=
+x86_clang_asflags :=
+
x86_cflags := \
-DAES_ASM \
-DDES_PTR \
@@ -634,6 +643,8 @@ x86_exclude_files := \
crypto/des/fcrypt_b.c \
crypto/mem_clr.c \
+x86_64_clang_asflags :=
+
x86_64_cflags := \
-DAES_ASM \
-DBSAES_ASM \
@@ -678,6 +689,8 @@ x86_64_exclude_files := \
crypto/rc4/rc4_enc.c \
crypto/rc4/rc4_skey.c \
+mips_clang_asflags :=
+
mips_cflags := \
-DAES_ASM \
-DOPENSSL_BN_ASM_MONT \