Imported Upstream version 4.5.2

1 files changed, 362 insertions, 30 deletions

diff --git a/configure b/configure
index b0b1cdc60..61c23e78a 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.67 for strongSwan 4.5.1.
+# Generated by GNU Autoconf 2.67 for strongSwan 4.5.2.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='strongSwan'
 PACKAGE_TARNAME='strongswan'
-PACKAGE_VERSION='4.5.1'
-PACKAGE_STRING='strongSwan 4.5.1'
+PACKAGE_VERSION='4.5.2'
+PACKAGE_STRING='strongSwan 4.5.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -841,6 +841,8 @@ USE_EAP_RADIUS_FALSE
 USE_EAP_RADIUS_TRUE
 USE_EAP_TNC_FALSE
 USE_EAP_TNC_TRUE
+USE_EAP_PEAP_FALSE
+USE_EAP_PEAP_TRUE
 USE_EAP_TTLS_FALSE
 USE_EAP_TTLS_TRUE
 USE_EAP_TLS_FALSE
@@ -863,12 +865,20 @@ USE_EAP_SIMAKA_PSEUDONYM_FALSE
 USE_EAP_SIMAKA_PSEUDONYM_TRUE
 USE_EAP_SIMAKA_SQL_FALSE
 USE_EAP_SIMAKA_SQL_TRUE
+USE_EAP_SIM_PCSC_FALSE
+USE_EAP_SIM_PCSC_TRUE
 USE_EAP_SIM_FILE_FALSE
 USE_EAP_SIM_FILE_TRUE
 USE_EAP_SIM_FALSE
 USE_EAP_SIM_TRUE
+USE_COUPLING_FALSE
+USE_COUPLING_TRUE
+USE_DUPLICHECK_FALSE
+USE_DUPLICHECK_TRUE
 USE_LED_FALSE
 USE_LED_TRUE
+USE_WHITELIST_FALSE
+USE_WHITELIST_TRUE
 USE_HA_FALSE
 USE_HA_TRUE
 USE_LOAD_TESTER_FALSE
@@ -982,6 +992,8 @@ pluto_plugins
 libcharon_plugins
 nm_LIBS
 nm_CFLAGS
+pcsclite_LIBS
+pcsclite_CFLAGS
 dbusservicedir
 maemo_LIBS
 maemo_CFLAGS
@@ -1055,6 +1067,9 @@ CFLAGS
 CC
 ipsecgroup
 ipsecuser
+systemdsystemunitdir
+HAVE_SYSTEMD_FALSE
+HAVE_SYSTEMD_TRUE
 routing_table_prio
 routing_table
 linux_headers
@@ -1148,6 +1163,7 @@ with_routing_table
 with_routing_table_prio
 with_capabilities
 with_mpz_powm_sec
+with_systemdsystemunitdir
 with_xauth_module
 with_user
 with_group
@@ -1191,6 +1207,7 @@ enable_unit_tests
 enable_load_tester
 enable_eap_sim
 enable_eap_sim_file
+enable_eap_sim_pcsc
 enable_eap_simaka_sql
 enable_eap_simaka_pseudonym
 enable_eap_simaka_reauth
@@ -1202,6 +1219,7 @@ enable_eap_aka_3gpp2
 enable_eap_mschapv2
 enable_eap_tls
 enable_eap_ttls
+enable_eap_peap
 enable_eap_tnc
 enable_eap_radius
 enable_tnc_imc
@@ -1252,7 +1270,10 @@ enable_android
 enable_maemo
 enable_nm
 enable_ha
+enable_whitelist
 enable_led
+enable_duplicheck
+enable_coupling
 enable_vstr
 enable_monolithic
 enable_dependency_tracking
@@ -1286,6 +1307,8 @@ gtk_CFLAGS
 gtk_LIBS
 maemo_CFLAGS
 maemo_LIBS
+pcsclite_CFLAGS
+pcsclite_LIBS
 nm_CFLAGS
 nm_LIBS'
 
@@ -1830,7 +1853,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 strongSwan 4.5.1 to adapt to many kinds of systems.
+\`configure' configures strongSwan 4.5.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1900,7 +1923,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of strongSwan 4.5.1:";;
+     short | recursive ) echo "Configuration of strongSwan 4.5.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1958,6 +1981,8 @@ Optional Features:
   --enable-load-tester    enable load testing plugin for IKEv2 daemon.
   --enable-eap-sim        enable SIM authentication module for EAP.
   --enable-eap-sim-file   enable EAP-SIM backend based on a triplet file.
+  --enable-eap-sim-pcsc   enable EAP-SIM backend based on a smartcard reader.
+                          Requires libpcsclite.
   --enable-eap-simaka-sql enable EAP-SIM/AKA backend based on a
                           triplet/quintuplet SQL database.
   --enable-eap-simaka-pseudonym
@@ -1974,6 +1999,7 @@ Optional Features:
   --enable-eap-mschapv2   enable EAP MS-CHAPv2 authentication module.
   --enable-eap-tls        enable EAP TLS authentication module.
   --enable-eap-ttls       enable EAP TTLS authentication module.
+  --enable-eap-peap       enable EAP PEAP authentication module.
   --enable-eap-tnc        enable EAP TNC trusted network connect module.
   --enable-eap-radius     enable RADIUS proxy authentication module.
   --enable-tnc-imc        enable TNC IMC module.
@@ -2037,8 +2063,13 @@ Optional Features:
   --enable-maemo          enable Maemo specific plugin.
   --enable-nm             enable NetworkManager plugin.
   --enable-ha             enable high availability cluster plugin.
+  --enable-whitelist      enable peer identity whitelisting plugin.
   --enable-led            enable plugin to control LEDs on IKEv2 activity
                           using the Linux kernel LED subsystem.
+  --enable-duplicheck     advanced duplicate checking plugin using liveness
+                          checks.
+  --enable-coupling       enable IKEv2 plugin to couple peer certificates
+                          permanently to authentication.
   --enable-vstr           enforce using the Vstr string library to replace
                           glibc-like printf hooks.
   --enable-monolithic     build monolithic version of libstrongswan that
@@ -2089,6 +2120,9 @@ Optional Packages:
                           values are "libcap" and "native" (default: no).
   --with-mpz_powm_sec=arg use the more side-channel resistant mpz_powm_sec in
                           libgmp, if available (default: yes).
+  --with-systemdsystemunitdir=arg
+                          directory for systemd service files (default:
+                          $systemdsystemunitdir_default).
   --with-xauth-module=lib set the path to the XAUTH module
   --with-user=user        change user of the daemons to "user" after startup
                           (default is "root").
@@ -2128,6 +2162,10 @@ Some influential environment variables:
   maemo_CFLAGS
               C compiler flags for maemo, overriding pkg-config
   maemo_LIBS  linker flags for maemo, overriding pkg-config
+  pcsclite_CFLAGS
+              C compiler flags for pcsclite, overriding pkg-config
+  pcsclite_LIBS
+              linker flags for pcsclite, overriding pkg-config
   nm_CFLAGS   C compiler flags for nm, overriding pkg-config
   nm_LIBS     linker flags for nm, overriding pkg-config
 
@@ -2197,7 +2235,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-strongSwan configure 4.5.1
+strongSwan configure 4.5.2
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2673,7 +2711,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 strongSwan $as_me 4.5.1, which was
+It was created by strongSwan $as_me 4.5.2, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -3488,7 +3526,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='strongswan'
- VERSION='4.5.1'
+ VERSION='4.5.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3909,6 +3947,29 @@ fi
 
 
 
+if test -n "$PKG_CONFIG"; then
+	systemdsystemunitdir_default=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
+fi
+
+# Check whether --with-systemdsystemunitdir was given.
+if test "${with_systemdsystemunitdir+set}" = set; then :
+  withval=$with_systemdsystemunitdir; systemdsystemunitdir="$withval"
+else
+  systemdsystemunitdir=$systemdsystemunitdir_default
+
+fi
+
+
+ if test -n "$systemdsystemunitdir" -a "x$systemdsystemunitdir" != xno; then
+  HAVE_SYSTEMD_TRUE=
+  HAVE_SYSTEMD_FALSE='#'
+else
+  HAVE_SYSTEMD_TRUE='#'
+  HAVE_SYSTEMD_FALSE=
+fi
+
+
+
 
 # Check whether --with-xauth-module was given.
 if test "${with_xauth_module+set}" = set; then :
@@ -4561,6 +4622,21 @@ else
 fi
 
 
+# Check whether --enable-eap-sim-pcsc was given.
+if test "${enable_eap_sim_pcsc+set}" = set; then :
+  enableval=$enable_eap_sim_pcsc; eap_sim_pcsc_given=true
+		if test x$enableval = xyes; then
+			eap_sim_pcsc=true
+		 else
+			eap_sim_pcsc=false
+		fi
+else
+  eap_sim_pcsc=false
+		eap_sim_pcsc_given=false
+
+fi
+
+
 # Check whether --enable-eap-simaka-sql was given.
 if test "${enable_eap_simaka_sql+set}" = set; then :
   enableval=$enable_eap_simaka_sql; eap_simaka_sql_given=true
@@ -4726,6 +4802,21 @@ else
 fi
 
 
+# Check whether --enable-eap-peap was given.
+if test "${enable_eap_peap+set}" = set; then :
+  enableval=$enable_eap_peap; eap_peap_given=true
+		if test x$enableval = xyes; then
+			eap_peap=true
+		 else
+			eap_peap=false
+		fi
+else
+  eap_peap=false
+		eap_peap_given=false
+
+fi
+
+
 # Check whether --enable-eap-tnc was given.
 if test "${enable_eap_tnc+set}" = set; then :
   enableval=$enable_eap_tnc; eap_tnc_given=true
@@ -5476,6 +5567,21 @@ else
 fi
 
 
+# Check whether --enable-whitelist was given.
+if test "${enable_whitelist+set}" = set; then :
+  enableval=$enable_whitelist; whitelist_given=true
+		if test x$enableval = xyes; then
+			whitelist=true
+		 else
+			whitelist=false
+		fi
+else
+  whitelist=false
+		whitelist_given=false
+
+fi
+
+
 # Check whether --enable-led was given.
 if test "${enable_led+set}" = set; then :
   enableval=$enable_led; led_given=true
@@ -5491,6 +5597,36 @@ else
 fi
 
 
+# Check whether --enable-duplicheck was given.
+if test "${enable_duplicheck+set}" = set; then :
+  enableval=$enable_duplicheck; duplicheck_given=true
+		if test x$enableval = xyes; then
+			duplicheck=true
+		 else
+			duplicheck=false
+		fi
+else
+  duplicheck=false
+		duplicheck_given=false
+
+fi
+
+
+# Check whether --enable-coupling was given.
+if test "${enable_coupling+set}" = set; then :
+  enableval=$enable_coupling; coupling_given=true
+		if test x$enableval = xyes; then
+			coupling=true
+		 else
+			coupling=false
+		fi
+else
+  coupling=false
+		coupling_given=false
+
+fi
+
+
 # Check whether --enable-vstr was given.
 if test "${enable_vstr+set}" = set; then :
   enableval=$enable_vstr; vstr_given=true
@@ -7873,13 +8009,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:7876: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:8012: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7879: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:8015: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7882: output\"" >&5)
+  (eval echo "\"\$as_me:8018: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -9084,7 +9220,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 9087 "configure"' > conftest.$ac_ext
+  echo '#line 9223 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -10346,11 +10482,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10349: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10485: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10353: \$? = $ac_status" >&5
+   echo "$as_me:10489: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10685,11 +10821,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10688: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10824: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10692: \$? = $ac_status" >&5
+   echo "$as_me:10828: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10790,11 +10926,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10793: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10929: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10797: \$? = $ac_status" >&5
+   echo "$as_me:10933: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10845,11 +10981,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10848: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10984: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10852: \$? = $ac_status" >&5
+   echo "$as_me:10988: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13229,7 +13365,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13232 "configure"
+#line 13368 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13325,7 +13461,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13328 "configure"
+#line 13464 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13974,7 +14110,7 @@ if test x$eap_sim = xtrue; then
 	simaka=true;
 fi
 
-if test x$eap_tls = xtrue -o x$eap_ttls = xtrue; then
+if test x$eap_tls = xtrue -o x$eap_ttls = xtrue -o x$eap_peap = xtrue; then
 	tls=true;
 fi
 
@@ -14813,12 +14949,13 @@ fi
 done
 
 
-for ac_header in sys/sockio.h
+for ac_header in sys/sockio.h glob.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sockio_h" = x""yes; then :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_SOCKIO_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -16302,6 +16439,100 @@ fi
 
 fi
 
+if test x$eap_sim_pcsc = xtrue; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcsclite" >&5
+$as_echo_n "checking for pcsclite... " >&6; }
+
+if test -n "$pcsclite_CFLAGS"; then
+    pkg_cv_pcsclite_CFLAGS="$pcsclite_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcsclite\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libpcsclite") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_pcsclite_CFLAGS=`$PKG_CONFIG --cflags "libpcsclite" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$pcsclite_LIBS"; then
+    pkg_cv_pcsclite_LIBS="$pcsclite_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcsclite\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libpcsclite") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_pcsclite_LIBS=`$PKG_CONFIG --libs "libpcsclite" 2>/dev/null`
+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
+	        pcsclite_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpcsclite" 2>&1`
+        else
+	        pcsclite_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpcsclite" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$pcsclite_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libpcsclite) were not met:
+
+$pcsclite_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 pcsclite_CFLAGS
+and pcsclite_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 pcsclite_CFLAGS
+and pcsclite_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
+	pcsclite_CFLAGS=$pkg_cv_pcsclite_CFLAGS
+	pcsclite_LIBS=$pkg_cv_pcsclite_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+fi
+
 if test x$nm = xtrue; then
 	if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-glib\""; } >&5
@@ -17146,6 +17377,12 @@ if test x$eap_sim_file = xtrue; then
 
 	fi
 
+if test x$eap_sim_pcsc = xtrue; then
+		c_plugins=${c_plugins}" eap-sim-pcsc"
+		libcharon_plugins=${libcharon_plugins}" eap-sim-pcsc"
+
+	fi
+
 if test x$eap_simaka_sql = xtrue; then
 		c_plugins=${c_plugins}" eap-simaka-sql"
 		libcharon_plugins=${libcharon_plugins}" eap-simaka-sql"
@@ -17212,6 +17449,12 @@ if test x$eap_ttls = xtrue; then
 
 	fi
 
+if test x$eap_peap = xtrue; then
+		c_plugins=${c_plugins}" eap-peap"
+		libcharon_plugins=${libcharon_plugins}" eap-peap"
+
+	fi
+
 if test x$eap_tnc = xtrue; then
 		c_plugins=${c_plugins}" eap-tnc"
 		libcharon_plugins=${libcharon_plugins}" eap-tnc"
@@ -17284,12 +17527,30 @@ if test x$ha = xtrue; then
 
 	fi
 
+if test x$whitelist = xtrue; then
+		c_plugins=${c_plugins}" whitelist"
+		libcharon_plugins=${libcharon_plugins}" whitelist"
+
+	fi
+
 if test x$led = xtrue; then
 		c_plugins=${c_plugins}" led"
 		libcharon_plugins=${libcharon_plugins}" led"
 
 	fi
 
+if test x$duplicheck = xtrue; then
+		c_plugins=${c_plugins}" duplicheck"
+		libcharon_plugins=${libcharon_plugins}" duplicheck"
+
+	fi
+
+if test x$coupling = xtrue; then
+		c_plugins=${c_plugins}" coupling"
+		libcharon_plugins=${libcharon_plugins}" coupling"
+
+	fi
+
 if test x$maemo = xtrue; then
 		c_plugins=${c_plugins}" maemo"
 		libcharon_plugins=${libcharon_plugins}" maemo"
@@ -17724,6 +17985,14 @@ else
   USE_HA_FALSE=
 fi
 
+ if test x$whitelist = xtrue; then
+  USE_WHITELIST_TRUE=
+  USE_WHITELIST_FALSE='#'
+else
+  USE_WHITELIST_TRUE='#'
+  USE_WHITELIST_FALSE=
+fi
+
  if test x$led = xtrue; then
   USE_LED_TRUE=
   USE_LED_FALSE='#'
@@ -17732,6 +18001,22 @@ else
   USE_LED_FALSE=
 fi
 
+ if test x$duplicheck = xtrue; then
+  USE_DUPLICHECK_TRUE=
+  USE_DUPLICHECK_FALSE='#'
+else
+  USE_DUPLICHECK_TRUE='#'
+  USE_DUPLICHECK_FALSE=
+fi
+
+ if test x$coupling = xtrue; then
+  USE_COUPLING_TRUE=
+  USE_COUPLING_FALSE='#'
+else
+  USE_COUPLING_TRUE='#'
+  USE_COUPLING_FALSE=
+fi
+
  if test x$eap_sim = xtrue; then
   USE_EAP_SIM_TRUE=
   USE_EAP_SIM_FALSE='#'
@@ -17748,6 +18033,14 @@ else
   USE_EAP_SIM_FILE_FALSE=
 fi
 
+ if test x$eap_sim_pcsc = xtrue; then
+  USE_EAP_SIM_PCSC_TRUE=
+  USE_EAP_SIM_PCSC_FALSE='#'
+else
+  USE_EAP_SIM_PCSC_TRUE='#'
+  USE_EAP_SIM_PCSC_FALSE=
+fi
+
  if test x$eap_simaka_sql = xtrue; then
   USE_EAP_SIMAKA_SQL_TRUE=
   USE_EAP_SIMAKA_SQL_FALSE='#'
@@ -17836,6 +18129,14 @@ else
   USE_EAP_TTLS_FALSE=
 fi
 
+ if test x$eap_peap = xtrue; then
+  USE_EAP_PEAP_TRUE=
+  USE_EAP_PEAP_FALSE='#'
+else
+  USE_EAP_PEAP_TRUE='#'
+  USE_EAP_PEAP_FALSE=
+fi
+
  if test x$eap_tnc = xtrue; then
   USE_EAP_TNC_TRUE=
   USE_EAP_TNC_FALSE='#'
@@ -18248,7 +18549,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile man/Makefile src/Makefile src/include/Makefile src/libstrongswan/Makefile src/libstrongswan/plugins/aes/Makefile src/libstrongswan/plugins/des/Makefile src/libstrongswan/plugins/blowfish/Makefile src/libstrongswan/plugins/md4/Makefile src/libstrongswan/plugins/md5/Makefile src/libstrongswan/plugins/sha1/Makefile src/libstrongswan/plugins/sha2/Makefile src/libstrongswan/plugins/fips_prf/Makefile src/libstrongswan/plugins/gmp/Makefile src/libstrongswan/plugins/random/Makefile src/libstrongswan/plugins/hmac/Makefile src/libstrongswan/plugins/xcbc/Makefile src/libstrongswan/plugins/x509/Makefile src/libstrongswan/plugins/revocation/Makefile src/libstrongswan/plugins/constraints/Makefile src/libstrongswan/plugins/pubkey/Makefile src/libstrongswan/plugins/pkcs1/Makefile src/libstrongswan/plugins/pgp/Makefile src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/Makefile src/libstrongswan/plugins/soup/Makefile src/libstrongswan/plugins/ldap/Makefile src/libstrongswan/plugins/mysql/Makefile src/libstrongswan/plugins/sqlite/Makefile src/libstrongswan/plugins/padlock/Makefile src/libstrongswan/plugins/openssl/Makefile src/libstrongswan/plugins/gcrypt/Makefile src/libstrongswan/plugins/agent/Makefile src/libstrongswan/plugins/pkcs11/Makefile src/libstrongswan/plugins/ctr/Makefile src/libstrongswan/plugins/ccm/Makefile src/libstrongswan/plugins/gcm/Makefile src/libstrongswan/plugins/af_alg/Makefile src/libstrongswan/plugins/test_vectors/Makefile src/libhydra/Makefile src/libhydra/plugins/attr/Makefile src/libhydra/plugins/attr_sql/Makefile src/libhydra/plugins/kernel_klips/Makefile src/libhydra/plugins/kernel_netlink/Makefile src/libhydra/plugins/kernel_pfkey/Makefile src/libhydra/plugins/kernel_pfroute/Makefile src/libhydra/plugins/resolve/Makefile src/libfreeswan/Makefile src/libsimaka/Makefile src/libtls/Makefile src/pluto/Makefile src/pluto/plugins/xauth/Makefile src/whack/Makefile src/charon/Makefile src/libcharon/Makefile src/libcharon/plugins/eap_aka/Makefile src/libcharon/plugins/eap_aka_3gpp2/Makefile src/libcharon/plugins/eap_identity/Makefile src/libcharon/plugins/eap_md5/Makefile src/libcharon/plugins/eap_gtc/Makefile src/libcharon/plugins/eap_sim/Makefile src/libcharon/plugins/eap_sim_file/Makefile src/libcharon/plugins/eap_simaka_sql/Makefile src/libcharon/plugins/eap_simaka_pseudonym/Makefile src/libcharon/plugins/eap_simaka_reauth/Makefile src/libcharon/plugins/eap_mschapv2/Makefile src/libcharon/plugins/eap_tls/Makefile src/libcharon/plugins/eap_ttls/Makefile src/libcharon/plugins/eap_tnc/Makefile src/libcharon/plugins/eap_radius/Makefile src/libcharon/plugins/tnc_imc/Makefile src/libcharon/plugins/tnc_imv/Makefile src/libcharon/plugins/tnccs_11/Makefile src/libcharon/plugins/tnccs_20/Makefile src/libcharon/plugins/tnccs_dynamic/Makefile src/libcharon/plugins/socket_default/Makefile src/libcharon/plugins/socket_raw/Makefile src/libcharon/plugins/socket_dynamic/Makefile src/libcharon/plugins/farp/Makefile src/libcharon/plugins/smp/Makefile src/libcharon/plugins/sql/Makefile src/libcharon/plugins/medsrv/Makefile src/libcharon/plugins/medcli/Makefile src/libcharon/plugins/nm/Makefile src/libcharon/plugins/addrblock/Makefile src/libcharon/plugins/uci/Makefile src/libcharon/plugins/ha/Makefile src/libcharon/plugins/led/Makefile src/libcharon/plugins/android/Makefile src/libcharon/plugins/maemo/Makefile src/libcharon/plugins/stroke/Makefile src/libcharon/plugins/updown/Makefile src/libcharon/plugins/dhcp/Makefile src/libcharon/plugins/unit_tester/Makefile src/libcharon/plugins/load_tester/Makefile src/stroke/Makefile src/ipsec/Makefile src/starter/Makefile src/_updown/Makefile src/_updown_espmark/Makefile src/_copyright/Makefile src/openac/Makefile src/scepclient/Makefile src/pki/Makefile src/dumm/Makefile src/dumm/ext/extconf.rb src/libfast/Makefile src/manager/Makefile src/medsrv/Makefile src/checksum/Makefile src/conftest/Makefile scripts/Makefile testing/Makefile"
+ac_config_files="$ac_config_files Makefile man/Makefile init/Makefile init/systemd/Makefile src/Makefile src/include/Makefile src/libstrongswan/Makefile src/libstrongswan/plugins/aes/Makefile src/libstrongswan/plugins/des/Makefile src/libstrongswan/plugins/blowfish/Makefile src/libstrongswan/plugins/md4/Makefile src/libstrongswan/plugins/md5/Makefile src/libstrongswan/plugins/sha1/Makefile src/libstrongswan/plugins/sha2/Makefile src/libstrongswan/plugins/fips_prf/Makefile src/libstrongswan/plugins/gmp/Makefile src/libstrongswan/plugins/random/Makefile src/libstrongswan/plugins/hmac/Makefile src/libstrongswan/plugins/xcbc/Makefile src/libstrongswan/plugins/x509/Makefile src/libstrongswan/plugins/revocation/Makefile src/libstrongswan/plugins/constraints/Makefile src/libstrongswan/plugins/pubkey/Makefile src/libstrongswan/plugins/pkcs1/Makefile src/libstrongswan/plugins/pgp/Makefile src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/Makefile src/libstrongswan/plugins/soup/Makefile src/libstrongswan/plugins/ldap/Makefile src/libstrongswan/plugins/mysql/Makefile src/libstrongswan/plugins/sqlite/Makefile src/libstrongswan/plugins/padlock/Makefile src/libstrongswan/plugins/openssl/Makefile src/libstrongswan/plugins/gcrypt/Makefile src/libstrongswan/plugins/agent/Makefile src/libstrongswan/plugins/pkcs11/Makefile src/libstrongswan/plugins/ctr/Makefile src/libstrongswan/plugins/ccm/Makefile src/libstrongswan/plugins/gcm/Makefile src/libstrongswan/plugins/af_alg/Makefile src/libstrongswan/plugins/test_vectors/Makefile src/libhydra/Makefile src/libhydra/plugins/attr/Makefile src/libhydra/plugins/attr_sql/Makefile src/libhydra/plugins/kernel_klips/Makefile src/libhydra/plugins/kernel_netlink/Makefile src/libhydra/plugins/kernel_pfkey/Makefile src/libhydra/plugins/kernel_pfroute/Makefile src/libhydra/plugins/resolve/Makefile src/libfreeswan/Makefile src/libsimaka/Makefile src/libtls/Makefile src/pluto/Makefile src/pluto/plugins/xauth/Makefile src/whack/Makefile src/charon/Makefile src/libcharon/Makefile src/libcharon/plugins/eap_aka/Makefile src/libcharon/plugins/eap_aka_3gpp2/Makefile src/libcharon/plugins/eap_identity/Makefile src/libcharon/plugins/eap_md5/Makefile src/libcharon/plugins/eap_gtc/Makefile src/libcharon/plugins/eap_sim/Makefile src/libcharon/plugins/eap_sim_file/Makefile src/libcharon/plugins/eap_sim_pcsc/Makefile src/libcharon/plugins/eap_simaka_sql/Makefile src/libcharon/plugins/eap_simaka_pseudonym/Makefile src/libcharon/plugins/eap_simaka_reauth/Makefile src/libcharon/plugins/eap_mschapv2/Makefile src/libcharon/plugins/eap_tls/Makefile src/libcharon/plugins/eap_ttls/Makefile src/libcharon/plugins/eap_peap/Makefile src/libcharon/plugins/eap_tnc/Makefile src/libcharon/plugins/eap_radius/Makefile src/libcharon/plugins/tnc_imc/Makefile src/libcharon/plugins/tnc_imv/Makefile src/libcharon/plugins/tnccs_11/Makefile src/libcharon/plugins/tnccs_20/Makefile src/libcharon/plugins/tnccs_dynamic/Makefile src/libcharon/plugins/socket_default/Makefile src/libcharon/plugins/socket_raw/Makefile src/libcharon/plugins/socket_dynamic/Makefile src/libcharon/plugins/farp/Makefile src/libcharon/plugins/smp/Makefile src/libcharon/plugins/sql/Makefile src/libcharon/plugins/medsrv/Makefile src/libcharon/plugins/medcli/Makefile src/libcharon/plugins/nm/Makefile src/libcharon/plugins/addrblock/Makefile src/libcharon/plugins/uci/Makefile src/libcharon/plugins/ha/Makefile src/libcharon/plugins/whitelist/Makefile src/libcharon/plugins/led/Makefile src/libcharon/plugins/duplicheck/Makefile src/libcharon/plugins/coupling/Makefile src/libcharon/plugins/android/Makefile src/libcharon/plugins/maemo/Makefile src/libcharon/plugins/stroke/Makefile src/libcharon/plugins/updown/Makefile src/libcharon/plugins/dhcp/Makefile src/libcharon/plugins/unit_tester/Makefile src/libcharon/plugins/load_tester/Makefile src/stroke/Makefile src/ipsec/Makefile src/starter/Makefile src/_updown/Makefile src/_updown_espmark/Makefile src/_copyright/Makefile src/openac/Makefile src/scepclient/Makefile src/pki/Makefile src/dumm/Makefile src/dumm/ext/extconf.rb src/libfast/Makefile src/manager/Makefile src/medsrv/Makefile src/checksum/Makefile src/conftest/Makefile scripts/Makefile testing/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -18392,6 +18693,10 @@ else
   am__EXEEXT_FALSE=
 fi
 
+if test -z "${HAVE_SYSTEMD_TRUE}" && test -z "${HAVE_SYSTEMD_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_SYSTEMD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18597,10 +18902,22 @@ if test -z "${USE_HA_TRUE}" && test -z "${USE_HA_FALSE}"; then
   as_fn_error $? "conditional \"USE_HA\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_WHITELIST_TRUE}" && test -z "${USE_WHITELIST_FALSE}"; then
+  as_fn_error $? "conditional \"USE_WHITELIST\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_LED_TRUE}" && test -z "${USE_LED_FALSE}"; then
   as_fn_error $? "conditional \"USE_LED\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_DUPLICHECK_TRUE}" && test -z "${USE_DUPLICHECK_FALSE}"; then
+  as_fn_error $? "conditional \"USE_DUPLICHECK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_COUPLING_TRUE}" && test -z "${USE_COUPLING_FALSE}"; then
+  as_fn_error $? "conditional \"USE_COUPLING\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_EAP_SIM_TRUE}" && test -z "${USE_EAP_SIM_FALSE}"; then
   as_fn_error $? "conditional \"USE_EAP_SIM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18609,6 +18926,10 @@ if test -z "${USE_EAP_SIM_FILE_TRUE}" && test -z "${USE_EAP_SIM_FILE_FALSE}"; th
   as_fn_error $? "conditional \"USE_EAP_SIM_FILE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_EAP_SIM_PCSC_TRUE}" && test -z "${USE_EAP_SIM_PCSC_FALSE}"; then
+  as_fn_error $? "conditional \"USE_EAP_SIM_PCSC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_EAP_SIMAKA_SQL_TRUE}" && test -z "${USE_EAP_SIMAKA_SQL_FALSE}"; then
   as_fn_error $? "conditional \"USE_EAP_SIMAKA_SQL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18653,6 +18974,10 @@ if test -z "${USE_EAP_TTLS_TRUE}" && test -z "${USE_EAP_TTLS_FALSE}"; then
   as_fn_error $? "conditional \"USE_EAP_TTLS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_EAP_PEAP_TRUE}" && test -z "${USE_EAP_PEAP_FALSE}"; then
+  as_fn_error $? "conditional \"USE_EAP_PEAP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_EAP_TNC_TRUE}" && test -z "${USE_EAP_TNC_FALSE}"; then
   as_fn_error $? "conditional \"USE_EAP_TNC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -19257,7 +19582,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 strongSwan $as_me 4.5.1, which was
+This file was extended by strongSwan $as_me 4.5.2, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19314,7 +19639,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="\\
-strongSwan config.status 4.5.1
+strongSwan config.status 4.5.2
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -19691,6 +20016,8 @@ do
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+    "init/Makefile") CONFIG_FILES="$CONFIG_FILES init/Makefile" ;;
+    "init/systemd/Makefile") CONFIG_FILES="$CONFIG_FILES init/systemd/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/include/Makefile") CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;;
     "src/libstrongswan/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/Makefile" ;;
@@ -19752,12 +20079,14 @@ do
     "src/libcharon/plugins/eap_gtc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_gtc/Makefile" ;;
     "src/libcharon/plugins/eap_sim/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_sim/Makefile" ;;
     "src/libcharon/plugins/eap_sim_file/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_sim_file/Makefile" ;;
+    "src/libcharon/plugins/eap_sim_pcsc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_sim_pcsc/Makefile" ;;
     "src/libcharon/plugins/eap_simaka_sql/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_simaka_sql/Makefile" ;;
     "src/libcharon/plugins/eap_simaka_pseudonym/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_simaka_pseudonym/Makefile" ;;
     "src/libcharon/plugins/eap_simaka_reauth/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_simaka_reauth/Makefile" ;;
     "src/libcharon/plugins/eap_mschapv2/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_mschapv2/Makefile" ;;
     "src/libcharon/plugins/eap_tls/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_tls/Makefile" ;;
     "src/libcharon/plugins/eap_ttls/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_ttls/Makefile" ;;
+    "src/libcharon/plugins/eap_peap/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_peap/Makefile" ;;
     "src/libcharon/plugins/eap_tnc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_tnc/Makefile" ;;
     "src/libcharon/plugins/eap_radius/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_radius/Makefile" ;;
     "src/libcharon/plugins/tnc_imc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/tnc_imc/Makefile" ;;
@@ -19777,7 +20106,10 @@ do
     "src/libcharon/plugins/addrblock/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/addrblock/Makefile" ;;
     "src/libcharon/plugins/uci/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/uci/Makefile" ;;
     "src/libcharon/plugins/ha/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/ha/Makefile" ;;
+    "src/libcharon/plugins/whitelist/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/whitelist/Makefile" ;;
     "src/libcharon/plugins/led/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/led/Makefile" ;;
+    "src/libcharon/plugins/duplicheck/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/duplicheck/Makefile" ;;
+    "src/libcharon/plugins/coupling/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/coupling/Makefile" ;;
     "src/libcharon/plugins/android/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/android/Makefile" ;;
     "src/libcharon/plugins/maemo/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/maemo/Makefile" ;;
     "src/libcharon/plugins/stroke/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/stroke/Makefile" ;;