3 files changed, 9 insertions, 32 deletions
diff --git a/testing/tests/tnc/tnccs-dynamic/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-dynamic/hosts/carol/etc/strongswan.conf
index e6f5ad365..f4ea047ec 100644
--- a/testing/tests/tnc/tnccs-dynamic/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-dynamic/hosts/carol/etc/strongswan.conf
@@ -2,20 +2,14 @@
 
 charon {
   load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls eap-tnc tnc-imc tnc-tnccs tnccs-11 updown
+
   multiple_authentication=no
+  integrity_test = yes
+
   plugins {
     eap-tnc {
       protocol = tnccs-1.1
     }
-  }
-}
-
-libstrongswan {
-  integrity_test = yes
-}
-
-libimcv {
-  plugins {
     imc-test {
       command = allow
     }
diff --git a/testing/tests/tnc/tnccs-dynamic/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-dynamic/hosts/dave/etc/strongswan.conf
index db91eace4..4c738ce42 100644
--- a/testing/tests/tnc/tnccs-dynamic/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-dynamic/hosts/dave/etc/strongswan.conf
@@ -2,20 +2,14 @@
 
 charon {
   load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls eap-tnc tnc-imc tnc-tnccs tnccs-20 updown
+
   multiple_authentication=no
+  integrity_test = yes
+
   plugins {
     eap-tnc {
       protocol = tnccs-2.0
     }
-  }
-}
-
-libstrongswan {
-  integrity_test = yes
-}
-
-libimcv {
-  plugins {
     imc-test {
       command = isolate
     }
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 3fc6c3a4b..0b1cf10eb 100644
--- a/testing/tests/tnc/tnccs-dynamic/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-dynamic/hosts/moon/etc/strongswan.conf
@@ -2,7 +2,10 @@
 
 charon {
   load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default eap-identity eap-ttls eap-md5 eap-tnc tnc-tnccs tnccs-dynamic tnccs-11 tnccs-20 tnc-imv updown
+
   multiple_authentication=no
+  integrity_test = yes
+
   plugins {
     eap-ttls {
       phase2_method = md5
@@ -14,17 +17,3 @@ charon {
     }
   }
 }
-
-libstrongswan {
-  integrity_test = yes
-}
-
-libimcv {
-  plugins {
-    imv-scanner {
-      closed_port_policy = yes 
-      tcp_ports = 22 
-      udp_ports = 500 4500
-    }
-  }
-}