summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-11-20 00:20:49 +0100
committerArne Schwabe <arne@rfc2549.org>2014-11-20 00:20:49 +0100
commit74047bc3a97fb10c9210f9bc400cd0a6fd875253 (patch)
tree7565e0765f32010ca6e757e34558a5ac008c460c
parent107833579cf8e74514b4a9e120549faeef8a8f60 (diff)
Fix build script warnings in OpenSSL
--HG-- extra : rebase_source : c94b2100287e67e59c5f741a9c12008f90a1b394
-rw-r--r--main/openssl/Crypto-config-host.mk1
-rw-r--r--main/openssl/Crypto-config-target.mk1
-rw-r--r--main/openvpn/config-version.h4
3 files changed, 2 insertions, 4 deletions
diff --git a/main/openssl/Crypto-config-host.mk b/main/openssl/Crypto-config-host.mk
index 1e94f10b..61df350e 100644
--- a/main/openssl/Crypto-config-host.mk
+++ b/main/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/main/openssl/Crypto-config-target.mk b/main/openssl/Crypto-config-target.mk
index 43de9567..17fe4bf5 100644
--- a/main/openssl/Crypto-config-target.mk
+++ b/main/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 \
diff --git a/main/openvpn/config-version.h b/main/openvpn/config-version.h
index 1fca2b7a..f158d3de 100644
--- a/main/openvpn/config-version.h
+++ b/main/openvpn/config-version.h
@@ -1,2 +1,2 @@
-#define CONFIGURE_GIT_REVISION "icsopenvpn_621-b603913ee5d54ab8"
-#define CONFIGURE_GIT_FLAGS ""
+#define CONFIGURE_GIT_REVISION "icsopenvpn_620-6cac58f2a5a44e94"
+#define CONFIGURE_GIT_FLAGS "+"