From f859645b1236a6e8086239df03715db215433066 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Mon, 19 Aug 2013 11:44:51 +0200
Subject: [PATCH] Fixes in tnc scenarios

---
 testing/tests/tnc/tnccs-20-os/description.txt                  | 2 +-
 testing/tests/tnc/tnccs-20-os/pretest.dat                      | 1 +
 testing/tests/tnc/tnccs-20-pdp/hosts/alice/etc/strongswan.conf | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/testing/tests/tnc/tnccs-20-os/description.txt b/testing/tests/tnc/tnccs-20-os/description.txt
index f660a0b..9411134 100644
--- 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 333ac74..610e88b 100644
--- 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 70da776..ec4956c 100644
--- 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
+      }
     }
   }
 }
-- 
2.7.4