Imported Upstream version 5.1.0

1 files changed, 635 insertions, 34 deletions

diff --git a/configure b/configure
index fca9ca824..7f4469fe9 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 strongSwan 5.0.4.
+# Generated by GNU Autoconf 2.69 for strongSwan 5.1.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='strongSwan'
 PACKAGE_TARNAME='strongswan'
-PACKAGE_VERSION='5.0.4'
-PACKAGE_STRING='strongSwan 5.0.4'
+PACKAGE_VERSION='5.1.0'
+PACKAGE_STRING='strongSwan 5.1.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -632,10 +632,16 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+USE_CMD_FALSE
+USE_CMD_TRUE
 USE_TKM_FALSE
 USE_TKM_TRUE
+COVERAGE_FALSE
+COVERAGE_TRUE
 UNITTESTS_FALSE
 UNITTESTS_TRUE
+USE_SILENT_RULES_FALSE
+USE_SILENT_RULES_TRUE
 MONOLITHIC_FALSE
 MONOLITHIC_TRUE
 USE_TROUSERS_FALSE
@@ -824,6 +830,8 @@ USE_LOOKIP_FALSE
 USE_LOOKIP_TRUE
 USE_WHITELIST_FALSE
 USE_WHITELIST_TRUE
+USE_KERNEL_LIBIPSEC_FALSE
+USE_KERNEL_LIBIPSEC_TRUE
 USE_HA_FALSE
 USE_HA_TRUE
 USE_LOAD_TESTER_FALSE
@@ -846,6 +854,8 @@ USE_ANDROID_LOG_FALSE
 USE_ANDROID_LOG_TRUE
 USE_ANDROID_DNS_FALSE
 USE_ANDROID_DNS_TRUE
+USE_OSX_ATTR_FALSE
+USE_OSX_ATTR_TRUE
 USE_UCI_FALSE
 USE_UCI_TRUE
 USE_MEDCLI_FALSE
@@ -864,6 +874,8 @@ USE_CTR_FALSE
 USE_CTR_TRUE
 USE_PKCS11_FALSE
 USE_PKCS11_TRUE
+USE_KEYCHAIN_FALSE
+USE_KEYCHAIN_TRUE
 USE_AGENT_FALSE
 USE_AGENT_TRUE
 USE_GCRYPT_FALSE
@@ -884,10 +896,14 @@ USE_HMAC_FALSE
 USE_HMAC_TRUE
 USE_PEM_FALSE
 USE_PEM_TRUE
+USE_SSHKEY_FALSE
+USE_SSHKEY_TRUE
 USE_DNSKEY_FALSE
 USE_DNSKEY_TRUE
 USE_PGP_FALSE
 USE_PGP_TRUE
+USE_PKCS12_FALSE
+USE_PKCS12_TRUE
 USE_PKCS8_FALSE
 USE_PKCS8_TRUE
 USE_PKCS7_FALSE
@@ -920,6 +936,8 @@ USE_MD5_FALSE
 USE_MD5_TRUE
 USE_MD4_FALSE
 USE_MD4_TRUE
+USE_RC2_FALSE
+USE_RC2_TRUE
 USE_BLOWFISH_FALSE
 USE_BLOWFISH_TRUE
 USE_DES_FALSE
@@ -939,6 +957,7 @@ USE_TEST_VECTORS_TRUE
 s_plugins
 h_plugins
 c_plugins
+cmd_plugins
 nm_plugins
 medsrv_plugins
 manager_plugins
@@ -950,12 +969,17 @@ attest_plugins
 pool_plugins
 starter_plugins
 charon_plugins
+COVERAGE_LDFLAGS
+COVERAGE_CFLAGS
+GENHTML
+LCOV
 CHECK_LIBS
 CHECK_CFLAGS
 GPRBUILD
 dev_headers
 USE_DEV_HEADERS_FALSE
 USE_DEV_HEADERS_TRUE
+UNWINDLIB
 BFDLIB
 nm_LIBS
 nm_CFLAGS
@@ -1063,6 +1087,10 @@ random_device
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -1127,6 +1155,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 with_random_device
 with_urandom_device
 with_strongswan_conf
@@ -1158,6 +1187,7 @@ enable_ldap
 enable_aes
 enable_des
 enable_blowfish
+enable_rc2
 enable_md4
 enable_md5
 enable_sha1
@@ -1174,8 +1204,10 @@ enable_pubkey
 enable_pkcs1
 enable_pkcs7
 enable_pkcs8
+enable_pkcs12
 enable_pgp
 enable_dnskey
+enable_sshkey
 enable_ipseckey
 enable_pem
 enable_hmac
@@ -1235,6 +1267,7 @@ enable_kernel_netlink
 enable_kernel_pfkey
 enable_kernel_pfroute
 enable_kernel_klips
+enable_kernel_libipsec
 enable_libipsec
 enable_socket_default
 enable_socket_dynamic
@@ -1260,6 +1293,7 @@ enable_padlock
 enable_openssl
 enable_gcrypt
 enable_agent
+enable_keychain
 enable_pkcs11
 enable_ctr
 enable_ccm
@@ -1267,6 +1301,7 @@ enable_gcm
 enable_addrblock
 enable_unity
 enable_uci
+enable_osx_attr
 enable_android_dns
 enable_android_log
 enable_maemo
@@ -1284,8 +1319,11 @@ enable_radattr
 enable_vstr
 enable_monolithic
 enable_bfd_backtraces
+enable_unwind_backtraces
 enable_unit_tests
+enable_coverage
 enable_tkm
+enable_cmd
 enable_defaults
 enable_dependency_tracking
 with_lib_prefix
@@ -1865,7 +1903,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 5.0.4 to adapt to many kinds of systems.
+\`configure' configures strongSwan 5.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1935,7 +1973,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of strongSwan 5.0.4:";;
+     short | recursive ) echo "Configuration of strongSwan 5.1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1943,6 +1981,8 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
   --enable-curl           enable CURL fetcher plugin to fetch files via
                           libcurl. Requires libcurl.
   --enable-unbound        enable UNBOUND resolver plugin to perform DNS
@@ -1955,6 +1995,7 @@ Optional Features:
   --disable-aes           disable AES software implementation plugin.
   --disable-des           disable DES/3DES software implementation plugin.
   --enable-blowfish       enable Blowfish software implementation plugin.
+  --disable-rc2           disable RC2 software implementation plugin.
   --enable-md4            enable MD4 software implementation plugin.
   --disable-md5           disable MD5 software implementation plugin.
   --disable-sha1          disable SHA1 software implementation plugin.
@@ -1973,8 +2014,10 @@ Optional Features:
   --disable-pkcs1         disable PKCS1 key decoding plugin.
   --disable-pkcs7         disable PKCS7 container support plugin.
   --disable-pkcs8         disable PKCS8 private key decoding plugin.
+  --disable-pkcs12        disable PKCS12 container support plugin.
   --disable-pgp           disable PGP key decoding plugin.
   --disable-dnskey        disable DNS RR key decoding plugin.
+  --disable-sshkey        disable SSH key decoding plugin.
   --enable-ipseckey       enable IPSECKEY authentication plugin.
   --disable-pem           disable PEM decoding plugin.
   --disable-hmac          disable HMAC crypto implementation plugin.
@@ -2049,6 +2092,8 @@ Optional Features:
   --enable-kernel-pfkey   enable the PF_KEY kernel interface.
   --enable-kernel-pfroute enable the PF_ROUTE kernel interface.
   --enable-kernel-klips   enable the KLIPS kernel interface.
+  --enable-kernel-libipsec
+                          enable the libipsec kernel interface.
   --enable-libipsec       enable user space IPsec implementation.
   --disable-socket-default
                           disable default socket implementation for charon.
@@ -2082,6 +2127,7 @@ Optional Features:
   --enable-openssl        enables the OpenSSL crypto plugin.
   --enable-gcrypt         enables the libgcrypt plugin.
   --enable-agent          enables the ssh-agent signing plugin.
+  --enable-keychain       enables OS X Keychain Services credential set.
   --enable-pkcs11         enables the PKCS11 token support plugin.
   --enable-ctr            enables the Counter Mode wrapper crypto plugin.
   --enable-ccm            enables the CCM AEAD wrapper crypto plugin.
@@ -2089,6 +2135,7 @@ Optional Features:
   --enable-addrblock      enables RFC 3779 address block constraint support.
   --enable-unity          enables Cisco Unity extension plugin.
   --enable-uci            enable OpenWRT UCI configuration plugin.
+  --enable-osx-attr       enable OS X SystemConfiguration attribute handler.
   --enable-android-dns    enable Android specific DNS handler.
   --enable-android-log    enable Android specific logger plugin.
   --enable-maemo          enable Maemo specific plugin.
@@ -2117,8 +2164,13 @@ Optional Features:
                           of charon are assembled in libcharon.
   --enable-bfd-backtraces use binutils libbfd to resolve backtraces for memory
                           leaks and segfaults.
+  --enable-unwind-backtraces
+                          use libunwind to create backtraces for memory leaks
+                          and segfaults.
   --enable-unit-tests     enable unit tests using the check test framework.
+  --enable-coverage       enable lcov coverage report generation.
   --enable-tkm            enable Trusted Key Manager support.
+  --enable-cmd            enable the command line IKE client charon-cmd.
   --disable-defaults      disable all default plugins (they can be enabled
                           with their respective --enable options)
   --disable-dependency-tracking  speeds up one-time build
@@ -2304,7 +2356,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-strongSwan configure 5.0.4
+strongSwan configure 5.1.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2826,7 +2878,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 5.0.4, which was
+It was created by strongSwan $as_me 5.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3641,7 +3693,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='strongswan'
- VERSION='5.0.4'
+ VERSION='5.1.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3762,6 +3814,45 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 
 ac_config_headers="$ac_config_headers config.h"
 
@@ -4351,6 +4442,22 @@ else
 fi
 
 
+# Check whether --enable-rc2 was given.
+if test "${enable_rc2+set}" = set; then :
+  enableval=$enable_rc2; rc2_given=true
+		if test x$enableval = xyes; then
+			rc2=true
+		 else
+			rc2=false
+		fi
+else
+  rc2=true
+		rc2_given=false
+
+fi
+
+	enabled_by_default=${enabled_by_default}" rc2"
+
 # Check whether --enable-md4 was given.
 if test "${enable_md4+set}" = set; then :
   enableval=$enable_md4; md4_given=true
@@ -4605,6 +4712,22 @@ fi
 
 	enabled_by_default=${enabled_by_default}" pkcs8"
 
+# Check whether --enable-pkcs12 was given.
+if test "${enable_pkcs12+set}" = set; then :
+  enableval=$enable_pkcs12; pkcs12_given=true
+		if test x$enableval = xyes; then
+			pkcs12=true
+		 else
+			pkcs12=false
+		fi
+else
+  pkcs12=true
+		pkcs12_given=false
+
+fi
+
+	enabled_by_default=${enabled_by_default}" pkcs12"
+
 # Check whether --enable-pgp was given.
 if test "${enable_pgp+set}" = set; then :
   enableval=$enable_pgp; pgp_given=true
@@ -4637,6 +4760,22 @@ fi
 
 	enabled_by_default=${enabled_by_default}" dnskey"
 
+# Check whether --enable-sshkey was given.
+if test "${enable_sshkey+set}" = set; then :
+  enableval=$enable_sshkey; sshkey_given=true
+		if test x$enableval = xyes; then
+			sshkey=true
+		 else
+			sshkey=false
+		fi
+else
+  sshkey=true
+		sshkey_given=false
+
+fi
+
+	enabled_by_default=${enabled_by_default}" sshkey"
+
 # Check whether --enable-ipseckey was given.
 if test "${enable_ipseckey+set}" = set; then :
   enableval=$enable_ipseckey; ipseckey_given=true
@@ -5529,6 +5668,21 @@ else
 fi
 
 
+# Check whether --enable-kernel-libipsec was given.
+if test "${enable_kernel_libipsec+set}" = set; then :
+  enableval=$enable_kernel_libipsec; kernel_libipsec_given=true
+		if test x$enableval = xyes; then
+			kernel_libipsec=true
+		 else
+			kernel_libipsec=false
+		fi
+else
+  kernel_libipsec=false
+		kernel_libipsec_given=false
+
+fi
+
+
 # Check whether --enable-libipsec was given.
 if test "${enable_libipsec+set}" = set; then :
   enableval=$enable_libipsec; libipsec_given=true
@@ -5914,6 +6068,21 @@ else
 fi
 
 
+# Check whether --enable-keychain was given.
+if test "${enable_keychain+set}" = set; then :
+  enableval=$enable_keychain; keychain_given=true
+		if test x$enableval = xyes; then
+			keychain=true
+		 else
+			keychain=false
+		fi
+else
+  keychain=false
+		keychain_given=false
+
+fi
+
+
 # Check whether --enable-pkcs11 was given.
 if test "${enable_pkcs11+set}" = set; then :
   enableval=$enable_pkcs11; pkcs11_given=true
@@ -6019,6 +6188,21 @@ else
 fi
 
 
+# Check whether --enable-osx-attr was given.
+if test "${enable_osx_attr+set}" = set; then :
+  enableval=$enable_osx_attr; osx_attr_given=true
+		if test x$enableval = xyes; then
+			osx_attr=true
+		 else
+			osx_attr=false
+		fi
+else
+  osx_attr=false
+		osx_attr_given=false
+
+fi
+
+
 # Check whether --enable-android-dns was given.
 if test "${enable_android_dns+set}" = set; then :
   enableval=$enable_android_dns; android_dns_given=true
@@ -6274,6 +6458,21 @@ else
 fi
 
 
+# Check whether --enable-unwind-backtraces was given.
+if test "${enable_unwind_backtraces+set}" = set; then :
+  enableval=$enable_unwind_backtraces; unwind_backtraces_given=true
+		if test x$enableval = xyes; then
+			unwind_backtraces=true
+		 else
+			unwind_backtraces=false
+		fi
+else
+  unwind_backtraces=false
+		unwind_backtraces_given=false
+
+fi
+
+
 # Check whether --enable-unit-tests was given.
 if test "${enable_unit_tests+set}" = set; then :
   enableval=$enable_unit_tests; unit_tests_given=true
@@ -6289,6 +6488,21 @@ else
 fi
 
 
+# Check whether --enable-coverage was given.
+if test "${enable_coverage+set}" = set; then :
+  enableval=$enable_coverage; coverage_given=true
+		if test x$enableval = xyes; then
+			coverage=true
+		 else
+			coverage=false
+		fi
+else
+  coverage=false
+		coverage_given=false
+
+fi
+
+
 # Check whether --enable-tkm was given.
 if test "${enable_tkm+set}" = set; then :
   enableval=$enable_tkm; tkm_given=true
@@ -6304,6 +6518,21 @@ else
 fi
 
 
+# Check whether --enable-cmd was given.
+if test "${enable_cmd+set}" = set; then :
+  enableval=$enable_cmd; cmd_given=true
+		if test x$enableval = xyes; then
+			cmd=true
+		 else
+			cmd=false
+		fi
+else
+  cmd=false
+		cmd_given=false
+
+fi
+
+
 
 # ===================================
 #  option to disable default options
@@ -9022,7 +9251,8 @@ else
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -9423,10 +9653,6 @@ freebsd* | dragonfly*)
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -9465,7 +9691,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -10562,7 +10788,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
 	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
@@ -12124,7 +12357,7 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -14294,17 +14527,6 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -14421,7 +14643,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -15886,6 +16108,10 @@ if test x$xauth_generic_given = xfalse -a x$ikev1 = xfalse; then
 	xauth_generic=false;
 fi
 
+if test x$kernel_libipsec = xtrue; then
+	libipsec=true;
+fi
+
 if test x$eap_aka_3gpp2 = xtrue; then
 	gmp=true;
 fi
@@ -15943,6 +16169,10 @@ if test x$medcli = xtrue; then
 	mediation=true
 fi
 
+if test x$coverage = xtrue; then
+	unit_tests=true
+fi
+
 # ===========================================
 #  check required libraries and header files
 # ===========================================
@@ -19155,6 +19385,57 @@ fi
 
 fi
 
+if test x$unwind_backtraces = xtrue; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lunwind" >&5
+$as_echo_n "checking for main in -lunwind... " >&6; }
+if ${ac_cv_lib_unwind_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lunwind  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_unwind_main=yes
+else
+  ac_cv_lib_unwind_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unwind_main" >&5
+$as_echo "$ac_cv_lib_unwind_main" >&6; }
+if test "x$ac_cv_lib_unwind_main" = xyes; then :
+  LIBS="$LIBS"
+else
+  as_fn_error $? "libunwind not found!" "$LINENO" 5
+fi
+
+	ac_fn_c_check_header_mongrel "$LINENO" "libunwind.h" "ac_cv_header_libunwind_h" "$ac_includes_default"
+if test "x$ac_cv_header_libunwind_h" = xyes; then :
+
+$as_echo "#define HAVE_LIBUNWIND_H /**/" >>confdefs.h
+
+else
+  as_fn_error $? "libunwind.h header not found!" "$LINENO" 5
+fi
+
+
+	UNWINDLIB="-lunwind"
+
+fi
+
  if test "x$dev_headers" != xno; then
   USE_DEV_HEADERS_TRUE=
   USE_DEV_HEADERS_FALSE='#'
@@ -19310,6 +19591,106 @@ fi
 
 fi
 
+if test x$coverage = xtrue; then
+	# Extract the first word of "lcov", so it can be a program name with args.
+set dummy lcov; 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_LCOV+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $LCOV in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LCOV="$LCOV" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/bin:/usr/bin:/usr/local/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_LCOV="$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
+LCOV=$ac_cv_path_LCOV
+if test -n "$LCOV"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5
+$as_echo "$LCOV" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+	if test x$LCOV = x; then
+		as_fn_error $? "lcov not found" "$LINENO" 5
+	fi
+	# Extract the first word of "genhtml", so it can be a program name with args.
+set dummy genhtml; 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_GENHTML+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GENHTML in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GENHTML="$GENHTML" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/bin:/usr/bin:/usr/local/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_GENHTML="$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
+GENHTML=$ac_cv_path_GENHTML
+if test -n "$GENHTML"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5
+$as_echo "$GENHTML" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+	if test x$GENHTML = x; then
+		as_fn_error $? "genhtml not found" "$LINENO" 5
+	fi
+
+	COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage"
+	COVERAGE_LDFLAGS="-fprofile-arcs"
+
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: coverage enabled, adding \"-g -O0\" to CFLAGS" >&5
+$as_echo "$as_me: coverage enabled, adding \"-g -O0\" to CFLAGS" >&6;}
+	CFLAGS="${CFLAGS} -g -O0"
+fi
+
 # ===============================================
 #  collect plugin list for strongSwan components
 # ===============================================
@@ -19332,6 +19713,7 @@ scripts_plugins=
 manager_plugins=
 medsrv_plugins=
 nm_plugins=
+cmd_plugins=
 
 # location specific lists for checksumming,
 # for src/libcharon, src/libhydra and src/libstrongswan
@@ -19354,6 +19736,7 @@ if test x$curl = xtrue; then
 		scepclient_plugins=${scepclient_plugins}" curl"
 		scripts_plugins=${scripts_plugins}" curl"
 		nm_plugins=${nm_plugins}" curl"
+		cmd_plugins=${cmd_plugins}" curl"
 
 	fi
 
@@ -19362,6 +19745,7 @@ if test x$soup = xtrue; then
 		charon_plugins=${charon_plugins}" soup"
 		scripts_plugins=${scripts_plugins}" soup"
 		nm_plugins=${nm_plugins}" soup"
+		cmd_plugins=${cmd_plugins}" soup"
 
 	fi
 
@@ -19378,6 +19762,7 @@ if test x$ldap = xtrue; then
 		scepclient_plugins=${scepclient_plugins}" ldap"
 		scripts_plugins=${scripts_plugins}" ldap"
 		nm_plugins=${nm_plugins}" ldap"
+		cmd_plugins=${cmd_plugins}" ldap"
 
 	fi
 
@@ -19406,6 +19791,7 @@ if test x$pkcs11 = xtrue; then
 		charon_plugins=${charon_plugins}" pkcs11"
 		pki_plugins=${pki_plugins}" pkcs11"
 		nm_plugins=${nm_plugins}" pkcs11"
+		cmd_plugins=${cmd_plugins}" pkcs11"
 
 	fi
 
@@ -19417,6 +19803,7 @@ if test x$aes = xtrue; then
 		pki_plugins=${pki_plugins}" aes"
 		scripts_plugins=${scripts_plugins}" aes"
 		nm_plugins=${nm_plugins}" aes"
+		cmd_plugins=${cmd_plugins}" aes"
 
 	fi
 
@@ -19428,6 +19815,7 @@ if test x$des = xtrue; then
 		pki_plugins=${pki_plugins}" des"
 		scripts_plugins=${scripts_plugins}" des"
 		nm_plugins=${nm_plugins}" des"
+		cmd_plugins=${cmd_plugins}" des"
 
 	fi
 
@@ -19439,6 +19827,19 @@ if test x$blowfish = xtrue; then
 		pki_plugins=${pki_plugins}" blowfish"
 		scripts_plugins=${scripts_plugins}" blowfish"
 		nm_plugins=${nm_plugins}" blowfish"
+		cmd_plugins=${cmd_plugins}" blowfish"
+
+	fi
+
+if test x$rc2 = xtrue; then
+		s_plugins=${s_plugins}" rc2"
+		charon_plugins=${charon_plugins}" rc2"
+		openac_plugins=${openac_plugins}" rc2"
+		scepclient_plugins=${scepclient_plugins}" rc2"
+		pki_plugins=${pki_plugins}" rc2"
+		scripts_plugins=${scripts_plugins}" rc2"
+		nm_plugins=${nm_plugins}" rc2"
+		cmd_plugins=${cmd_plugins}" rc2"
 
 	fi
 
@@ -19452,6 +19853,7 @@ if test x$sha1 = xtrue; then
 		medsrv_plugins=${medsrv_plugins}" sha1"
 		attest_plugins=${attest_plugins}" sha1"
 		nm_plugins=${nm_plugins}" sha1"
+		cmd_plugins=${cmd_plugins}" sha1"
 
 	fi
 
@@ -19465,6 +19867,7 @@ if test x$sha2 = xtrue; then
 		medsrv_plugins=${medsrv_plugins}" sha2"
 		attest_plugins=${attest_plugins}" sha2"
 		nm_plugins=${nm_plugins}" sha2"
+		cmd_plugins=${cmd_plugins}" sha2"
 
 	fi
 
@@ -19476,6 +19879,7 @@ if test x$md4 = xtrue; then
 		scepclient_plugins=${scepclient_plugins}" md4"
 		pki_plugins=${pki_plugins}" md4"
 		nm_plugins=${nm_plugins}" md4"
+		cmd_plugins=${cmd_plugins}" md4"
 
 	fi
 
@@ -19488,6 +19892,7 @@ if test x$md5 = xtrue; then
 		scripts_plugins=${scripts_plugins}" md5"
 		attest_plugins=${attest_plugins}" md5"
 		nm_plugins=${nm_plugins}" md5"
+		cmd_plugins=${cmd_plugins}" md5"
 
 	fi
 
@@ -19501,6 +19906,7 @@ if test x$rdrand = xtrue; then
 		medsrv_plugins=${medsrv_plugins}" rdrand"
 		attest_plugins=${attest_plugins}" rdrand"
 		nm_plugins=${nm_plugins}" rdrand"
+		cmd_plugins=${cmd_plugins}" rdrand"
 
 	fi
 
@@ -19514,6 +19920,7 @@ if test x$random = xtrue; then
 		medsrv_plugins=${medsrv_plugins}" random"
 		attest_plugins=${attest_plugins}" random"
 		nm_plugins=${nm_plugins}" random"
+		cmd_plugins=${cmd_plugins}" random"
 
 	fi
 
@@ -19521,6 +19928,7 @@ if test x$nonce = xtrue; then
 		s_plugins=${s_plugins}" nonce"
 		charon_plugins=${charon_plugins}" nonce"
 		nm_plugins=${nm_plugins}" nonce"
+		cmd_plugins=${cmd_plugins}" nonce"
 
 	fi
 
@@ -19533,6 +19941,7 @@ if test x$x509 = xtrue; then
 		scripts_plugins=${scripts_plugins}" x509"
 		attest_plugins=${attest_plugins}" x509"
 		nm_plugins=${nm_plugins}" x509"
+		cmd_plugins=${cmd_plugins}" x509"
 
 	fi
 
@@ -19540,6 +19949,7 @@ if test x$revocation = xtrue; then
 		s_plugins=${s_plugins}" revocation"
 		charon_plugins=${charon_plugins}" revocation"
 		nm_plugins=${nm_plugins}" revocation"
+		cmd_plugins=${cmd_plugins}" revocation"
 
 	fi
 
@@ -19547,12 +19957,14 @@ if test x$constraints = xtrue; then
 		s_plugins=${s_plugins}" constraints"
 		charon_plugins=${charon_plugins}" constraints"
 		nm_plugins=${nm_plugins}" constraints"
+		cmd_plugins=${cmd_plugins}" constraints"
 
 	fi
 
 if test x$pubkey = xtrue; then
 		s_plugins=${s_plugins}" pubkey"
 		charon_plugins=${charon_plugins}" pubkey"
+		cmd_plugins=${cmd_plugins}" pubkey"
 
 	fi
 
@@ -19567,13 +19979,18 @@ if test x$pkcs1 = xtrue; then
 		medsrv_plugins=${medsrv_plugins}" pkcs1"
 		attest_plugins=${attest_plugins}" pkcs1"
 		nm_plugins=${nm_plugins}" pkcs1"
+		cmd_plugins=${cmd_plugins}" pkcs1"
 
 	fi
 
 if test x$pkcs7 = xtrue; then
 		s_plugins=${s_plugins}" pkcs7"
+		charon_plugins=${charon_plugins}" pkcs7"
 		scepclient_plugins=${scepclient_plugins}" pkcs7"
 		pki_plugins=${pki_plugins}" pkcs7"
+		scripts_plugins=${scripts_plugins}" pkcs7"
+		nm_plugins=${nm_plugins}" pkcs7"
+		cmd_plugins=${cmd_plugins}" pkcs7"
 
 	fi
 
@@ -19588,6 +20005,17 @@ if test x$pkcs8 = xtrue; then
 		medsrv_plugins=${medsrv_plugins}" pkcs8"
 		attest_plugins=${attest_plugins}" pkcs8"
 		nm_plugins=${nm_plugins}" pkcs8"
+		cmd_plugins=${cmd_plugins}" pkcs8"
+
+	fi
+
+if test x$pkcs12 = xtrue; then
+		s_plugins=${s_plugins}" pkcs12"
+		charon_plugins=${charon_plugins}" pkcs12"
+		scepclient_plugins=${scepclient_plugins}" pkcs12"
+		pki_plugins=${pki_plugins}" pkcs12"
+		scripts_plugins=${scripts_plugins}" pkcs12"
+		cmd_plugins=${cmd_plugins}" pkcs12"
 
 	fi
 
@@ -19603,6 +20031,14 @@ if test x$dnskey = xtrue; then
 
 	fi
 
+if test x$sshkey = xtrue; then
+		s_plugins=${s_plugins}" sshkey"
+		charon_plugins=${charon_plugins}" sshkey"
+		nm_plugins=${nm_plugins}" sshkey"
+		cmd_plugins=${cmd_plugins}" sshkey"
+
+	fi
+
 if test x$ipseckey = xtrue; then
 		c_plugins=${c_plugins}" ipseckey"
 		charon_plugins=${charon_plugins}" ipseckey"
@@ -19620,6 +20056,7 @@ if test x$pem = xtrue; then
 		medsrv_plugins=${medsrv_plugins}" pem"
 		attest_plugins=${attest_plugins}" pem"
 		nm_plugins=${nm_plugins}" pem"
+		cmd_plugins=${cmd_plugins}" pem"
 
 	fi
 
@@ -19640,6 +20077,7 @@ if test x$openssl = xtrue; then
 		medsrv_plugins=${medsrv_plugins}" openssl"
 		attest_plugins=${attest_plugins}" openssl"
 		nm_plugins=${nm_plugins}" openssl"
+		cmd_plugins=${cmd_plugins}" openssl"
 
 	fi
 
@@ -19654,6 +20092,7 @@ if test x$gcrypt = xtrue; then
 		medsrv_plugins=${medsrv_plugins}" gcrypt"
 		attest_plugins=${attest_plugins}" gcrypt"
 		nm_plugins=${nm_plugins}" gcrypt"
+		cmd_plugins=${cmd_plugins}" gcrypt"
 
 	fi
 
@@ -19667,6 +20106,7 @@ if test x$af_alg = xtrue; then
 		medsrv_plugins=${medsrv_plugins}" af-alg"
 		attest_plugins=${attest_plugins}" af-alg"
 		nm_plugins=${nm_plugins}" af-alg"
+		cmd_plugins=${cmd_plugins}" af-alg"
 
 	fi
 
@@ -19674,6 +20114,7 @@ if test x$fips_prf = xtrue; then
 		s_plugins=${s_plugins}" fips-prf"
 		charon_plugins=${charon_plugins}" fips-prf"
 		nm_plugins=${nm_plugins}" fips-prf"
+		cmd_plugins=${cmd_plugins}" fips-prf"
 
 	fi
 
@@ -19688,6 +20129,7 @@ if test x$gmp = xtrue; then
 		medsrv_plugins=${medsrv_plugins}" gmp"
 		attest_plugins=${attest_plugins}" gmp"
 		nm_plugins=${nm_plugins}" gmp"
+		cmd_plugins=${cmd_plugins}" gmp"
 
 	fi
 
@@ -19695,6 +20137,14 @@ if test x$agent = xtrue; then
 		s_plugins=${s_plugins}" agent"
 		charon_plugins=${charon_plugins}" agent"
 		nm_plugins=${nm_plugins}" agent"
+		cmd_plugins=${cmd_plugins}" agent"
+
+	fi
+
+if test x$keychain = xtrue; then
+		s_plugins=${s_plugins}" keychain"
+		charon_plugins=${charon_plugins}" keychain"
+		cmd_plugins=${cmd_plugins}" keychain"
 
 	fi
 
@@ -19702,6 +20152,7 @@ if test x$xcbc = xtrue; then
 		s_plugins=${s_plugins}" xcbc"
 		charon_plugins=${charon_plugins}" xcbc"
 		nm_plugins=${nm_plugins}" xcbc"
+		cmd_plugins=${cmd_plugins}" xcbc"
 
 	fi
 
@@ -19709,6 +20160,7 @@ if test x$cmac = xtrue; then
 		s_plugins=${s_plugins}" cmac"
 		charon_plugins=${charon_plugins}" cmac"
 		nm_plugins=${nm_plugins}" cmac"
+		cmd_plugins=${cmd_plugins}" cmac"
 
 	fi
 
@@ -19717,6 +20169,7 @@ if test x$hmac = xtrue; then
 		charon_plugins=${charon_plugins}" hmac"
 		scripts_plugins=${scripts_plugins}" hmac"
 		nm_plugins=${nm_plugins}" hmac"
+		cmd_plugins=${cmd_plugins}" hmac"
 
 	fi
 
@@ -19725,6 +20178,7 @@ if test x$ctr = xtrue; then
 		charon_plugins=${charon_plugins}" ctr"
 		scripts_plugins=${scripts_plugins}" ctr"
 		nm_plugins=${nm_plugins}" ctr"
+		cmd_plugins=${cmd_plugins}" ctr"
 
 	fi
 
@@ -19733,6 +20187,7 @@ if test x$ccm = xtrue; then
 		charon_plugins=${charon_plugins}" ccm"
 		scripts_plugins=${scripts_plugins}" ccm"
 		nm_plugins=${nm_plugins}" ccm"
+		cmd_plugins=${cmd_plugins}" ccm"
 
 	fi
 
@@ -19741,6 +20196,7 @@ if test x$gcm = xtrue; then
 		charon_plugins=${charon_plugins}" gcm"
 		scripts_plugins=${scripts_plugins}" gcm"
 		nm_plugins=${nm_plugins}" gcm"
+		cmd_plugins=${cmd_plugins}" gcm"
 
 	fi
 
@@ -19762,11 +20218,19 @@ if test x$load_tester = xtrue; then
 
 	fi
 
+if test x$kernel_libipsec = xtrue; then
+		c_plugins=${c_plugins}" kernel-libipsec"
+		charon_plugins=${charon_plugins}" kernel-libipsec"
+		cmd_plugins=${cmd_plugins}" kernel-libipsec"
+
+	fi
+
 if test x$kernel_pfkey = xtrue; then
 		h_plugins=${h_plugins}" kernel-pfkey"
 		charon_plugins=${charon_plugins}" kernel-pfkey"
 		starter_plugins=${starter_plugins}" kernel-pfkey"
 		nm_plugins=${nm_plugins}" kernel-pfkey"
+		cmd_plugins=${cmd_plugins}" kernel-pfkey"
 
 	fi
 
@@ -19775,6 +20239,7 @@ if test x$kernel_pfroute = xtrue; then
 		charon_plugins=${charon_plugins}" kernel-pfroute"
 		starter_plugins=${starter_plugins}" kernel-pfroute"
 		nm_plugins=${nm_plugins}" kernel-pfroute"
+		cmd_plugins=${cmd_plugins}" kernel-pfroute"
 
 	fi
 
@@ -19790,12 +20255,14 @@ if test x$kernel_netlink = xtrue; then
 		charon_plugins=${charon_plugins}" kernel-netlink"
 		starter_plugins=${starter_plugins}" kernel-netlink"
 		nm_plugins=${nm_plugins}" kernel-netlink"
+		cmd_plugins=${cmd_plugins}" kernel-netlink"
 
 	fi
 
 if test x$resolve = xtrue; then
 		h_plugins=${h_plugins}" resolve"
 		charon_plugins=${charon_plugins}" resolve"
+		cmd_plugins=${cmd_plugins}" resolve"
 
 	fi
 
@@ -19803,12 +20270,14 @@ if test x$socket_default = xtrue; then
 		c_plugins=${c_plugins}" socket-default"
 		charon_plugins=${charon_plugins}" socket-default"
 		nm_plugins=${nm_plugins}" socket-default"
+		cmd_plugins=${cmd_plugins}" socket-default"
 
 	fi
 
 if test x$socket_dynamic = xtrue; then
 		c_plugins=${c_plugins}" socket-dynamic"
 		charon_plugins=${charon_plugins}" socket-dynamic"
+		cmd_plugins=${cmd_plugins}" socket-dynamic"
 
 	fi
 
@@ -19846,6 +20315,7 @@ if test x$eap_identity = xtrue; then
 		c_plugins=${c_plugins}" eap-identity"
 		charon_plugins=${charon_plugins}" eap-identity"
 		nm_plugins=${nm_plugins}" eap-identity"
+		cmd_plugins=${cmd_plugins}" eap-identity"
 
 	fi
 
@@ -19901,6 +20371,7 @@ if test x$eap_md5 = xtrue; then
 		c_plugins=${c_plugins}" eap-md5"
 		charon_plugins=${charon_plugins}" eap-md5"
 		nm_plugins=${nm_plugins}" eap-md5"
+		cmd_plugins=${cmd_plugins}" eap-md5"
 
 	fi
 
@@ -19908,6 +20379,7 @@ if test x$eap_gtc = xtrue; then
 		c_plugins=${c_plugins}" eap-gtc"
 		charon_plugins=${charon_plugins}" eap-gtc"
 		nm_plugins=${nm_plugins}" eap-gtc"
+		cmd_plugins=${cmd_plugins}" eap-gtc"
 
 	fi
 
@@ -19915,6 +20387,7 @@ if test x$eap_mschapv2 = xtrue; then
 		c_plugins=${c_plugins}" eap-mschapv2"
 		charon_plugins=${charon_plugins}" eap-mschapv2"
 		nm_plugins=${nm_plugins}" eap-mschapv2"
+		cmd_plugins=${cmd_plugins}" eap-mschapv2"
 
 	fi
 
@@ -19934,6 +20407,7 @@ if test x$eap_tls = xtrue; then
 		c_plugins=${c_plugins}" eap-tls"
 		charon_plugins=${charon_plugins}" eap-tls"
 		nm_plugins=${nm_plugins}" eap-tls"
+		cmd_plugins=${cmd_plugins}" eap-tls"
 
 	fi
 
@@ -19941,6 +20415,7 @@ if test x$eap_ttls = xtrue; then
 		c_plugins=${c_plugins}" eap-ttls"
 		charon_plugins=${charon_plugins}" eap-ttls"
 		nm_plugins=${nm_plugins}" eap-ttls"
+		cmd_plugins=${cmd_plugins}" eap-ttls"
 
 	fi
 
@@ -19948,6 +20423,7 @@ if test x$eap_peap = xtrue; then
 		c_plugins=${c_plugins}" eap-peap"
 		charon_plugins=${charon_plugins}" eap-peap"
 		nm_plugins=${nm_plugins}" eap-peap"
+		cmd_plugins=${cmd_plugins}" eap-peap"
 
 	fi
 
@@ -19960,6 +20436,7 @@ if test x$eap_tnc = xtrue; then
 if test x$xauth_generic = xtrue; then
 		c_plugins=${c_plugins}" xauth-generic"
 		charon_plugins=${charon_plugins}" xauth-generic"
+		cmd_plugins=${cmd_plugins}" xauth-generic"
 
 	fi
 
@@ -20047,6 +20524,13 @@ if test x$dhcp = xtrue; then
 
 	fi
 
+if test x$osx_attr = xtrue; then
+		c_plugins=${c_plugins}" osx-attr"
+		charon_plugins=${charon_plugins}" osx-attr"
+		cmd_plugins=${cmd_plugins}" osx-attr"
+
+	fi
+
 if test x$android_dns = xtrue; then
 		c_plugins=${c_plugins}" android-dns"
 		charon_plugins=${charon_plugins}" android-dns"
@@ -20166,6 +20650,7 @@ if test x$unit_tester = xtrue; then
 
 
 
+
 # ======================
 #  set Makefile.am vars
 # ======================
@@ -20236,6 +20721,14 @@ else
   USE_BLOWFISH_FALSE=
 fi
 
+ if test x$rc2 = xtrue; then
+  USE_RC2_TRUE=
+  USE_RC2_FALSE='#'
+else
+  USE_RC2_TRUE='#'
+  USE_RC2_FALSE=
+fi
+
  if test x$md4 = xtrue; then
   USE_MD4_TRUE=
   USE_MD4_FALSE='#'
@@ -20364,6 +20857,14 @@ else
   USE_PKCS8_FALSE=
 fi
 
+ if test x$pkcs12 = xtrue; then
+  USE_PKCS12_TRUE=
+  USE_PKCS12_FALSE='#'
+else
+  USE_PKCS12_TRUE='#'
+  USE_PKCS12_FALSE=
+fi
+
  if test x$pgp = xtrue; then
   USE_PGP_TRUE=
   USE_PGP_FALSE='#'
@@ -20380,6 +20881,14 @@ else
   USE_DNSKEY_FALSE=
 fi
 
+ if test x$sshkey = xtrue; then
+  USE_SSHKEY_TRUE=
+  USE_SSHKEY_FALSE='#'
+else
+  USE_SSHKEY_TRUE='#'
+  USE_SSHKEY_FALSE=
+fi
+
  if test x$pem = xtrue; then
   USE_PEM_TRUE=
   USE_PEM_FALSE='#'
@@ -20460,6 +20969,14 @@ else
   USE_AGENT_FALSE=
 fi
 
+ if test x$keychain = xtrue; then
+  USE_KEYCHAIN_TRUE=
+  USE_KEYCHAIN_FALSE='#'
+else
+  USE_KEYCHAIN_TRUE='#'
+  USE_KEYCHAIN_FALSE=
+fi
+
  if test x$pkcs11 = xtrue; then
   USE_PKCS11_TRUE=
   USE_PKCS11_FALSE='#'
@@ -20535,6 +21052,14 @@ else
   USE_UCI_FALSE=
 fi
 
+ if test x$osx_attr = xtrue; then
+  USE_OSX_ATTR_TRUE=
+  USE_OSX_ATTR_FALSE='#'
+else
+  USE_OSX_ATTR_TRUE='#'
+  USE_OSX_ATTR_FALSE=
+fi
+
  if test x$android_dns = xtrue; then
   USE_ANDROID_DNS_TRUE=
   USE_ANDROID_DNS_FALSE='#'
@@ -20623,6 +21148,14 @@ else
   USE_HA_FALSE=
 fi
 
+ if test x$kernel_libipsec = xtrue; then
+  USE_KERNEL_LIBIPSEC_TRUE=
+  USE_KERNEL_LIBIPSEC_FALSE='#'
+else
+  USE_KERNEL_LIBIPSEC_TRUE='#'
+  USE_KERNEL_LIBIPSEC_FALSE=
+fi
+
  if test x$whitelist = xtrue; then
   USE_WHITELIST_TRUE=
   USE_WHITELIST_FALSE='#'
@@ -21237,7 +21770,7 @@ else
   USE_CONFTEST_FALSE=
 fi
 
- if test x$charon = xtrue -o x$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue -o x$nm = xtrue -o x$tkm = xtrue; then
+ if test x$charon = xtrue -o x$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue; then
   USE_LIBSTRONGSWAN_TRUE=
   USE_LIBSTRONGSWAN_FALSE='#'
 else
@@ -21245,7 +21778,7 @@ else
   USE_LIBSTRONGSWAN_FALSE=
 fi
 
- if test x$charon = xtrue -o x$nm = xtrue -o x$tkm = xtrue; then
+ if test x$charon = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue; then
   USE_LIBHYDRA_TRUE=
   USE_LIBHYDRA_FALSE='#'
 else
@@ -21253,7 +21786,7 @@ else
   USE_LIBHYDRA_FALSE=
 fi
 
- if test x$charon = xtrue -o x$conftest = xtrue -o x$nm = xtrue -o x$tkm = xtrue; then
+ if test x$charon = xtrue -o x$conftest = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue; then
   USE_LIBCHARON_TRUE=
   USE_LIBCHARON_FALSE='#'
 else
@@ -21381,6 +21914,14 @@ else
   MONOLITHIC_FALSE=
 fi
 
+ if test x$enable_silent_rules = xyes; then
+  USE_SILENT_RULES_TRUE=
+  USE_SILENT_RULES_FALSE='#'
+else
+  USE_SILENT_RULES_TRUE='#'
+  USE_SILENT_RULES_FALSE=
+fi
+
  if test x$unit_tests = xtrue; then
   UNITTESTS_TRUE=
   UNITTESTS_FALSE='#'
@@ -21389,6 +21930,14 @@ else
   UNITTESTS_FALSE=
 fi
 
+ if test x$coverage = xtrue; then
+  COVERAGE_TRUE=
+  COVERAGE_FALSE='#'
+else
+  COVERAGE_TRUE='#'
+  COVERAGE_FALSE=
+fi
+
  if test x$tkm = xtrue; then
   USE_TKM_TRUE=
   USE_TKM_FALSE='#'
@@ -21397,6 +21946,14 @@ else
   USE_TKM_FALSE=
 fi
 
+ if test x$cmd = xtrue; then
+  USE_CMD_TRUE=
+  USE_CMD_FALSE='#'
+else
+  USE_CMD_TRUE='#'
+  USE_CMD_FALSE=
+fi
+
 
 # ========================
 #  set global definitions
@@ -21432,7 +21989,7 @@ fi
 #  build Makefiles
 # =================
 
-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/cmac/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/rdrand/Makefile src/libstrongswan/plugins/random/Makefile src/libstrongswan/plugins/nonce/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/pkcs7/Makefile src/libstrongswan/plugins/pkcs8/Makefile src/libstrongswan/plugins/pgp/Makefile src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/Makefile src/libstrongswan/plugins/unbound/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/libipsec/Makefile src/libsimaka/Makefile src/libtls/Makefile src/libradius/Makefile src/libtncif/Makefile src/libtnccs/Makefile src/libpttls/Makefile src/libpts/Makefile src/libpts/plugins/imc_attestation/Makefile src/libpts/plugins/imv_attestation/Makefile src/libimcv/Makefile src/libimcv/plugins/imc_test/Makefile src/libimcv/plugins/imv_test/Makefile src/libimcv/plugins/imc_scanner/Makefile src/libimcv/plugins/imv_scanner/Makefile src/libimcv/plugins/imc_os/Makefile src/libimcv/plugins/imv_os/Makefile src/charon/Makefile src/charon-nm/Makefile src/charon-tkm/Makefile src/libcharon/Makefile src/libcharon/plugins/eap_aka/Makefile src/libcharon/plugins/eap_aka_3gpp2/Makefile src/libcharon/plugins/eap_dynamic/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/xauth_generic/Makefile src/libcharon/plugins/xauth_eap/Makefile src/libcharon/plugins/xauth_pam/Makefile src/libcharon/plugins/xauth_noauth/Makefile src/libcharon/plugins/tnc_ifmap/Makefile src/libcharon/plugins/tnc_pdp/Makefile src/libcharon/plugins/tnc_imc/Makefile src/libcharon/plugins/tnc_imv/Makefile src/libcharon/plugins/tnc_tnccs/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_dynamic/Makefile src/libcharon/plugins/farp/Makefile src/libcharon/plugins/smp/Makefile src/libcharon/plugins/sql/Makefile src/libcharon/plugins/ipseckey/Makefile src/libcharon/plugins/medsrv/Makefile src/libcharon/plugins/medcli/Makefile src/libcharon/plugins/addrblock/Makefile src/libcharon/plugins/unity/Makefile src/libcharon/plugins/uci/Makefile src/libcharon/plugins/ha/Makefile src/libcharon/plugins/whitelist/Makefile src/libcharon/plugins/lookip/Makefile src/libcharon/plugins/error_notify/Makefile src/libcharon/plugins/certexpire/Makefile src/libcharon/plugins/systime_fix/Makefile src/libcharon/plugins/led/Makefile src/libcharon/plugins/duplicheck/Makefile src/libcharon/plugins/coupling/Makefile src/libcharon/plugins/radattr/Makefile src/libcharon/plugins/android_dns/Makefile src/libcharon/plugins/android_log/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/cmac/Makefile src/libstrongswan/plugins/des/Makefile src/libstrongswan/plugins/blowfish/Makefile src/libstrongswan/plugins/rc2/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/rdrand/Makefile src/libstrongswan/plugins/random/Makefile src/libstrongswan/plugins/nonce/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/pkcs7/Makefile src/libstrongswan/plugins/pkcs8/Makefile src/libstrongswan/plugins/pkcs12/Makefile src/libstrongswan/plugins/pgp/Makefile src/libstrongswan/plugins/dnskey/Makefile src/libstrongswan/plugins/sshkey/Makefile src/libstrongswan/plugins/pem/Makefile src/libstrongswan/plugins/curl/Makefile src/libstrongswan/plugins/unbound/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/keychain/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/libstrongswan/tests/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/libipsec/Makefile src/libsimaka/Makefile src/libtls/Makefile src/libradius/Makefile src/libtncif/Makefile src/libtnccs/Makefile src/libpttls/Makefile src/libpts/Makefile src/libpts/plugins/imc_attestation/Makefile src/libpts/plugins/imv_attestation/Makefile src/libimcv/Makefile src/libimcv/plugins/imc_test/Makefile src/libimcv/plugins/imv_test/Makefile src/libimcv/plugins/imc_scanner/Makefile src/libimcv/plugins/imv_scanner/Makefile src/libimcv/plugins/imc_os/Makefile src/libimcv/plugins/imv_os/Makefile src/charon/Makefile src/charon-nm/Makefile src/charon-tkm/Makefile src/charon-cmd/Makefile src/libcharon/Makefile src/libcharon/plugins/eap_aka/Makefile src/libcharon/plugins/eap_aka_3gpp2/Makefile src/libcharon/plugins/eap_dynamic/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/xauth_generic/Makefile src/libcharon/plugins/xauth_eap/Makefile src/libcharon/plugins/xauth_pam/Makefile src/libcharon/plugins/xauth_noauth/Makefile src/libcharon/plugins/tnc_ifmap/Makefile src/libcharon/plugins/tnc_pdp/Makefile src/libcharon/plugins/tnc_imc/Makefile src/libcharon/plugins/tnc_imv/Makefile src/libcharon/plugins/tnc_tnccs/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_dynamic/Makefile src/libcharon/plugins/farp/Makefile src/libcharon/plugins/smp/Makefile src/libcharon/plugins/sql/Makefile src/libcharon/plugins/ipseckey/Makefile src/libcharon/plugins/medsrv/Makefile src/libcharon/plugins/medcli/Makefile src/libcharon/plugins/addrblock/Makefile src/libcharon/plugins/unity/Makefile src/libcharon/plugins/uci/Makefile src/libcharon/plugins/ha/Makefile src/libcharon/plugins/kernel_libipsec/Makefile src/libcharon/plugins/whitelist/Makefile src/libcharon/plugins/lookip/Makefile src/libcharon/plugins/error_notify/Makefile src/libcharon/plugins/certexpire/Makefile src/libcharon/plugins/systime_fix/Makefile src/libcharon/plugins/led/Makefile src/libcharon/plugins/duplicheck/Makefile src/libcharon/plugins/coupling/Makefile src/libcharon/plugins/radattr/Makefile src/libcharon/plugins/osx_attr/Makefile src/libcharon/plugins/android_dns/Makefile src/libcharon/plugins/android_log/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
@@ -21600,6 +22157,10 @@ if test -z "${USE_BLOWFISH_TRUE}" && test -z "${USE_BLOWFISH_FALSE}"; then
   as_fn_error $? "conditional \"USE_BLOWFISH\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_RC2_TRUE}" && test -z "${USE_RC2_FALSE}"; then
+  as_fn_error $? "conditional \"USE_RC2\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_MD4_TRUE}" && test -z "${USE_MD4_FALSE}"; then
   as_fn_error $? "conditional \"USE_MD4\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -21664,6 +22225,10 @@ if test -z "${USE_PKCS8_TRUE}" && test -z "${USE_PKCS8_FALSE}"; then
   as_fn_error $? "conditional \"USE_PKCS8\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_PKCS12_TRUE}" && test -z "${USE_PKCS12_FALSE}"; then
+  as_fn_error $? "conditional \"USE_PKCS12\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_PGP_TRUE}" && test -z "${USE_PGP_FALSE}"; then
   as_fn_error $? "conditional \"USE_PGP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -21672,6 +22237,10 @@ if test -z "${USE_DNSKEY_TRUE}" && test -z "${USE_DNSKEY_FALSE}"; then
   as_fn_error $? "conditional \"USE_DNSKEY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_SSHKEY_TRUE}" && test -z "${USE_SSHKEY_FALSE}"; then
+  as_fn_error $? "conditional \"USE_SSHKEY\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_PEM_TRUE}" && test -z "${USE_PEM_FALSE}"; then
   as_fn_error $? "conditional \"USE_PEM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -21712,6 +22281,10 @@ if test -z "${USE_AGENT_TRUE}" && test -z "${USE_AGENT_FALSE}"; then
   as_fn_error $? "conditional \"USE_AGENT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_KEYCHAIN_TRUE}" && test -z "${USE_KEYCHAIN_FALSE}"; then
+  as_fn_error $? "conditional \"USE_KEYCHAIN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_PKCS11_TRUE}" && test -z "${USE_PKCS11_FALSE}"; then
   as_fn_error $? "conditional \"USE_PKCS11\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -21748,6 +22321,10 @@ if test -z "${USE_UCI_TRUE}" && test -z "${USE_UCI_FALSE}"; then
   as_fn_error $? "conditional \"USE_UCI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_OSX_ATTR_TRUE}" && test -z "${USE_OSX_ATTR_FALSE}"; then
+  as_fn_error $? "conditional \"USE_OSX_ATTR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_ANDROID_DNS_TRUE}" && test -z "${USE_ANDROID_DNS_FALSE}"; then
   as_fn_error $? "conditional \"USE_ANDROID_DNS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -21792,6 +22369,10 @@ 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_KERNEL_LIBIPSEC_TRUE}" && test -z "${USE_KERNEL_LIBIPSEC_FALSE}"; then
+  as_fn_error $? "conditional \"USE_KERNEL_LIBIPSEC\" 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
@@ -22168,14 +22749,26 @@ if test -z "${MONOLITHIC_TRUE}" && test -z "${MONOLITHIC_FALSE}"; then
   as_fn_error $? "conditional \"MONOLITHIC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_SILENT_RULES_TRUE}" && test -z "${USE_SILENT_RULES_FALSE}"; then
+  as_fn_error $? "conditional \"USE_SILENT_RULES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${UNITTESTS_TRUE}" && test -z "${UNITTESTS_FALSE}"; then
   as_fn_error $? "conditional \"UNITTESTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${COVERAGE_TRUE}" && test -z "${COVERAGE_FALSE}"; then
+  as_fn_error $? "conditional \"COVERAGE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_TKM_TRUE}" && test -z "${USE_TKM_FALSE}"; then
   as_fn_error $? "conditional \"USE_TKM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_CMD_TRUE}" && test -z "${USE_CMD_FALSE}"; then
+  as_fn_error $? "conditional \"USE_CMD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -22573,7 +23166,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 5.0.4, which was
+This file was extended by strongSwan $as_me 5.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22639,7 +23232,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 5.0.4
+strongSwan config.status 5.1.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -23059,6 +23652,7 @@ do
     "src/libstrongswan/plugins/cmac/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/cmac/Makefile" ;;
     "src/libstrongswan/plugins/des/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/des/Makefile" ;;
     "src/libstrongswan/plugins/blowfish/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/blowfish/Makefile" ;;
+    "src/libstrongswan/plugins/rc2/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/rc2/Makefile" ;;
     "src/libstrongswan/plugins/md4/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/md4/Makefile" ;;
     "src/libstrongswan/plugins/md5/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/md5/Makefile" ;;
     "src/libstrongswan/plugins/sha1/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/sha1/Makefile" ;;
@@ -23077,8 +23671,10 @@ do
     "src/libstrongswan/plugins/pkcs1/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pkcs1/Makefile" ;;
     "src/libstrongswan/plugins/pkcs7/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pkcs7/Makefile" ;;
     "src/libstrongswan/plugins/pkcs8/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pkcs8/Makefile" ;;
+    "src/libstrongswan/plugins/pkcs12/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pkcs12/Makefile" ;;
     "src/libstrongswan/plugins/pgp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pgp/Makefile" ;;
     "src/libstrongswan/plugins/dnskey/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/dnskey/Makefile" ;;
+    "src/libstrongswan/plugins/sshkey/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/sshkey/Makefile" ;;
     "src/libstrongswan/plugins/pem/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pem/Makefile" ;;
     "src/libstrongswan/plugins/curl/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/curl/Makefile" ;;
     "src/libstrongswan/plugins/unbound/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/unbound/Makefile" ;;
@@ -23090,12 +23686,14 @@ do
     "src/libstrongswan/plugins/openssl/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/openssl/Makefile" ;;
     "src/libstrongswan/plugins/gcrypt/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/gcrypt/Makefile" ;;
     "src/libstrongswan/plugins/agent/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/agent/Makefile" ;;
+    "src/libstrongswan/plugins/keychain/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/keychain/Makefile" ;;
     "src/libstrongswan/plugins/pkcs11/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/pkcs11/Makefile" ;;
     "src/libstrongswan/plugins/ctr/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/ctr/Makefile" ;;
     "src/libstrongswan/plugins/ccm/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/ccm/Makefile" ;;
     "src/libstrongswan/plugins/gcm/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/gcm/Makefile" ;;
     "src/libstrongswan/plugins/af_alg/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/af_alg/Makefile" ;;
     "src/libstrongswan/plugins/test_vectors/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/plugins/test_vectors/Makefile" ;;
+    "src/libstrongswan/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/libstrongswan/tests/Makefile" ;;
     "src/libhydra/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/Makefile" ;;
     "src/libhydra/plugins/attr/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/plugins/attr/Makefile" ;;
     "src/libhydra/plugins/attr_sql/Makefile") CONFIG_FILES="$CONFIG_FILES src/libhydra/plugins/attr_sql/Makefile" ;;
@@ -23124,6 +23722,7 @@ do
     "src/charon/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon/Makefile" ;;
     "src/charon-nm/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon-nm/Makefile" ;;
     "src/charon-tkm/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon-tkm/Makefile" ;;
+    "src/charon-cmd/Makefile") CONFIG_FILES="$CONFIG_FILES src/charon-cmd/Makefile" ;;
     "src/libcharon/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/Makefile" ;;
     "src/libcharon/plugins/eap_aka/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_aka/Makefile" ;;
     "src/libcharon/plugins/eap_aka_3gpp2/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/eap_aka_3gpp2/Makefile" ;;
@@ -23167,6 +23766,7 @@ do
     "src/libcharon/plugins/unity/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/unity/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/kernel_libipsec/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/kernel_libipsec/Makefile" ;;
     "src/libcharon/plugins/whitelist/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/whitelist/Makefile" ;;
     "src/libcharon/plugins/lookip/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/lookip/Makefile" ;;
     "src/libcharon/plugins/error_notify/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/error_notify/Makefile" ;;
@@ -23176,6 +23776,7 @@ do
     "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/radattr/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/radattr/Makefile" ;;
+    "src/libcharon/plugins/osx_attr/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/osx_attr/Makefile" ;;
     "src/libcharon/plugins/android_dns/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/android_dns/Makefile" ;;
     "src/libcharon/plugins/android_log/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/android_log/Makefile" ;;
     "src/libcharon/plugins/maemo/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcharon/plugins/maemo/Makefile" ;;