From 6874df200c2655eb94d4949beaf20dd03d85854e Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 4 Dec 2014 10:21:38 +0100
Subject: Update OpenVPN to fix cipher null regression

--HG--
extra : rebase_source : 7e02f4734821d8e72fdb001355b2623c99e91fae
---
 main/openvpn/config-version.h             | 2 +-
 main/openvpn/distro/Makefile.am           | 2 ++
 main/openvpn/src/openvpn/crypto_backend.h | 6 ++----
 main/openvpn/tests/t_lpback.sh            | 3 +++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/main/openvpn/config-version.h b/main/openvpn/config-version.h
index d5ea5dff..a62a07ef 100644
--- a/main/openvpn/config-version.h
+++ b/main/openvpn/config-version.h
@@ -1,2 +1,2 @@
-#define CONFIGURE_GIT_REVISION "icsopenvpn_623-ac8bac5aff772eaa"
+#define CONFIGURE_GIT_REVISION "icsopenvpn_624-1c7808deeb82deb2"
 #define CONFIGURE_GIT_FLAGS ""
diff --git a/main/openvpn/distro/Makefile.am b/main/openvpn/distro/Makefile.am
index 2dd6a6ee..bd65b79b 100644
--- a/main/openvpn/distro/Makefile.am
+++ b/main/openvpn/distro/Makefile.am
@@ -13,3 +13,5 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/Makefile.in
 
 SUBDIRS = rpm
+
+EXTRA_DIST = systemd/openvpn-client@.service systemd/openvpn-server@.service
diff --git a/main/openvpn/src/openvpn/crypto_backend.h b/main/openvpn/src/openvpn/crypto_backend.h
index 87498785..4e45df00 100644
--- a/main/openvpn/src/openvpn/crypto_backend.h
+++ b/main/openvpn/src/openvpn/crypto_backend.h
@@ -237,8 +237,7 @@ int cipher_kt_mode (const cipher_kt_t *cipher_kt);
  *
  * @return		true iff the cipher is a CBC mode cipher.
  */
-bool cipher_kt_mode_cbc(const cipher_kt_t *cipher)
-  __attribute__((nonnull));
+bool cipher_kt_mode_cbc(const cipher_kt_t *cipher);
 
 /**
  * Check if the supplied cipher is a supported OFB or CFB mode cipher.
@@ -247,8 +246,7 @@ bool cipher_kt_mode_cbc(const cipher_kt_t *cipher)
  *
  * @return		true iff the cipher is a OFB or CFB mode cipher.
  */
-bool cipher_kt_mode_ofb_cfb(const cipher_kt_t *cipher)
-  __attribute__((nonnull));
+bool cipher_kt_mode_ofb_cfb(const cipher_kt_t *cipher);
 
 
 /**
diff --git a/main/openvpn/tests/t_lpback.sh b/main/openvpn/tests/t_lpback.sh
index 8f88ad92..d7792cd3 100755
--- a/main/openvpn/tests/t_lpback.sh
+++ b/main/openvpn/tests/t_lpback.sh
@@ -35,6 +35,9 @@ CIPHERS=$(${top_builddir}/src/openvpn/openvpn --show-ciphers | \
 # GD, 2014-07-06 do not test RC5-* either (fails on NetBSD w/o libcrypto_rc5)
 CIPHERS=$(echo "$CIPHERS" | egrep -v '^(DES-EDE3-CFB1|DES-CFB1|RC5-)' )
 
+# Also test cipher 'none'
+CIPHERS=${CIPHERS}$(printf "\nnone")
+
 "${top_builddir}/src/openvpn/openvpn" --genkey --secret key.$$
 set +e
 
-- 
cgit v1.2.3