Merge tag 'upstream/2.3.5'

Upstream version 2.3.5

1 files changed, 389 insertions, 15 deletions

diff --git a/configure b/configure
index 8638bf2..cc8e3d2 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenVPN 2.3.4.
+# Generated by GNU Autoconf 2.69 for OpenVPN 2.3.5.
 #
 # Report bugs to <openvpn-users@lists.sourceforge.net>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='OpenVPN'
 PACKAGE_TARNAME='openvpn'
-PACKAGE_VERSION='2.3.4'
-PACKAGE_STRING='OpenVPN 2.3.4'
+PACKAGE_VERSION='2.3.5'
+PACKAGE_STRING='OpenVPN 2.3.5'
 PACKAGE_BUGREPORT='openvpn-users@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -650,6 +650,7 @@ PLUGIN_AUTH_PAM_LIBS
 PLUGIN_AUTH_PAM_CFLAGS
 OPTIONAL_PKCS11_HELPER_LIBS
 OPTIONAL_PKCS11_HELPER_CFLAGS
+OPTIONAL_SYSTEMD_LIBS
 OPTIONAL_LZO_LIBS
 OPTIONAL_LZO_CFLAGS
 OPTIONAL_CRYPTO_LIBS
@@ -659,6 +660,8 @@ OPTIONAL_DL_LIBS
 TAP_WIN_MIN_MINOR
 TAP_WIN_MIN_MAJOR
 TAP_WIN_COMPONENT_ID
+libsystemd_LIBS
+libsystemd_CFLAGS
 LZO_LIBS
 LZO_CFLAGS
 POLARSSL_LIBS
@@ -694,6 +697,7 @@ LIBTOOL
 OBJDUMP
 DLLTOOL
 AS
+SYSTEMD_ASK_PASSWORD
 GIT
 MAN2HTML
 NETSTAT
@@ -806,6 +810,7 @@ enable_dependency_tracking
 enable_lzo
 enable_lzo_stub
 enable_crypto
+enable_ofb_cfb
 enable_ssl
 enable_x509_alt_username
 enable_multi
@@ -862,6 +867,7 @@ IPROUTE
 NETSTAT
 MAN2HTML
 GIT
+SYSTEMD_ASK_PASSWORD
 TAP_CFLAGS
 LIBPAM_CFLAGS
 LIBPAM_LIBS
@@ -874,7 +880,9 @@ OPENSSL_SSL_LIBS
 POLARSSL_CFLAGS
 POLARSSL_LIBS
 LZO_CFLAGS
-LZO_LIBS'
+LZO_LIBS
+libsystemd_CFLAGS
+libsystemd_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1415,7 +1423,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenVPN 2.3.4 to adapt to many kinds of systems.
+\`configure' configures OpenVPN 2.3.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1485,7 +1493,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenVPN 2.3.4:";;
+     short | recursive ) echo "Configuration of OpenVPN 2.3.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1504,6 +1512,8 @@ Optional Features:
                           allow limited interoperability with LZO-enabled
                           peers [default=no]
   --disable-crypto        disable crypto support [default=yes]
+  --enable-ofb-cfb        enable support for OFB and CFB cipher modes
+                          [default=yes]
   --disable-ssl           disable SSL support for TLS-based key exchange
                           [default=yes]
   --enable-x509-alt-username
@@ -1589,6 +1599,8 @@ Some influential environment variables:
   NETSTAT     path to netstat utility
   MAN2HTML    path to man2html utility
   GIT         path to git utility
+  SYSTEMD_ASK_PASSWORD
+              path to systemd-ask-password utility
   TAP_CFLAGS  C compiler flags for tap
   LIBPAM_CFLAGS
               C compiler flags for libpam
@@ -1611,6 +1623,10 @@ Some influential environment variables:
               linker flags for polarssl
   LZO_CFLAGS  C compiler flags for lzo
   LZO_LIBS    linker flags for lzo
+  libsystemd_CFLAGS
+              C compiler flags for libsystemd, overriding pkg-config
+  libsystemd_LIBS
+              linker flags for libsystemd, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1678,7 +1694,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenVPN configure 2.3.4
+OpenVPN configure 2.3.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2460,7 +2476,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenVPN $as_me 2.3.4, which was
+It was created by OpenVPN $as_me 2.3.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2824,7 +2840,7 @@ if test -z "${htmldir}"; then
 fi
 
 
-$as_echo "#define OPENVPN_VERSION_RESOURCE 2,3,4,0" >>confdefs.h
+$as_echo "#define OPENVPN_VERSION_RESOURCE 2,3,5,0" >>confdefs.h
 
 
 ac_aux_dir=
@@ -3346,7 +3362,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openvpn'
- VERSION='2.3.4'
+ VERSION='2.3.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5035,6 +5051,15 @@ else
 fi
 
 
+# Check whether --enable-ofb-cfb was given.
+if test "${enable_ofb_cfb+set}" = set; then :
+  enableval=$enable_ofb_cfb;
+else
+  enable_crypto_ofb_cfb="yes"
+
+fi
+
+
 # Check whether --enable-ssl was given.
 if test "${enable_ssl+set}" = set; then :
   enableval=$enable_ssl;
@@ -5810,6 +5835,7 @@ fi
  # tests
 
 
+
 for ac_prog in ifconfig
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -5948,6 +5974,52 @@ fi
   test -n "$IPROUTE" && break
 done
 
+for ac_prog in systemd-ask-password
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SYSTEMD_ASK_PASSWORD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $SYSTEMD_ASK_PASSWORD in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_SYSTEMD_ASK_PASSWORD="$SYSTEMD_ASK_PASSWORD" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/local/bin:/usr/bin:/bin"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_SYSTEMD_ASK_PASSWORD="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+SYSTEMD_ASK_PASSWORD=$ac_cv_path_SYSTEMD_ASK_PASSWORD
+if test -n "$SYSTEMD_ASK_PASSWORD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEMD_ASK_PASSWORD" >&5
+$as_echo "$SYSTEMD_ASK_PASSWORD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$SYSTEMD_ASK_PASSWORD" && break
+done
+
 for ac_prog in netstat
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -6092,6 +6164,11 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+cat >>confdefs.h <<_ACEOF
+#define SYSTEMD_ASK_PASSWORD_PATH "$SYSTEMD_ASK_PASSWORD"
+_ACEOF
+
+
 #
 # Libtool
 #
@@ -16161,6 +16238,302 @@ done
 	CFLAGS="${saved_CFLAGS}"
 fi
 
+
+
+if test "$enable_systemd" = "yes" ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5
+$as_echo_n "checking for libsystemd... " >&6; }
+
+if test -n "$libsystemd_CFLAGS"; then
+    pkg_cv_libsystemd_CFLAGS="$libsystemd_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd libsystemd\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "systemd libsystemd") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_libsystemd_CFLAGS=`$PKG_CONFIG --cflags "systemd libsystemd" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$libsystemd_LIBS"; then
+    pkg_cv_libsystemd_LIBS="$libsystemd_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd libsystemd\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "systemd libsystemd") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_libsystemd_LIBS=`$PKG_CONFIG --libs "systemd libsystemd" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        libsystemd_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "systemd libsystemd" 2>&1`
+        else
+	        libsystemd_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "systemd libsystemd" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$libsystemd_PKG_ERRORS" >&5
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5
+$as_echo_n "checking for libsystemd... " >&6; }
+
+if test -n "$libsystemd_CFLAGS"; then
+    pkg_cv_libsystemd_CFLAGS="$libsystemd_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_libsystemd_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$libsystemd_LIBS"; then
+    pkg_cv_libsystemd_LIBS="$libsystemd_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_libsystemd_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        libsystemd_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
+        else
+	        libsystemd_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$libsystemd_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libsystemd-daemon) were not met:
+
+$libsystemd_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables libsystemd_CFLAGS
+and libsystemd_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables libsystemd_CFLAGS
+and libsystemd_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	libsystemd_CFLAGS=$pkg_cv_libsystemd_CFLAGS
+	libsystemd_LIBS=$pkg_cv_libsystemd_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5
+$as_echo_n "checking for libsystemd... " >&6; }
+
+if test -n "$libsystemd_CFLAGS"; then
+    pkg_cv_libsystemd_CFLAGS="$libsystemd_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_libsystemd_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$libsystemd_LIBS"; then
+    pkg_cv_libsystemd_LIBS="$libsystemd_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_libsystemd_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        libsystemd_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
+        else
+	        libsystemd_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$libsystemd_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libsystemd-daemon) were not met:
+
+$libsystemd_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables libsystemd_CFLAGS
+and libsystemd_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables libsystemd_CFLAGS
+and libsystemd_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	libsystemd_CFLAGS=$pkg_cv_libsystemd_CFLAGS
+	libsystemd_LIBS=$pkg_cv_libsystemd_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+else
+	libsystemd_CFLAGS=$pkg_cv_libsystemd_CFLAGS
+	libsystemd_LIBS=$pkg_cv_libsystemd_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+    for ac_header in systemd/sd-daemon.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default"
+if test "x$ac_cv_header_systemd_sd_daemon_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYSTEMD_SD_DAEMON_H 1
+_ACEOF
+
+else
+
+	   as_fn_error $? "systemd development headers not found." "$LINENO" 5
+
+fi
+
+done
+
+
+    saved_LIBS="${LIBS}"
+    LIBS="${LIBS} ${libsystemd_LIBS}"
+    for ac_func in sd_booted
+do :
+  ac_fn_c_check_func "$LINENO" "sd_booted" "ac_cv_func_sd_booted"
+if test "x$ac_cv_func_sd_booted" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SD_BOOTED 1
+_ACEOF
+
+else
+  as_fn_error $? "systemd library is missing sd_booted()" "$LINENO" 5
+fi
+done
+
+    OPTIONAL_SYSTEMD_LIBS="${libsystemd_LIBS}"
+
+$as_echo "#define ENABLE_SYSTEMD 1" >>confdefs.h
+
+    LIBS="${saved_LIBS}"
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking git checkout" >&5
 $as_echo_n "checking git checkout... " >&6; }
 GIT_CHECKOUT="no"
@@ -16252,9 +16625,6 @@ $as_echo "#define ENABLE_STRICT_OPTIONS_CHECK 1" >>confdefs.h
 test "${enable_password_save}" = "yes" &&
 $as_echo "#define ENABLE_PASSWORD_SAVE 1" >>confdefs.h
 
-test "${enable_systemd}" = "yes" &&
-$as_echo "#define ENABLE_SYSTEMD 1" >>confdefs.h
-
 
 case "${with_crypto_library}" in
 	openssl)
@@ -16294,6 +16664,9 @@ fi
 
 if test "${enable_crypto}" = "yes"; then
 	test "${have_crypto_crypto}" != "yes" && as_fn_error $? "${with_crypto_library} crypto is required but missing" "$LINENO" 5
+	test "${enable_crypto_ofb_cfb}" = "yes" &&
+$as_echo "#define ENABLE_OFB_CFB_MODE 1" >>confdefs.h
+
 	OPTIONAL_CRYPTO_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${CRYPTO_CRYPTO_CFLAGS}"
 	OPTIONAL_CRYPTO_LIBS="${OPTIONAL_CRYPTO_LIBS} ${CRYPTO_CRYPTO_LIBS}"
 
@@ -16426,6 +16799,7 @@ _ACEOF
 
 
 
+
  if test "${WIN32}" = "yes"; then
   WIN32_TRUE=
   WIN32_FALSE='#'
@@ -17014,7 +17388,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenVPN $as_me 2.3.4, which was
+This file was extended by OpenVPN $as_me 2.3.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17080,7 +17454,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OpenVPN config.status 2.3.4
+OpenVPN config.status 2.3.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"