Updated SWID scenarios

diff --git a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/carol/etc/ipsec.conf b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/carol/etc/ipsec.conf
index 59563730b1a549417915959352cb0029bf4577c0..6e6430e4d3b1bd5e921dc0a1e0bf303081c57f2d 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/carol/etc/ipsec.conf
@@ -1,7 +1,7 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
 config setup
-       charondebug="tnc 3, imc 3"
+       charondebug="tnc 2, imc 3"
 
 conn %default
        ikelifetime=60m

diff --git a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/ipsec.conf b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/ipsec.conf
index 8c27c78d24e76e65d6c0a963651796057f658923..4846af279497d0ea6b4a262e8651cba2e82dba3e 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/ipsec.conf
@@ -1,7 +1,7 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
 config setup
-       charondebug="tnc 3, imc 3"
+       charondebug="tnc 2, imc 3"
 
 conn %default
        ikelifetime=60m

diff --git a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/strongswan.conf
index c542b44cc4ce02514a5ed9d18d189e575410fba3..e9dfc8d9fb0a89241502d18941b2e5bee323d5c2 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/strongswan.conf
@@ -17,3 +17,14 @@ charon {
     }
   }
 }
+
+libimcv {
+  plugins {
+   imc-os {
+     push_info = no
+    }
+    imc-swid {
+      swid_pretty = yes
+    }
+  }
+}

diff --git a/testing/tests/tnc/tnccs-20-pdp-pt-tls/evaltest.dat b/testing/tests/tnc/tnccs-20-pdp-pt-tls/evaltest.dat
index 3139ca0825fde525724d392bb4d7870041b10c54..4be71afb0ecdf0304ea01d40bf0cbf16c30c3784 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pdp-pt-tls/evaltest.dat
+++ b/testing/tests/tnc/tnccs-20-pdp-pt-tls/evaltest.dat
@@ -3,7 +3,7 @@ alice:: cat /var/log/daemon.log::SASL PLAIN authentication successful::YES
 alice:: cat /var/log/daemon.log::SASL client identity is.*carol::YES
 alice:: cat /var/log/daemon.log::user AR identity.*carol.*authenticated by password::YES
 alice:: cat /var/log/daemon.log::received SWID tag ID inventory for request 6 at eid 1 of epoch::YES
-alice:: cat /var/log/daemon.log::regid.2004-03.org.strongswan_strongSwan-.*.swidtag::YES
+alice:: cat /var/log/daemon.log::regid.2004-03.org.strongswan_strongSwan-::YES
 alice:: cat /var/log/daemon.log::accepting PT-TLS stream from PH_IP_DAVE::YES
 alice:: cat /var/log/daemon.log::checking certificate status of.*C=CH, O=Linux strongSwan, OU=Accounting, CN=dave@strongswan.org::YES
 alice:: cat /var/log/daemon.log::certificate status is good::YES

diff --git a/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/ipsec.conf b/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/ipsec.conf
index d8b84334ae8086b7407516b6dd5449b9abec88db..7b2118f7eca2dd4bb155b6575728bf87cf76b4c6 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/ipsec.conf
+++ b/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/ipsec.conf
@@ -1,7 +1,7 @@
 # /etc/ipsec.conf - strongSwan IPsec configuration file
 
 config setup
-       charondebug="tls 2, tnc 3, imv 3"
+       charondebug="tls 2, tnc 2, imv 3"
 
 conn aaa
        leftcert=aaaCert.pem

diff --git a/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/dave/etc/strongswan.conf
index 0fa2acb142d1e07b0c6917056f487d268f193c28..4996d030748d8306cafc731dd7a851fb2eac9869 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/dave/etc/strongswan.conf
@@ -5,6 +5,9 @@ libimcv {
     imc-os {
       push_info = no
     }
+    imc-swid {
+      swid_pretty = yes
+    }
   }
 }