From 52ba840d5c65eab5a9f3527c3b02783227baef91 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Wed, 6 Jul 2011 21:55:17 +0200
Subject: [PATCH] adapted tnc scenarios to new imcvs library path

---
 .../tnccs-11-radius-block/hosts/alice/etc/tnc_config   |  4 ++--
 .../tnccs-11-radius-block/hosts/carol/etc/tnc_config   |  5 ++---
 .../tnccs-11-radius-block/hosts/dave/etc/tnc_config    |  5 ++---
 .../tnccs-11-radius/hosts/alice/etc/strongswan.conf    |  5 +++++
 .../tnc/tnccs-11-radius/hosts/alice/etc/tnc_config     |  5 +++--
 .../tnc/tnccs-11-radius/hosts/carol/etc/tnc_config     |  3 ++-
 .../tnc/tnccs-11-radius/hosts/dave/etc/tnc_config      |  3 ++-
 testing/tests/tnc/tnccs-11/hosts/carol/etc/tnc_config  |  3 ++-
 testing/tests/tnc/tnccs-11/hosts/dave/etc/tnc_config   |  3 ++-
 .../tests/tnc/tnccs-11/hosts/moon/etc/strongswan.conf  |  5 +++++
 testing/tests/tnc/tnccs-11/hosts/moon/etc/tnc_config   |  3 ++-
 .../tnc/tnccs-20-block/hosts/carol/etc/tnc_config      |  4 ++--
 .../tests/tnc/tnccs-20-block/hosts/dave/etc/tnc_config |  4 ++--
 .../tests/tnc/tnccs-20-block/hosts/moon/etc/tnc_config |  6 +++---
 .../tnccs-20-client-retry/hosts/carol/etc/tnc_config   |  3 ++-
 .../tnccs-20-client-retry/hosts/dave/etc/tnc_config    |  3 ++-
 .../hosts/moon/etc/strongswan.conf                     |  5 +++++
 .../tnccs-20-client-retry/hosts/moon/etc/tnc_config    |  5 +++--
 .../tnccs-20-server-retry/hosts/carol/etc/tnc_config   |  3 ++-
 .../tnccs-20-server-retry/hosts/dave/etc/tnc_config    |  3 ++-
 .../hosts/moon/etc/strongswan.conf                     |  5 +++++
 .../tnccs-20-server-retry/hosts/moon/etc/tnc_config    |  5 +++--
 .../tests/tnc/tnccs-20-tls/hosts/carol/etc/tnc_config  |  3 ++-
 .../tests/tnc/tnccs-20-tls/hosts/dave/etc/tnc_config   |  3 ++-
 .../tnc/tnccs-20-tls/hosts/moon/etc/strongswan.conf    | 10 ++++++++++
 .../tests/tnc/tnccs-20-tls/hosts/moon/etc/tnc_config   |  3 ++-
 testing/tests/tnc/tnccs-20/hosts/carol/etc/tnc_config  |  4 ++--
 testing/tests/tnc/tnccs-20/hosts/dave/etc/tnc_config   |  4 ++--
 testing/tests/tnc/tnccs-20/hosts/moon/etc/tnc_config   |  6 +++---
 .../tests/tnc/tnccs-dynamic/hosts/carol/etc/tnc_config |  3 ++-
 .../tests/tnc/tnccs-dynamic/hosts/dave/etc/tnc_config  |  3 ++-
 .../tnc/tnccs-dynamic/hosts/moon/etc/strongswan.conf   | 10 ++++++++++
 .../tests/tnc/tnccs-dynamic/hosts/moon/etc/tnc_config  |  3 ++-
 33 files changed, 99 insertions(+), 43 deletions(-)

diff --git a/testing/tests/tnc/tnccs-11-radius-block/hosts/alice/etc/tnc_config b/testing/tests/tnc/tnccs-11-radius-block/hosts/alice/etc/tnc_config
index 4e300a3d2..da732f68b 100644
--- a/testing/tests/tnc/tnccs-11-radius-block/hosts/alice/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-11-radius-block/hosts/alice/etc/tnc_config
@@ -1,4 +1,4 @@
 #IMV configuration file for strongSwan client 
 
-IMV "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imv-test.so
-IMV "Scanner"	/usr/local/libexec/ipsec/plugins/libstrongswan-imv-scanner.so
+IMV "Test"	/usr/local/lib/ipsec/imcvs/imv-test.so
+IMV "Scanner"	/usr/local/lib/ipsec/imcvs/imv-scanner.so
diff --git a/testing/tests/tnc/tnccs-11-radius-block/hosts/carol/etc/tnc_config b/testing/tests/tnc/tnccs-11-radius-block/hosts/carol/etc/tnc_config
index dc8f429bd..6166552f5 100644
--- a/testing/tests/tnc/tnccs-11-radius-block/hosts/carol/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-11-radius-block/hosts/carol/etc/tnc_config
@@ -1,5 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
-IMC "Scanner"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-scanner.so
-
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-11-radius-block/hosts/dave/etc/tnc_config b/testing/tests/tnc/tnccs-11-radius-block/hosts/dave/etc/tnc_config
index dc8f429bd..6166552f5 100644
--- a/testing/tests/tnc/tnccs-11-radius-block/hosts/dave/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-11-radius-block/hosts/dave/etc/tnc_config
@@ -1,5 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
-IMC "Scanner"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-scanner.so
-
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-11-radius/hosts/alice/etc/strongswan.conf b/testing/tests/tnc/tnccs-11-radius/hosts/alice/etc/strongswan.conf
index 323bc37d7..5d586066b 100644
--- a/testing/tests/tnc/tnccs-11-radius/hosts/alice/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11-radius/hosts/alice/etc/strongswan.conf
@@ -6,5 +6,10 @@ libimcv {
     imv-test {
       rounds = 1 
     }
+    imv-scanner {
+      closed_port_policy = yes
+      tcp_ports = 22
+      udp_ports = 500 4500
+    }
   }
 }
diff --git a/testing/tests/tnc/tnccs-11-radius/hosts/alice/etc/tnc_config b/testing/tests/tnc/tnccs-11-radius/hosts/alice/etc/tnc_config
index 1bd0757e7..da732f68b 100644
--- a/testing/tests/tnc/tnccs-11-radius/hosts/alice/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-11-radius/hosts/alice/etc/tnc_config
@@ -1,3 +1,4 @@
-#IMV configuration file for TNC@FHH-TNC-Server
+#IMV configuration file for strongSwan client 
 
-IMV "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imv-test.so
+IMV "Test"	/usr/local/lib/ipsec/imcvs/imv-test.so
+IMV "Scanner"	/usr/local/lib/ipsec/imcvs/imv-scanner.so
diff --git a/testing/tests/tnc/tnccs-11-radius/hosts/carol/etc/tnc_config b/testing/tests/tnc/tnccs-11-radius/hosts/carol/etc/tnc_config
index a39922ddb..6166552f5 100644
--- a/testing/tests/tnc/tnccs-11-radius/hosts/carol/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-11-radius/hosts/carol/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-11-radius/hosts/dave/etc/tnc_config b/testing/tests/tnc/tnccs-11-radius/hosts/dave/etc/tnc_config
index a39922ddb..6166552f5 100644
--- a/testing/tests/tnc/tnccs-11-radius/hosts/dave/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-11-radius/hosts/dave/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-11/hosts/carol/etc/tnc_config b/testing/tests/tnc/tnccs-11/hosts/carol/etc/tnc_config
index a39922ddb..6166552f5 100644
--- a/testing/tests/tnc/tnccs-11/hosts/carol/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-11/hosts/carol/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-11/hosts/dave/etc/tnc_config b/testing/tests/tnc/tnccs-11/hosts/dave/etc/tnc_config
index a39922ddb..6166552f5 100644
--- a/testing/tests/tnc/tnccs-11/hosts/dave/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-11/hosts/dave/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-11/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-11/hosts/moon/etc/strongswan.conf
index 4565c2d01..b80028090 100644
--- a/testing/tests/tnc/tnccs-11/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11/hosts/moon/etc/strongswan.conf
@@ -17,5 +17,10 @@ libimcv {
     imv-test {
       rounds = 1
     }
+    imv-scanner {
+      closed_port_policy = yes
+      tcp_ports = 22
+      udp_ports = 500 4500
+    }
   }
 }
diff --git a/testing/tests/tnc/tnccs-11/hosts/moon/etc/tnc_config b/testing/tests/tnc/tnccs-11/hosts/moon/etc/tnc_config
index 5028bc8c9..da732f68b 100644
--- a/testing/tests/tnc/tnccs-11/hosts/moon/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-11/hosts/moon/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMV configuration file for strongSwan client 
 
-IMV "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imv-test.so
+IMV "Test"	/usr/local/lib/ipsec/imcvs/imv-test.so
+IMV "Scanner"	/usr/local/lib/ipsec/imcvs/imv-scanner.so
diff --git a/testing/tests/tnc/tnccs-20-block/hosts/carol/etc/tnc_config b/testing/tests/tnc/tnccs-20-block/hosts/carol/etc/tnc_config
index b02ff820c..6166552f5 100644
--- a/testing/tests/tnc/tnccs-20-block/hosts/carol/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20-block/hosts/carol/etc/tnc_config
@@ -1,4 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
-IMC "Scanner"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-scanner.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-20-block/hosts/dave/etc/tnc_config b/testing/tests/tnc/tnccs-20-block/hosts/dave/etc/tnc_config
index b02ff820c..6166552f5 100644
--- a/testing/tests/tnc/tnccs-20-block/hosts/dave/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20-block/hosts/dave/etc/tnc_config
@@ -1,4 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
-IMC "Scanner"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-scanner.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-20-block/hosts/moon/etc/tnc_config b/testing/tests/tnc/tnccs-20-block/hosts/moon/etc/tnc_config
index d904fbe4c..da732f68b 100644
--- a/testing/tests/tnc/tnccs-20-block/hosts/moon/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20-block/hosts/moon/etc/tnc_config
@@ -1,4 +1,4 @@
-#IMV configuration file for strongSwan server 
+#IMV configuration file for strongSwan client 
 
-IMV "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imv-test.so
-IMV "Scanner"	/usr/local/libexec/ipsec/plugins/libstrongswan-imv-scanner.so
+IMV "Test"	/usr/local/lib/ipsec/imcvs/imv-test.so
+IMV "Scanner"	/usr/local/lib/ipsec/imcvs/imv-scanner.so
diff --git a/testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/tnc_config b/testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/tnc_config
index d3d574c17..6166552f5 100644
--- a/testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/tnc_config b/testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/tnc_config
index d3d574c17..6166552f5 100644
--- a/testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/strongswan.conf
index 933bac86b..ddc30f76d 100644
--- a/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/strongswan.conf
@@ -20,5 +20,10 @@ libimcv {
     imv-test {
       rounds = 0 
     }
+    imv-scanner {
+      closed_port_policy = yes
+      tcp_ports = 22
+      udp_ports = 500 4500
+    }
   }
 }
diff --git a/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/tnc_config b/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/tnc_config
index 0b5ff5740..da732f68b 100644
--- a/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/tnc_config
@@ -1,3 +1,4 @@
-#IMV configuration file for strongSwan server 
+#IMV configuration file for strongSwan client 
 
-IMV "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imv-test.so
+IMV "Test"	/usr/local/lib/ipsec/imcvs/imv-test.so
+IMV "Scanner"	/usr/local/lib/ipsec/imcvs/imv-scanner.so
diff --git a/testing/tests/tnc/tnccs-20-server-retry/hosts/carol/etc/tnc_config b/testing/tests/tnc/tnccs-20-server-retry/hosts/carol/etc/tnc_config
index d3d574c17..6166552f5 100644
--- a/testing/tests/tnc/tnccs-20-server-retry/hosts/carol/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20-server-retry/hosts/carol/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-20-server-retry/hosts/dave/etc/tnc_config b/testing/tests/tnc/tnccs-20-server-retry/hosts/dave/etc/tnc_config
index d3d574c17..6166552f5 100644
--- a/testing/tests/tnc/tnccs-20-server-retry/hosts/dave/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20-server-retry/hosts/dave/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-20-server-retry/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-server-retry/hosts/moon/etc/strongswan.conf
index 933bac86b..ddc30f76d 100644
--- a/testing/tests/tnc/tnccs-20-server-retry/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-server-retry/hosts/moon/etc/strongswan.conf
@@ -20,5 +20,10 @@ libimcv {
     imv-test {
       rounds = 0 
     }
+    imv-scanner {
+      closed_port_policy = yes
+      tcp_ports = 22
+      udp_ports = 500 4500
+    }
   }
 }
diff --git a/testing/tests/tnc/tnccs-20-server-retry/hosts/moon/etc/tnc_config b/testing/tests/tnc/tnccs-20-server-retry/hosts/moon/etc/tnc_config
index 0b5ff5740..da732f68b 100644
--- a/testing/tests/tnc/tnccs-20-server-retry/hosts/moon/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20-server-retry/hosts/moon/etc/tnc_config
@@ -1,3 +1,4 @@
-#IMV configuration file for strongSwan server 
+#IMV configuration file for strongSwan client 
 
-IMV "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imv-test.so
+IMV "Test"	/usr/local/lib/ipsec/imcvs/imv-test.so
+IMV "Scanner"	/usr/local/lib/ipsec/imcvs/imv-scanner.so
diff --git a/testing/tests/tnc/tnccs-20-tls/hosts/carol/etc/tnc_config b/testing/tests/tnc/tnccs-20-tls/hosts/carol/etc/tnc_config
index a39922ddb..6166552f5 100644
--- a/testing/tests/tnc/tnccs-20-tls/hosts/carol/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20-tls/hosts/carol/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-20-tls/hosts/dave/etc/tnc_config b/testing/tests/tnc/tnccs-20-tls/hosts/dave/etc/tnc_config
index a39922ddb..6166552f5 100644
--- a/testing/tests/tnc/tnccs-20-tls/hosts/dave/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20-tls/hosts/dave/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-20-tls/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-tls/hosts/moon/etc/strongswan.conf
index 04a243cad..c9d8d2c8c 100644
--- a/testing/tests/tnc/tnccs-20-tls/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-tls/hosts/moon/etc/strongswan.conf
@@ -14,3 +14,13 @@ charon {
     }
   }
 }
+
+libimcv {
+  plugins {
+    imv-scanner {
+      closed_port_policy = no
+      tcp_ports = 80 443
+      udp_ports =
+    }
+  }
+}
diff --git a/testing/tests/tnc/tnccs-20-tls/hosts/moon/etc/tnc_config b/testing/tests/tnc/tnccs-20-tls/hosts/moon/etc/tnc_config
index 5028bc8c9..da732f68b 100644
--- a/testing/tests/tnc/tnccs-20-tls/hosts/moon/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20-tls/hosts/moon/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMV configuration file for strongSwan client 
 
-IMV "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imv-test.so
+IMV "Test"	/usr/local/lib/ipsec/imcvs/imv-test.so
+IMV "Scanner"	/usr/local/lib/ipsec/imcvs/imv-scanner.so
diff --git a/testing/tests/tnc/tnccs-20/hosts/carol/etc/tnc_config b/testing/tests/tnc/tnccs-20/hosts/carol/etc/tnc_config
index b02ff820c..6166552f5 100644
--- a/testing/tests/tnc/tnccs-20/hosts/carol/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20/hosts/carol/etc/tnc_config
@@ -1,4 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
-IMC "Scanner"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-scanner.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-20/hosts/dave/etc/tnc_config b/testing/tests/tnc/tnccs-20/hosts/dave/etc/tnc_config
index b02ff820c..6166552f5 100644
--- a/testing/tests/tnc/tnccs-20/hosts/dave/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20/hosts/dave/etc/tnc_config
@@ -1,4 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
-IMC "Scanner"	/usr/local/libexec/ipsec/plugins/libstrongswan-imc-scanner.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-20/hosts/moon/etc/tnc_config b/testing/tests/tnc/tnccs-20/hosts/moon/etc/tnc_config
index d904fbe4c..da732f68b 100644
--- a/testing/tests/tnc/tnccs-20/hosts/moon/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-20/hosts/moon/etc/tnc_config
@@ -1,4 +1,4 @@
-#IMV configuration file for strongSwan server 
+#IMV configuration file for strongSwan client 
 
-IMV "Test"	/usr/local/libexec/ipsec/plugins/libstrongswan-imv-test.so
-IMV "Scanner"	/usr/local/libexec/ipsec/plugins/libstrongswan-imv-scanner.so
+IMV "Test"	/usr/local/lib/ipsec/imcvs/imv-test.so
+IMV "Scanner"	/usr/local/lib/ipsec/imcvs/imv-scanner.so
diff --git a/testing/tests/tnc/tnccs-dynamic/hosts/carol/etc/tnc_config b/testing/tests/tnc/tnccs-dynamic/hosts/carol/etc/tnc_config
index a39922ddb..6166552f5 100644
--- a/testing/tests/tnc/tnccs-dynamic/hosts/carol/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-dynamic/hosts/carol/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-dynamic/hosts/dave/etc/tnc_config b/testing/tests/tnc/tnccs-dynamic/hosts/dave/etc/tnc_config
index a39922ddb..6166552f5 100644
--- a/testing/tests/tnc/tnccs-dynamic/hosts/dave/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-dynamic/hosts/dave/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMC configuration file for strongSwan client 
 
-IMC "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so
+IMC "Test"	/usr/local/lib/ipsec/imcvs/imc-test.so
+IMC "Scanner"	/usr/local/lib/ipsec/imcvs/imc-scanner.so
diff --git a/testing/tests/tnc/tnccs-dynamic/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-dynamic/hosts/moon/etc/strongswan.conf
index a1a4a4747..2c9b33a91 100644
--- a/testing/tests/tnc/tnccs-dynamic/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-dynamic/hosts/moon/etc/strongswan.conf
@@ -14,3 +14,13 @@ charon {
     }
   }
 }
+
+libimcv {
+  plugins {
+    imv-scanner {
+      closed_port_policy = yes 
+      tcp_ports = 22 
+      udp_ports = 500 4500
+    }
+  }
+}
diff --git a/testing/tests/tnc/tnccs-dynamic/hosts/moon/etc/tnc_config b/testing/tests/tnc/tnccs-dynamic/hosts/moon/etc/tnc_config
index 5028bc8c9..da732f68b 100644
--- a/testing/tests/tnc/tnccs-dynamic/hosts/moon/etc/tnc_config
+++ b/testing/tests/tnc/tnccs-dynamic/hosts/moon/etc/tnc_config
@@ -1,3 +1,4 @@
 #IMV configuration file for strongSwan client 
 
-IMV "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imv-test.so
+IMV "Test"	/usr/local/lib/ipsec/imcvs/imv-test.so
+IMV "Scanner"	/usr/local/lib/ipsec/imcvs/imv-scanner.so