diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/description.txt b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/description.txt
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/description.txt
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/description.txt
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/evaltest.dat b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/evaltest.dat
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/evaltest.dat
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/evaltest.dat
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/clients.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/clients.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/clients.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/clients.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/dictionary b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/dictionary
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/dictionary
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/dictionary
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/dictionary.tnc b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/dictionary.tnc
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/dictionary.tnc
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/dictionary.tnc
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/eap.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/eap.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/eap.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/eap.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/proxy.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/proxy.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/proxy.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/proxy.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/radiusd.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/radiusd.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/radiusd.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/radiusd.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/sites-available/default b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/sites-available/default
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/sites-available/default
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/sites-available/default
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/sites-available/inner-tunnel b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/sites-available/inner-tunnel
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/sites-available/inner-tunnel
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/sites-available/inner-tunnel
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/sites-available/inner-tunnel-second b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/sites-available/inner-tunnel-second
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/sites-available/inner-tunnel-second
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/sites-available/inner-tunnel-second
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/users b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/users
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/raddb/users
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/raddb/users
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/alice/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/alice/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/carol/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/hosts/carol/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/carol/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/hosts/carol/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/carol/etc/ipsec.secrets
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/hosts/carol/etc/tnc/dummyimc.file b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/carol/etc/tnc/dummyimc.file
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/hosts/carol/etc/tnc/dummyimc.file
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/carol/etc/tnc/dummyimc.file
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/hosts/carol/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/carol/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/hosts/carol/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/carol/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/dave/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/dave/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/hosts/dave/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/dave/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/hosts/dave/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/dave/etc/ipsec.secrets
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/hosts/dave/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/hosts/dave/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/hosts/dave/etc/tnc/dummyimc.file b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/dave/etc/tnc/dummyimc.file
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/hosts/dave/etc/tnc/dummyimc.file
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/dave/etc/tnc/dummyimc.file
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/hosts/dave/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/dave/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/hosts/dave/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/dave/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/moon/etc/init.d/iptables b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/moon/etc/init.d/iptables
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/moon/etc/init.d/iptables
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/moon/etc/init.d/iptables
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/moon/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/moon/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/moon/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/moon/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/moon/etc/ipsec.secrets
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/posttest.dat b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/posttest.dat
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/posttest.dat
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/posttest.dat
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/pretest.dat b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/pretest.dat
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/pretest.dat
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/pretest.dat
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/test.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius-block/test.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/test.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius-block/test.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/description.txt b/testing/tests/ikev2/rw-eap-tnc-11-radius/description.txt
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/description.txt
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/description.txt
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/evaltest.dat b/testing/tests/ikev2/rw-eap-tnc-11-radius/evaltest.dat
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/evaltest.dat
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/evaltest.dat
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/clients.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/clients.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/clients.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/clients.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/dictionary b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/dictionary
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/dictionary
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/dictionary
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/dictionary.tnc b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/dictionary.tnc
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/dictionary.tnc
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/dictionary.tnc
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/eap.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/eap.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/eap.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/eap.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/proxy.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/proxy.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/proxy.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/proxy.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/radiusd.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/radiusd.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/radiusd.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/radiusd.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/sites-available/default b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/sites-available/default
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/sites-available/default
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/sites-available/default
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/sites-available/inner-tunnel b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/sites-available/inner-tunnel
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/sites-available/inner-tunnel
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/sites-available/inner-tunnel
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/sites-available/inner-tunnel-second b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/sites-available/inner-tunnel-second
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/sites-available/inner-tunnel-second
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/sites-available/inner-tunnel-second
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/users b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/users
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/raddb/users
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/raddb/users
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/alice/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/carol/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/carol/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/carol/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/ipsec.secrets
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/carol/etc/tnc/dummyimc.file b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/tnc/dummyimc.file
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/carol/etc/tnc/dummyimc.file
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/tnc/dummyimc.file
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/carol/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/carol/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/dave/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/dave/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/dave/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/dave/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/ipsec.secrets
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/dave/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/dave/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/dave/etc/tnc/dummyimc.file b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/tnc/dummyimc.file
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/dave/etc/tnc/dummyimc.file
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/tnc/dummyimc.file
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/dave/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/dave/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/moon/etc/init.d/iptables b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/moon/etc/init.d/iptables
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/moon/etc/init.d/iptables
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/moon/etc/init.d/iptables
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/moon/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/moon/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/moon/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/moon/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/moon/etc/ipsec.secrets
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/posttest.dat b/testing/tests/ikev2/rw-eap-tnc-11-radius/posttest.dat
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/posttest.dat
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/posttest.dat
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/pretest.dat b/testing/tests/ikev2/rw-eap-tnc-11-radius/pretest.dat
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/pretest.dat
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/pretest.dat
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/test.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius/test.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/test.conf
rename to testing/tests/ikev2/rw-eap-tnc-11-radius/test.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc/description.txt b/testing/tests/ikev2/rw-eap-tnc-11/description.txt
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/description.txt
rename to testing/tests/ikev2/rw-eap-tnc-11/description.txt
diff --git a/testing/tests/ikev2/rw-eap-tnc/evaltest.dat b/testing/tests/ikev2/rw-eap-tnc-11/evaltest.dat
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/evaltest.dat
rename to testing/tests/ikev2/rw-eap-tnc-11/evaltest.dat
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-11/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/hosts/carol/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-11/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/carol/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-tnc-11/hosts/carol/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/carol/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-tnc-11/hosts/carol/etc/ipsec.secrets
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-11/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-tnc-11/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/carol/etc/tnc/dummyimc.file b/testing/tests/ikev2/rw-eap-tnc-11/hosts/carol/etc/tnc/dummyimc.file
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/carol/etc/tnc/dummyimc.file
rename to testing/tests/ikev2/rw-eap-tnc-11/hosts/carol/etc/tnc/dummyimc.file
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/carol/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-11/hosts/carol/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/carol/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-11/hosts/carol/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/hosts/dave/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-11/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/hosts/dave/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-11/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/dave/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-tnc-11/hosts/dave/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/dave/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-tnc-11/hosts/dave/etc/ipsec.secrets
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/dave/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-11/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/dave/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-tnc-11/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/dave/etc/tnc/dummyimc.file b/testing/tests/ikev2/rw-eap-tnc-11/hosts/dave/etc/tnc/dummyimc.file
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-tls/hosts/dave/etc/tnc/dummyimc.file
rename to testing/tests/ikev2/rw-eap-tnc-11/hosts/dave/etc/tnc/dummyimc.file
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius/hosts/dave/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-11/hosts/dave/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius/hosts/dave/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-11/hosts/dave/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-11/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-tls/hosts/moon/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-11/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/hosts/moon/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-tnc-11/hosts/moon/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/hosts/moon/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-tnc-11/hosts/moon/etc/ipsec.secrets
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-11/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-tnc-11/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/hosts/moon/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-11/hosts/moon/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/hosts/moon/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-11/hosts/moon/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/posttest.dat b/testing/tests/ikev2/rw-eap-tnc-11/posttest.dat
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/posttest.dat
rename to testing/tests/ikev2/rw-eap-tnc-11/posttest.dat
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/pretest.dat b/testing/tests/ikev2/rw-eap-tnc-11/pretest.dat
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/pretest.dat
rename to testing/tests/ikev2/rw-eap-tnc-11/pretest.dat
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/test.conf b/testing/tests/ikev2/rw-eap-tnc-11/test.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/test.conf
rename to testing/tests/ikev2/rw-eap-tnc-11/test.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/description.txt b/testing/tests/ikev2/rw-eap-tnc-20-block/description.txt
similarity index 77%
rename from testing/tests/ikev2/rw-eap-tnc-block/description.txt
rename to testing/tests/ikev2/rw-eap-tnc-20-block/description.txt
index 51423177a..c7422aa46 100644
--- a/testing/tests/ikev2/rw-eap-tnc-block/description.txt
+++ b/testing/tests/ikev2/rw-eap-tnc-20-block/description.txt
@@ -2,7 +2,10 @@ The roadwarriors carol and dave set up a connection each to gatewa
using EAP-TTLS authentication only with the gateway presenting a server certificate and
the clients doing EAP-MD5 password-based authentication.
In a next step the EAP-TNC protocol is used within the EAP-TTLS tunnel to determine the
-health of carol and dave via the IF-TNCCS 1.1 client-server interface.
+health of carol and dave via the IF-TNCCS 2.0 client-server interface
+compliant with RFC 5793 PB-TNC.
+
carol passes the health test and dave fails. Based on these measurements
carol is authenticated successfully and is granted access to the subnet behind
-moon whereas dave fails the layered EAP authentication and is rejected.
+moon whereas dave fails the layered EAP authentication and is rejected.
+
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/evaltest.dat b/testing/tests/ikev2/rw-eap-tnc-20-block/evaltest.dat
similarity index 83%
rename from testing/tests/ikev2/rw-eap-tnc-block/evaltest.dat
rename to testing/tests/ikev2/rw-eap-tnc-20-block/evaltest.dat
index 2304df23e..f1753c208 100644
--- a/testing/tests/ikev2/rw-eap-tnc-block/evaltest.dat
+++ b/testing/tests/ikev2/rw-eap-tnc-20-block/evaltest.dat
@@ -1,8 +1,8 @@
-carol::cat /var/log/daemon.log::TNCCS-Recommendation.*allow::YES
+carol::cat /var/log/daemon.log::PB-TNC access recommendation is 'Access Allowed'::YES
carol::cat /var/log/daemon.log::EAP method EAP_TTLS succeeded, MSK established::YES
carol::cat /var/log/daemon.log::authentication of 'moon.strongswan.org' with EAP successful::YES
carol::cat /var/log/daemon.log::CHILD_SA home{1} established.*TS 192.168.0.100/32 === 10.1.0.0/16::YES
-dave::cat /var/log/daemon.log::TNCCS-Recommendation.*none::YES
+dave::cat /var/log/daemon.log::PB-TNC access recommendation is 'Access Denied'::YES
dave::cat /var/log/daemon.log::received EAP_FAILURE, EAP authentication failed::YES
dave::cat /var/log/daemon.log::CHILD_SA home{1} established.*TS 192.168.0.200/32 === 10.1.0.0/16::NO
moon::cat /var/log/daemon.log::added group membership 'allow'::YES
diff --git a/testing/tests/ikev2/rw-eap-tnc/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/hosts/carol/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-20-block/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc/hosts/carol/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/carol/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/hosts/carol/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-tnc-20-block/hosts/carol/etc/ipsec.secrets
diff --git a/testing/tests/ikev2/rw-eap-tnc/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/carol/etc/strongswan.conf
similarity index 56%
rename from testing/tests/ikev2/rw-eap-tnc/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-tnc-20-block/hosts/carol/etc/strongswan.conf
index c12143cb1..1a39b8c57 100644
--- a/testing/tests/ikev2/rw-eap-tnc/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/carol/etc/strongswan.conf
@@ -1,6 +1,14 @@
# /etc/strongswan.conf - strongSwan configuration file
charon {
- load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls eap-tnc tnc-imc tnccs-11 updown
+ load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls eap-tnc tnc-imc tnccs-20 updown
multiple_authentication=no
+ plugins {
+ eap-tnc {
+ protocol = tnccs-2.0
+ }
+ tnc-imc {
+ preferred_language = de, en
+ }
+ }
}
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/carol/etc/tnc/dummyimc.file b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/carol/etc/tnc/dummyimc.file
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-tls/hosts/carol/etc/tnc/dummyimc.file
rename to testing/tests/ikev2/rw-eap-tnc-20-block/hosts/carol/etc/tnc/dummyimc.file
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/carol/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/carol/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-tls/hosts/carol/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-20-block/hosts/carol/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc/hosts/dave/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/hosts/dave/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-20-block/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc/hosts/dave/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/dave/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/hosts/dave/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-tnc-20-block/hosts/dave/etc/ipsec.secrets
diff --git a/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/dave/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/dave/etc/strongswan.conf
new file mode 100644
index 000000000..eb7007726
--- /dev/null
+++ b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/dave/etc/strongswan.conf
@@ -0,0 +1,14 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+ load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls eap-tnc tnc-imc tnccs-20 updown
+ multiple_authentication=no
+ plugins {
+ eap-tnc {
+ protocol = tnccs-2.0
+ }
+ tnc-imc {
+ preferred_language = ru, fr, en
+ }
+ }
+}
diff --git a/testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/dave/etc/tnc/dummyimc.file b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/dave/etc/tnc/dummyimc.file
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-radius-block/hosts/dave/etc/tnc/dummyimc.file
rename to testing/tests/ikev2/rw-eap-tnc-20-block/hosts/dave/etc/tnc/dummyimc.file
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/dave/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/dave/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-tls/hosts/dave/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-20-block/hosts/dave/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc-block/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-block/hosts/moon/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-20-block/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/moon/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/moon/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-tls/hosts/moon/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-tnc-20-block/hosts/moon/etc/ipsec.secrets
diff --git a/testing/tests/ikev2/rw-eap-tnc/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/moon/etc/strongswan.conf
similarity index 68%
rename from testing/tests/ikev2/rw-eap-tnc/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-tnc-20-block/hosts/moon/etc/strongswan.conf
index f8700d3c5..20caf8e84 100644
--- a/testing/tests/ikev2/rw-eap-tnc/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
# /etc/strongswan.conf - strongSwan configuration file
charon {
- load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default eap-identity eap-ttls eap-md5 eap-tnc tnccs-11 tnc-imv updown
+ load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default eap-identity eap-ttls eap-md5 eap-tnc tnccs-20 tnc-imv updown
multiple_authentication=no
plugins {
eap-ttls {
@@ -9,5 +9,11 @@ charon {
phase2_piggyback = yes
phase2_tnc = yes
}
+ eap-tnc {
+ protocol = tnccs-2.0
+ }
+ tnc-imv {
+ recommendation_policy = all
+ }
}
}
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/moon/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-20-block/hosts/moon/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-tls/hosts/moon/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-20-block/hosts/moon/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/posttest.dat b/testing/tests/ikev2/rw-eap-tnc-20-block/posttest.dat
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-tls/posttest.dat
rename to testing/tests/ikev2/rw-eap-tnc-20-block/posttest.dat
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/pretest.dat b/testing/tests/ikev2/rw-eap-tnc-20-block/pretest.dat
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-tls/pretest.dat
rename to testing/tests/ikev2/rw-eap-tnc-20-block/pretest.dat
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/test.conf b/testing/tests/ikev2/rw-eap-tnc-20-block/test.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-tls/test.conf
rename to testing/tests/ikev2/rw-eap-tnc-20-block/test.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/description.txt b/testing/tests/ikev2/rw-eap-tnc-20-tls/description.txt
similarity index 65%
rename from testing/tests/ikev2/rw-eap-tnc-tls/description.txt
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/description.txt
index 762b839ee..54590a951 100644
--- a/testing/tests/ikev2/rw-eap-tnc-tls/description.txt
+++ b/testing/tests/ikev2/rw-eap-tnc-20-tls/description.txt
@@ -1,7 +1,10 @@
The roadwarriors carol and dave set up a connection each to gateway moon,
-bothe ends doing certificate-based EAP-TLS authentication only.
+both ends doing certificate-based EAP-TLS authentication only.
In a next step the EAP-TNC protocol is used within the EAP-TTLS tunnel to determine the
-health of carol and dave via the IF-TNCCS 1.1 client-server interface.
+health of carol and dave via the IF-TNCCS 2.0 client-server interface
+compliant with RFC 5793 PB-TNC.
+
carol passes the health test and dave fails. Based on these measurements the
clients are connected by gateway moon to the "rw-allow" and "rw-isolate" subnets,
respectively.
+
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/evaltest.dat b/testing/tests/ikev2/rw-eap-tnc-20-tls/evaltest.dat
similarity index 88%
rename from testing/tests/ikev2/rw-eap-tnc-tls/evaltest.dat
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/evaltest.dat
index cebfff25f..bbc0603b6 100644
--- a/testing/tests/ikev2/rw-eap-tnc-tls/evaltest.dat
+++ b/testing/tests/ikev2/rw-eap-tnc-20-tls/evaltest.dat
@@ -1,8 +1,8 @@
-carol::cat /var/log/daemon.log::TNCCS-Recommendation.*allow::YES
+carol::cat /var/log/daemon.log::PB-TNC access recommendation is 'Access Allowed'::YES
carol::cat /var/log/daemon.log::EAP method EAP_TTLS succeeded, MSK established ::YES
carol::cat /var/log/daemon.log::authentication of 'moon.strongswan.org' with EAP successful::YES
carol::cat /var/log/daemon.log::CHILD_SA home{1} established.*TS 192.168.0.100/32 === 10.1.0.0/28::YES
-dave::cat /var/log/daemon.log::TNCCS-Recommendation.*isolate::YES
+dave::cat /var/log/daemon.log::PB-TNC access recommendation is 'Quarantined'::YES
dave::cat /var/log/daemon.log::EAP method EAP_TTLS succeeded, MSK established ::YES
dave::cat /var/log/daemon.log::authentication of 'moon.strongswan.org' with EAP successful::YES
dave::cat /var/log/daemon.log::CHILD_SA home{1} established.*TS 192.168.0.200/32 === 10.1.0.16/28::YES
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-tls/hosts/carol/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/carol/etc/strongswan.conf
similarity index 65%
rename from testing/tests/ikev2/rw-eap-tnc-tls/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/carol/etc/strongswan.conf
index c12143cb1..b2aa2806a 100644
--- a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/carol/etc/strongswan.conf
@@ -1,6 +1,11 @@
# /etc/strongswan.conf - strongSwan configuration file
charon {
- load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls eap-tnc tnc-imc tnccs-11 updown
+ load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls eap-tnc tnc-imc tnccs-20 updown
multiple_authentication=no
+ plugins {
+ eap-tnc {
+ protocol = tnccs-2.0
+ }
+ }
}
diff --git a/testing/tests/ikev2/rw-eap-tnc/hosts/carol/etc/tnc/dummyimc.file b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/carol/etc/tnc/dummyimc.file
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/hosts/carol/etc/tnc/dummyimc.file
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/carol/etc/tnc/dummyimc.file
diff --git a/testing/tests/ikev2/rw-eap-tnc/hosts/carol/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/carol/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/hosts/carol/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/carol/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/dave/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc-tls/hosts/dave/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/dave/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/dave/etc/strongswan.conf
similarity index 65%
rename from testing/tests/ikev2/rw-eap-tnc-tls/hosts/dave/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/dave/etc/strongswan.conf
index c12143cb1..b2aa2806a 100644
--- a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/dave/etc/strongswan.conf
@@ -1,6 +1,11 @@
# /etc/strongswan.conf - strongSwan configuration file
charon {
- load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls eap-tnc tnc-imc tnccs-11 updown
+ load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls eap-tnc tnc-imc tnccs-20 updown
multiple_authentication=no
+ plugins {
+ eap-tnc {
+ protocol = tnccs-2.0
+ }
+ }
}
diff --git a/testing/tests/ikev2/rw-eap-tnc/hosts/dave/etc/tnc/dummyimc.file b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/dave/etc/tnc/dummyimc.file
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/hosts/dave/etc/tnc/dummyimc.file
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/dave/etc/tnc/dummyimc.file
diff --git a/testing/tests/ikev2/rw-eap-tnc/hosts/dave/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/dave/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/hosts/dave/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/dave/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/hosts/moon/etc/ipsec.conf
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc/hosts/moon/etc/ipsec.secrets b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/moon/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/hosts/moon/etc/ipsec.secrets
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/moon/etc/ipsec.secrets
diff --git a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/moon/etc/strongswan.conf
similarity index 77%
rename from testing/tests/ikev2/rw-eap-tnc-tls/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/moon/etc/strongswan.conf
index 8898a63ba..04a243cad 100644
--- a/testing/tests/ikev2/rw-eap-tnc-tls/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
# /etc/strongswan.conf - strongSwan configuration file
charon {
- load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default eap-identity eap-ttls eap-md5 eap-tnc tnccs-11 tnc-imv updown
+ load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default eap-identity eap-ttls eap-md5 eap-tnc tnccs-20 tnc-imv updown
multiple_authentication=no
plugins {
eap-ttls {
@@ -9,5 +9,8 @@ charon {
phase2_piggyback = yes
phase2_tnc = yes
}
+ eap-tnc {
+ protocol = tnccs-2.0
+ }
}
}
diff --git a/testing/tests/ikev2/rw-eap-tnc/hosts/moon/etc/tnc_config b/testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/moon/etc/tnc_config
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/hosts/moon/etc/tnc_config
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/hosts/moon/etc/tnc_config
diff --git a/testing/tests/ikev2/rw-eap-tnc/posttest.dat b/testing/tests/ikev2/rw-eap-tnc-20-tls/posttest.dat
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/posttest.dat
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/posttest.dat
diff --git a/testing/tests/ikev2/rw-eap-tnc/pretest.dat b/testing/tests/ikev2/rw-eap-tnc-20-tls/pretest.dat
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/pretest.dat
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/pretest.dat
diff --git a/testing/tests/ikev2/rw-eap-tnc/test.conf b/testing/tests/ikev2/rw-eap-tnc-20-tls/test.conf
similarity index 100%
rename from testing/tests/ikev2/rw-eap-tnc/test.conf
rename to testing/tests/ikev2/rw-eap-tnc-20-tls/test.conf
diff --git a/testing/tests/ikev2/rw-eap-tnc-20/description.txt b/testing/tests/ikev2/rw-eap-tnc-20/description.txt
index b8442cb77..6a9c5dde8 100644
--- a/testing/tests/ikev2/rw-eap-tnc-20/description.txt
+++ b/testing/tests/ikev2/rw-eap-tnc-20/description.txt
@@ -2,8 +2,10 @@ The roadwarriors carol and dave set up a connection each to gatewa
using EAP-TTLS authentication only with the gateway presenting a server certificate and
the clients doing EAP-MD5 password-based authentication.
In a next step the EAP-TNC protocol is used within the EAP-TTLS tunnel to determine the
-health of carol and dave via the TNCCS 2.0 PB-TNC (RFC 5793) client-server interface.
+health of carol and dave via the TNCCS 2.0 client-server interface
+compliant with RFC 5793 PB-TNC.
+
carol passes the health test and dave fails. Based on these measurements the
clients are connected by gateway moon to the "rw-allow" and "rw-isolate" subnets,
respectively.
-
+
diff --git a/testing/tests/ikev2/rw-eap-tnc-20/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-20/hosts/carol/etc/strongswan.conf
index d8467c34c..b2aa2806a 100644
--- a/testing/tests/ikev2/rw-eap-tnc-20/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ikev2/rw-eap-tnc-20/hosts/carol/etc/strongswan.conf
@@ -6,7 +6,6 @@ charon {
plugins {
eap-tnc {
protocol = tnccs-2.0
- max_message_count = 4
}
}
}
diff --git a/testing/tests/ikev2/rw-eap-tnc-20/hosts/dave/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-20/hosts/dave/etc/strongswan.conf
index d8467c34c..b2aa2806a 100644
--- a/testing/tests/ikev2/rw-eap-tnc-20/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/ikev2/rw-eap-tnc-20/hosts/dave/etc/strongswan.conf
@@ -6,7 +6,6 @@ charon {
plugins {
eap-tnc {
protocol = tnccs-2.0
- max_message_count = 4
}
}
}
diff --git a/testing/tests/ikev2/rw-eap-tnc-20/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-20/hosts/moon/etc/strongswan.conf
index 9a629edc2..b76c1cd55 100644
--- a/testing/tests/ikev2/rw-eap-tnc-20/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ikev2/rw-eap-tnc-20/hosts/moon/etc/strongswan.conf
@@ -11,8 +11,6 @@ charon {
}
eap-tnc {
protocol = tnccs-2.0
- max_message_count = 4
- recommendation_policy = any
}
}
}
diff --git a/testing/tests/ikev2/rw-eap-tnc/hosts/dave/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc/hosts/dave/etc/strongswan.conf
deleted file mode 100644
index c12143cb1..000000000
--- a/testing/tests/ikev2/rw-eap-tnc/hosts/dave/etc/strongswan.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/strongswan.conf - strongSwan configuration file
-
-charon {
- load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-default eap-identity eap-md5 eap-ttls eap-tnc tnc-imc tnccs-11 updown
- multiple_authentication=no
-}