diff options
11 files changed, 30 insertions, 4 deletions
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 a39922ddb..b02ff820c 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,3 +1,4 @@ #IMC configuration file for strongSwan client -IMC "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so +IMC "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so +IMC "Scanner" /usr/local/libexec/ipsec/plugins/libstrongswan-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 a39922ddb..b02ff820c 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,3 +1,4 @@ #IMC configuration file for strongSwan client -IMC "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so +IMC "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-test.so +IMC "Scanner" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-scanner.so diff --git a/testing/tests/tnc/tnccs-20-block/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-block/hosts/moon/etc/strongswan.conf index 20caf8e84..45ec18920 100644 --- a/testing/tests/tnc/tnccs-20-block/hosts/moon/etc/strongswan.conf +++ b/testing/tests/tnc/tnccs-20-block/hosts/moon/etc/strongswan.conf @@ -17,3 +17,13 @@ charon { } } } + +libimcv { + plugins { + imv-scanner { + closed_port_policy = yes + tcp_ports = 22 + udp_ports = 500 4500 + } + } +} 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 5028bc8c9..d904fbe4c 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,3 +1,4 @@ -#IMV configuration file for strongSwan client +#IMV configuration file for strongSwan server -IMV "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imv-test.so +IMV "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imv-test.so +IMV "Scanner" /usr/local/libexec/ipsec/plugins/libstrongswan-imv-scanner.so diff --git a/testing/tests/tnc/tnccs-20-block/posttest.dat b/testing/tests/tnc/tnccs-20-block/posttest.dat index 7cebd7f25..50bb7e117 100644 --- a/testing/tests/tnc/tnccs-20-block/posttest.dat +++ b/testing/tests/tnc/tnccs-20-block/posttest.dat @@ -4,3 +4,4 @@ dave::ipsec stop moon::/etc/init.d/iptables stop 2> /dev/null carol::/etc/init.d/iptables stop 2> /dev/null dave::/etc/init.d/iptables stop 2> /dev/null +dave::/etc/init.d/apache2 stop 2> /dev/null diff --git a/testing/tests/tnc/tnccs-20-block/pretest.dat b/testing/tests/tnc/tnccs-20-block/pretest.dat index c332f131b..7b0a42fcd 100644 --- a/testing/tests/tnc/tnccs-20-block/pretest.dat +++ b/testing/tests/tnc/tnccs-20-block/pretest.dat @@ -1,6 +1,7 @@ moon::/etc/init.d/iptables start 2> /dev/null carol::/etc/init.d/iptables start 2> /dev/null dave::/etc/init.d/iptables start 2> /dev/null +dave::/etc/init.d/apache2 start 2> /dev/null moon::cat /etc/tnc_config carol::cat /etc/tnc_config dave::cat /etc/tnc_config 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 d3d574c17..b02ff820c 100644 --- a/testing/tests/tnc/tnccs-20/hosts/carol/etc/tnc_config +++ b/testing/tests/tnc/tnccs-20/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 "Scanner" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-scanner.so diff --git a/testing/tests/tnc/tnccs-20/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20/hosts/dave/etc/strongswan.conf index ef052cefa..1f907dfdc 100644 --- a/testing/tests/tnc/tnccs-20/hosts/dave/etc/strongswan.conf +++ b/testing/tests/tnc/tnccs-20/hosts/dave/etc/strongswan.conf @@ -7,6 +7,9 @@ charon { eap-tnc { protocol = tnccs-2.0 } + tnc-imc { + preferred_language = ru, pl , de + } } } 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 d3d574c17..b02ff820c 100644 --- a/testing/tests/tnc/tnccs-20/hosts/dave/etc/tnc_config +++ b/testing/tests/tnc/tnccs-20/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 "Scanner" /usr/local/libexec/ipsec/plugins/libstrongswan-imc-scanner.so diff --git a/testing/tests/tnc/tnccs-20/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20/hosts/moon/etc/strongswan.conf index eb615ff23..f34057622 100644 --- a/testing/tests/tnc/tnccs-20/hosts/moon/etc/strongswan.conf +++ b/testing/tests/tnc/tnccs-20/hosts/moon/etc/strongswan.conf @@ -20,5 +20,10 @@ libimcv { imv-test { rounds = 1 } + imv-scanner { + closed_port_policy = yes + udp_ports = 500 4500 + tcp_ports = 22 + } } } 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 0b5ff5740..d904fbe4c 100644 --- a/testing/tests/tnc/tnccs-20/hosts/moon/etc/tnc_config +++ b/testing/tests/tnc/tnccs-20/hosts/moon/etc/tnc_config @@ -1,3 +1,4 @@ #IMV configuration file for strongSwan server IMV "Test" /usr/local/libexec/ipsec/plugins/libstrongswan-imv-test.so +IMV "Scanner" /usr/local/libexec/ipsec/plugins/libstrongswan-imv-scanner.so |