Merge upstream version 4.5.2

1 files changed, 37 insertions, 19 deletions

diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index e90fa1d0e..9a4b28c3a 100644
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -53,10 +53,7 @@ processing/jobs/rekey_ike_sa_job.c processing/jobs/rekey_ike_sa_job.h \
 processing/jobs/retransmit_job.c processing/jobs/retransmit_job.h \
 processing/jobs/send_dpd_job.c processing/jobs/send_dpd_job.h \
 processing/jobs/send_keepalive_job.c processing/jobs/send_keepalive_job.h \
-<<<<<<< HEAD
-=======
 processing/jobs/start_action_job.c processing/jobs/start_action_job.h \
->>>>>>> upstream/4.5.1
 processing/jobs/roam_job.c processing/jobs/roam_job.h \
 processing/jobs/update_sa_job.c processing/jobs/update_sa_job.h \
 processing/jobs/inactivity_job.c processing/jobs/inactivity_job.h \
@@ -65,6 +62,8 @@ sa/authenticators/eap_authenticator.c sa/authenticators/eap_authenticator.h \
 sa/authenticators/eap/eap_method.c sa/authenticators/eap/eap_method.h \
 sa/authenticators/eap/eap_manager.c sa/authenticators/eap/eap_manager.h \
 sa/authenticators/eap/sim_manager.c sa/authenticators/eap/sim_manager.h \
+sa/authenticators/eap/sim_card.h sa/authenticators/eap/sim_provider.h \
+sa/authenticators/eap/sim_hooks.h \
 sa/authenticators/psk_authenticator.c sa/authenticators/psk_authenticator.h \
 sa/authenticators/pubkey_authenticator.c sa/authenticators/pubkey_authenticator.h \
 sa/child_sa.c sa/child_sa.h \
@@ -91,17 +90,12 @@ sa/tasks/ike_reauth.c sa/tasks/ike_reauth.h \
 sa/tasks/ike_auth_lifetime.c sa/tasks/ike_auth_lifetime.h \
 sa/tasks/ike_vendor.c sa/tasks/ike_vendor.h \
 sa/tasks/task.c sa/tasks/task.h \
-<<<<<<< HEAD
-tnccs/tnccs.c tnccs/tnccs.h \
-tnccs/tnccs_manager.h tnccs/tnccs_manager.c
-=======
 tnc/tncif.h tnc/tncifimc.h tnc/tncifimv.h tnc/tncifimv.c \
 tnc/imc/imc.h tnc/imc/imc_manager.h \
 tnc/imv/imv.h tnc/imv/imv_manager.h \
 tnc/imv/imv_recommendations.c tnc/imv/imv_recommendations.h \
 tnc/tnccs/tnccs.c tnc/tnccs/tnccs.h \
 tnc/tnccs/tnccs_manager.c tnc/tnccs/tnccs_manager.h
->>>>>>> upstream/4.5.1
 
 daemon.lo :		$(top_builddir)/config.status
 
@@ -229,6 +223,13 @@ if MONOLITHIC
 endif
 endif
 
+if USE_EAP_SIM_PCSC
+  SUBDIRS += plugins/eap_sim_pcsc
+if MONOLITHIC
+  libcharon_la_LIBADD += plugins/eap_sim_pcsc/libstrongswan-eap-sim-pcsc.la
+endif
+endif
+
 if USE_EAP_SIMAKA_SQL
   SUBDIRS += plugins/eap_simaka_sql
 if MONOLITHIC
@@ -313,6 +314,13 @@ if MONOLITHIC
 endif
 endif
 
+if USE_EAP_PEAP
+  SUBDIRS += plugins/eap_peap
+if MONOLITHIC
+  libcharon_la_LIBADD += plugins/eap_peap/libstrongswan-eap-peap.la
+endif
+endif
+
 if USE_EAP_TNC
   SUBDIRS += plugins/eap_tnc
 if MONOLITHIC
@@ -330,22 +338,14 @@ endif
 if USE_TNC_IMC
   SUBDIRS += plugins/tnc_imc
 if MONOLITHIC
-<<<<<<< HEAD
-  libcharon_la_LIBADD += plugins/tnc_imc/libstrongswan-tnc_imc.la
-=======
   libcharon_la_LIBADD += plugins/tnc_imc/libstrongswan-tnc-imc.la
->>>>>>> upstream/4.5.1
 endif
 endif
 
 if USE_TNC_IMV
   SUBDIRS += plugins/tnc_imv
 if MONOLITHIC
-<<<<<<< HEAD
-  libcharon_la_LIBADD += plugins/tnc_imv/libstrongswan-tnc_imv.la
-=======
   libcharon_la_LIBADD += plugins/tnc_imv/libstrongswan-tnc-imv.la
->>>>>>> upstream/4.5.1
 endif
 endif
 
@@ -363,8 +363,6 @@ if MONOLITHIC
 endif
 endif
 
-<<<<<<< HEAD
-=======
 if USE_TNCCS_DYNAMIC
   SUBDIRS += plugins/tnccs_dynamic
 if MONOLITHIC
@@ -372,7 +370,6 @@ if MONOLITHIC
 endif
 endif
 
->>>>>>> upstream/4.5.1
 if USE_MEDSRV
   SUBDIRS += plugins/medsrv
 if MONOLITHIC
@@ -422,6 +419,13 @@ if MONOLITHIC
 endif
 endif
 
+if USE_WHITELIST
+  SUBDIRS += plugins/whitelist
+if MONOLITHIC
+  libcharon_la_LIBADD += plugins/whitelist/libstrongswan-whitelist.la
+endif
+endif
+
 if USE_LED
   SUBDIRS += plugins/led
 if MONOLITHIC
@@ -429,6 +433,20 @@ if MONOLITHIC
 endif
 endif
 
+if USE_DUPLICHECK
+  SUBDIRS += plugins/duplicheck
+if MONOLITHIC
+  libcharon_la_LIBADD += plugins/duplicheck/libstrongswan-duplicheck.la
+endif
+endif
+
+if USE_COUPLING
+  SUBDIRS += plugins/coupling
+if MONOLITHIC
+  libcharon_la_LIBADD += plugins/coupling/libstrongswan-coupling.la
+endif
+endif
+
 if USE_UCI
   SUBDIRS += plugins/uci
 if MONOLITHIC