testing: Switched PTS measurements to /usr/sbin

Due to Debian 10 linking /bin to /usr/bin which drastically
increased the number of files in /bin, the PTS measurement
was switched to /usr/sbin with a lesser number of files.

diff --git a/src/libimcv/imv/data.sql b/src/libimcv/imv/data.sql
index 5220a82a66eeb57176923ed4d48d027de7a441b9..6587b3d56fcc5be4dea38fe1368e59d38b0a60c6 100644 (file)
--- a/src/libimcv/imv/data.sql
+++ b/src/libimcv/imv/data.sql
@@ -1731,7 +1731,7 @@ INSERT INTO policies (                    /* 10 */
 INSERT INTO policies (                 /* 11 */
   type, name, dir, rec_fail, rec_noresult
 ) VALUES (
-  8, 'Get /bin', 1, 0, 0
+  8, 'Get /usr/sbin', 12, 0, 0
 );
 
 INSERT INTO policies (                 /*  12 */
@@ -1761,7 +1761,7 @@ INSERT INTO policies (                    /* 15 */
 INSERT INTO policies (          /* 16 */
   type, name, dir, rec_fail, rec_noresult
 ) VALUES (
-  9, 'Measure /bin', 1, 2, 2
+  9, 'Measure /usr/sbin', 12, 2, 2
 );
 
 INSERT INTO policies (                 /* 17 */

diff --git a/testing/tests/tnc/tnccs-20-os-pts/description.txt b/testing/tests/tnc/tnccs-20-os-pts/description.txt
index 0ade4ba302db399e0ed939f6788f84d68f697a20..53d173a91678f719c6a27c96556ab3fd9bfde364 100644 (file)
--- a/testing/tests/tnc/tnccs-20-os-pts/description.txt
+++ b/testing/tests/tnc/tnccs-20-os-pts/description.txt
@@ -11,8 +11,8 @@ protocol defined by <b>RFC 5792 PA-TNC</b>.
 <em>Product Information</em>, <em>String Version</em>, and <em>Device ID</em> up-front
 to the Attestation IMV, whereas <b>dave</b> must be prompted by the IMV to do so via an
 <em>Attribute Request</em> PA-TNC attribute. <b>dave</b> is instructed to do a reference
-measurement on all files in the <b>/bin</b> directory. <b>carol</b> is then prompted to
-measure a couple of individual files and the files in the <b>/bin</b> directory as
+measurement on all files in the <b>/usr/sbin</b> directory. <b>carol</b> is then prompted to
+measure a couple of individual files and the files in the <b>/usr/sbin</b> directory as
 well as to get metadata on the <b>/etc/tnc_confg</b> configuration file.
 <p>
 <b>carol</b> passes the health test and <b>dave</b> fails because IP forwarding is

diff --git a/testing/tests/tnc/tnccs-20-os-pts/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-os-pts/hosts/carol/etc/strongswan.conf
index 3e4d76f105579e91ac53d91fc72436ae7cfad044..fe6ea8cd0fa2116e00cf56948277d634dd4a8d4a 100644 (file)
--- a/testing/tests/tnc/tnccs-20-os-pts/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-os-pts/hosts/carol/etc/strongswan.conf
@@ -12,6 +12,11 @@ charon-systemd {
       pts = 3
     }
   }
+  plugins {
+    eap-ttls {
+      max_message_count = 0
+    }
+  }
 }
 
 libtls {

diff --git a/testing/tests/tnc/tnccs-20-os-pts/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-os-pts/hosts/dave/etc/strongswan.conf
index 2e249d48da07f7c519b6621bbafe635f6d8c1af9..92050e6bbbcefbe954dd006651f193cacd5cda88 100644 (file)
--- a/testing/tests/tnc/tnccs-20-os-pts/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-os-pts/hosts/dave/etc/strongswan.conf
@@ -14,6 +14,9 @@ charon-systemd {
     }
   }
   plugins {
+    eap-ttls {
+      max_message_count = 0
+    }
     tnc-imc {
       preferred_language = de
     }

diff --git a/testing/tests/tnc/tnccs-20-os-pts/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-os-pts/hosts/moon/etc/strongswan.conf
index a683ba77c619a9878d9f1d169abfc76401758a57..560b248f7f239c8d23054ac8adf2fd166cbecfbe 100644 (file)
--- a/testing/tests/tnc/tnccs-20-os-pts/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-os-pts/hosts/moon/etc/strongswan.conf
@@ -14,6 +14,7 @@ charon-systemd {
   }
   plugins {
     eap-ttls {
+      max_message_count = 0
       phase2_method = md5
       phase2_piggyback = yes
       phase2_tnc = yes

diff --git a/testing/tests/tnc/tnccs-20-pts-no-ecc/description.txt b/testing/tests/tnc/tnccs-20-pts-no-ecc/description.txt
index febf074018a0febd6d509065b57844656d9c711a..d3c3431d6a74eadf1e5fba646bfd706425c08bb7 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pts-no-ecc/description.txt
+++ b/testing/tests/tnc/tnccs-20-pts-no-ecc/description.txt
@@ -2,18 +2,18 @@ The roadwarriors <b>carol</b> and <b>dave</b> set up a connection each to gatewa
 using EAP-TTLS authentication only with the gateway presenting a server certificate and
 the clients doing EAP-MD5 password-based authentication.
 <p/>
-In a next step the <b>RFC 7171 PT-EAP</b> transport protocol is used within the EAP-TTLS 
-tunnel to determine the state of <b>carol</b>'s and <b>dave</b>'s operating system via the 
-<b>TNCCS 2.0 </b> client-server interface compliant with <b>RFC 5793 PB-TNC</b>. The OS IMC 
-and OS IMV pair is using the <b>IF-M 1.0</b> measurement protocol defined by <b>RFC 5792 PA-TNC</b> 
+In a next step the <b>RFC 7171 PT-EAP</b> transport protocol is used within the EAP-TTLS
+tunnel to determine the state of <b>carol</b>'s and <b>dave</b>'s operating system via the
+<b>TNCCS 2.0 </b> client-server interface compliant with <b>RFC 5793 PB-TNC</b>. The OS IMC
+and OS IMV pair is using the <b>IF-M 1.0</b> measurement protocol defined by <b>RFC 5792 PA-TNC</b>
 to exchange PA-TNC attributes.
 <p/>
 <b>carol</b> sends information on her operating system consisting of the PA-TNC attributes
 <em>Product Information</em>, <em>String Version</em>, and <em>Device ID</em> up-front
 to the Attestation IMV, whereas <b>dave</b> must be prompted by the IMV to do so via an
 <em>Attribute Request</em> PA-TNC attribute. <b>dave</b> is instructed to do a reference
-measurement on all files in the <b>/bin</b> directory. <b>carol</b> is then prompted to
-measure a couple of individual files and the files in the <b>/bin</b> directory as
+measurement on all files in the <b>/usr/sbin</b> directory. <b>carol</b> is then prompted to
+measure a couple of individual files and the files in the <b>/usr/sbin</b> directory as
 well as to get metadata on the <b>/etc/tnc_confg</b> configuration file.
 <p/>
 Since the Attestation IMV negotiates a Diffie-Hellman group for TPM-based measurements,

diff --git a/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/carol/etc/strongswan.conf
index 55f31671e6f096b9d869184abd44c329144e5325..4f47b79f2e410d58ab3abd99c867bfe8c2cf1e3d 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/carol/etc/strongswan.conf
@@ -12,6 +12,11 @@ charon-systemd {
       pts = 3
     }
   }
+  plugins {
+    eap-ttls {
+      max_message_count = 0
+    }
+  }
 }
 
 libtls {

diff --git a/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/dave/etc/strongswan.conf
index 8f8ef96d915bb6a460cf4066d6eb253c3b10c933..9a0644661c140a35929365be0859326cee6ce2e9 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/dave/etc/strongswan.conf
@@ -13,6 +13,9 @@ charon-systemd {
     }
   }
   plugins {
+    eap-ttls {
+      max_message_count = 0
+    }
     tnc-imc {
       preferred_language = de
     }

diff --git a/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/moon/etc/strongswan.conf
index dd9a2e0bc6760cf80c5eaa5a85d56a4d0aef25bf..edb59d2b85b91ab523b50d268fc33ba269793e66 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/moon/etc/strongswan.conf
@@ -14,6 +14,7 @@ charon-systemd {
   }
   plugins {
     eap-ttls {
+      max_message_count = 0
       phase2_method = md5
       phase2_piggyback = yes
       phase2_tnc = yes

diff --git a/testing/tests/tnc/tnccs-20-pts/description.txt b/testing/tests/tnc/tnccs-20-pts/description.txt
index e532ab2cf750f9e5a41984e83470d631136d6499..c4c556662cbd89e78e9493f3cd387d5285a68c7a 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pts/description.txt
+++ b/testing/tests/tnc/tnccs-20-pts/description.txt
@@ -2,7 +2,7 @@ The roadwarriors <b>carol</b> and <b>dave</b> set up a connection each to gatewa
 using EAP-TTLS authentication only with the gateway presenting a server certificate and
 the clients doing EAP-MD5 password-based authentication.
 <p/>
-In a next step the <b>RFC 7171 PT-EAP</b> transport protocol is used within the EAP-TTLS tunnel 
+In a next step the <b>RFC 7171 PT-EAP</b> transport protocol is used within the EAP-TTLS tunnel
 to determine the state of <b>carol</b>'s and <b>dave</b>'s operating system via the <b>TNCCS 2.0</b>
 client-server interface compliant with <b>RFC 5793 PB-TNC</b>. The OS and Attestation IMCs
 exchange PA-TNC attributes with the OS IMV via the <b>IF-M 1.0</b> measurement protocol
@@ -12,8 +12,8 @@ defined by <b>RFC 5792 PA-TNC</b>.
 <em>Product Information</em>, <em>String Version</em>, and <em>Device ID</em> up-front
 to the Attestation IMV, whereas <b>dave</b> must be prompted by the IMV to do so via an
 <em>Attribute Request</em> PA-TNC attribute. <b>dave</b> is instructed to do a reference
-measurement on all files in the <b>/bin</b> directory. <b>carol</b> is then prompted to
-measure a couple of individual files and the files in the <b>/bin</b> directory as
+measurement on all files in the <b>/usr/sbin</b> directory. <b>carol</b> is then prompted to
+measure a couple of individual files and the files in the <b>/usr/sbin</b> directory as
 well as to get metadata on the <b>/etc/tnc_confg</b> configuration file.
 <p>
 <b>carol</b> passes the health test and <b>dave</b> fails because IP forwarding is

diff --git a/testing/tests/tnc/tnccs-20-pts/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pts/hosts/carol/etc/strongswan.conf
index 8ebf568789e592d7f908d54f94100c2bde0ae1cb..fd76ad0fda1d97e87a8f420076272391071f75c6 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pts/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pts/hosts/carol/etc/strongswan.conf
@@ -12,6 +12,11 @@ charon-systemd {
       pts = 3
     }
   }
+  plugins {
+    eap-ttls {
+      max_message_count = 0
+    }
+  }
 }
 
 libtls {

diff --git a/testing/tests/tnc/tnccs-20-pts/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pts/hosts/dave/etc/strongswan.conf
index 0b47d35e7c88051bcd9c38d15a76fcbccd1b7f29..13969e583dadffb4afed179f3624303376ce38af 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pts/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pts/hosts/dave/etc/strongswan.conf
@@ -13,6 +13,9 @@ charon-systemd {
     }
   }
   plugins {
+    eap-ttls {
+      max_message_count = 0
+    }
     tnc-imc {
       preferred_language = de
     }

diff --git a/testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/strongswan.conf
index bf14fe3274a5e3f925b00e5a0c4f76d6ee78f6df..d3ca047cb63964599eda0084f314c70a120f9f77 100644 (file)
--- a/testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/strongswan.conf
@@ -14,6 +14,7 @@ charon-systemd {
   }
   plugins {
     eap-ttls {
+      max_message_count = 0
       phase2_method = md5
       phase2_piggyback = yes
       phase2_tnc = yes