summaryrefslogtreecommitdiff
path: root/app/openssl
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-01-12 19:18:54 +0100
committerParménides GV <parmegv@sdf.org>2015-01-12 19:18:54 +0100
commit32998b046977da5d272a948ad0668bf653d598f4 (patch)
treea8f68d5b09d7293ceb35211d2f26f48d4312fcf3 /app/openssl
parent1d37f94a7980d1181a49863cb3880bc7938cc6d1 (diff)
parent6ed3fde3ea171700390552dd1040e10e8cc1ca32 (diff)
Merge branch 'bug/Release-ConfigurationWizard-differs-from-debug's-#6633' into bug/ButterKnife-doesn't-find-provider_list_view-#6581
Diffstat (limited to 'app/openssl')
-rw-r--r--app/openssl/Crypto-config-host.mk1
-rw-r--r--app/openssl/Crypto-config-target.mk1
2 files changed, 0 insertions, 2 deletions
diff --git a/app/openssl/Crypto-config-host.mk b/app/openssl/Crypto-config-host.mk
index 1e94f10b..61df350e 100644
--- a/app/openssl/Crypto-config-host.mk
+++ b/app/openssl/Crypto-config-host.mk
@@ -184,7 +184,6 @@ 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 \
diff --git a/app/openssl/Crypto-config-target.mk b/app/openssl/Crypto-config-target.mk
index 43de9567..17fe4bf5 100644
--- a/app/openssl/Crypto-config-target.mk
+++ b/app/openssl/Crypto-config-target.mk
@@ -184,7 +184,6 @@ 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 \