Fixes in tnc scenarios

diff --git a/testing/tests/tnc/tnccs-20-os/description.txt b/testing/tests/tnc/tnccs-20-os/description.txt
index f660a0b633de6532f88ebadc84d6b937523e6191..941113434dfe2ab2936c2bf523a70971b1f255fe 100644 (file)
--- a/testing/tests/tnc/tnccs-20-os/description.txt
+++ b/testing/tests/tnc/tnccs-20-os/description.txt
@@ -10,7 +10,7 @@ exchange PA-TNC attributes.
 <b>carol</b> sends information on her operating system consisting of the PA-TNC attributes
 <em>Product Information</em>, <em>String Version</em>, <em>Numeric Version</em>,
 <em>Operational Status</em>, <em>Forwarding Enabled</em>, <em>Factory Default Password Enabled</em>
-and <em>Device ID> up-front, whereas <b>dave</b> must be prompted by the IMV to do so via an
+and <em>Device ID</em> up-front, whereas <b>dave</b> must be prompted by the IMV to do so via an
 <em>Attribute Request</em> PA-TNC attribute. <b>carol</b> is then prompted to send a list of
 installed packages using the <em>Installed Packages</em> PA-TNC attribute. Since <b>dave</b>
 successfully connected to the VPN gateway shortly before, no new list of installed packages is

diff --git a/testing/tests/tnc/tnccs-20-os/pretest.dat b/testing/tests/tnc/tnccs-20-os/pretest.dat
index 333ac746258d0cae331ae4e215498df412e24d70..610e88b8c0dbd4a314d07d763194fdcc2f358e50 100644 (file)
--- a/testing/tests/tnc/tnccs-20-os/pretest.dat
+++ b/testing/tests/tnc/tnccs-20-os/pretest.dat
@@ -3,6 +3,7 @@ carol::iptables-restore < /etc/iptables.rules
 dave::iptables-restore < /etc/iptables.rules
 carol::echo 0 > /proc/sys/net/ipv4/ip_forward
 dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id
+moon::sed -i "s/NOW/`date +%s`/g" /etc/pts/data.sql
 moon::cd /etc/pts; cat tables.sql data.sql | sqlite3 config.db
 moon::cat /etc/tnc_config
 carol::cat /etc/tnc_config

diff --git a/testing/tests/tnc/tnccs-20-pdp/hosts/alice/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pdp/hosts/alice/etc/strongswan.conf
index 70da7766a4024ad1396bc139be1a6c3ea3f2edd9..ec4956c310cc66bb03d22a1f13c3a6c4de0f8775 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pdp/hosts/alice/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pdp/hosts/alice/etc/strongswan.conf
@@ -13,7 +13,9 @@ charon {
     }
     tnc-pdp {
       server = aaa.strongswan.org
-      secret = gv6URkSs
+      radius {
+        secret = gv6URkSs
+      }
     }
   }
 }