Updated SWID scenarios
authorAndreas Steffen <andreas.steffen@strongswan.org>
Mon, 14 Apr 2014 09:26:08 +0000 (11:26 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 15 Apr 2014 07:21:06 +0000 (09:21 +0200)
testing/tests/tnc/tnccs-20-pdp-eap/hosts/carol/etc/ipsec.conf
testing/tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/ipsec.conf
testing/tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/strongswan.conf
testing/tests/tnc/tnccs-20-pdp-pt-tls/evaltest.dat
testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/ipsec.conf
testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/dave/etc/strongswan.conf

index 5956373..6e6430e 100644 (file)
@@ -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
index 8c27c78..4846af2 100644 (file)
@@ -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
index c542b44..e9dfc8d 100644 (file)
@@ -17,3 +17,14 @@ charon {
     }
   }
 }
+
+libimcv {
+  plugins {
+   imc-os {
+     push_info = no
+    }
+    imc-swid {
+      swid_pretty = yes
+    }
+  }
+}
index 3139ca0..4be71af 100644 (file)
@@ -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
index d8b8433..7b2118f 100644 (file)
@@ -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
index 0fa2acb..4996d03 100644 (file)
@@ -5,6 +5,9 @@ libimcv {
     imc-os {
       push_info = no
     }
+    imc-swid {
+      swid_pretty = yes
+    }
   }
 }