Extend HCD attribute data for tnc/tnccs-20-hcd-eap scenario

2 files changed, 45 insertions, 16 deletions

diff --git a/testing/tests/tnc/tnccs-20-hcd-eap/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-hcd-eap/hosts/carol/etc/strongswan.conf
index 10344ccad..2694b75d8 100644
--- a/testing/tests/tnc/tnccs-20-hcd-eap/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-hcd-eap/hosts/carol/etc/strongswan.conf
@@ -11,8 +11,8 @@ charon {
       max_message_count = 0
     }
     tnccs-20 {
-      max_batch_size = 16370
-      max_message_size = 16338
+      max_batch_size = 1600
+      max_message_size = 1568
     }
   }
 }
@@ -39,23 +39,30 @@ libimcv {
           user_application_persistence_enabled = no
 
           firmware {
-		    fw-1 {
-              name = Firmware ABC 
-              patches = "security patch 2014-05-08\r\nupgrade 2014-08-16\r\nsecurity patch 2015-3-22\r\n"
+            fw-1 {
+              name = Firmware ABC for ARMv6 32bit strongPrint OS 1.0
+              patches = "security patch CVE-2014-1630 2014-05-08\r\nmajor upgrade for ABC (European version 1.0-en) 2014-08-16\r\nsecurity patch CVE-2015-1111 2015-03-22\r\nsecurity patch CVE-2015-3324 2015-06-01"
               string_version = 1.0.7
               version = 00000001000000000000000700000000
             }
-		    fw-2 {
-              name = Firmware UVW 
+            fw-2 {
+              name = Firmware UVW for ARMv6 32 bit strongPrint OS 1.0
+              patches = "security patch CVE-2014-1288 2014-01-01\r\nsecurity patch CVE-2014-1492 2014-02-01\r\nsecurity patch CVE-2014-1622 2014-05-01\r\nsecurity patch CVE-2014-2775 2014-07-01\r\n\security patch CVE-2014-4453 2014-08-01\r\nsecurity patch CVE-2014-6108 2014-11-01\r\nsecurity patch CVE-2015-0555 2015-01-01\r\nsecurity patch CVE-2015-4319 2015-07-01\r\n" 
               string_version = 13.8.5
               version = 0000000D000000080000000500000000
             }
+            fw-3 {
+              name = Firmware XYZ for ARMv6 32 bit strongPrint OS 1.0
+              patches = "spring 2015 service pack for professional printing services 10.1.2a\r\n"
+              string_version = 10.1.2
+              version = 0000000A000000010000000200000000
+            }
           }
 
           resident_application {
             resident-app-1 {
               name = Resident App XYZ 
-              patches = "xmas patch 2014-12-24\r\nservice patch 2015-05-22\r\n"
+              patches = "xmas patch 2014-12-24\r\nservice patch for App XYZ 2015-05-22\r\n"
               string_version = 2.5
               version = 00000002000000050000000000000000
             }
@@ -80,9 +87,13 @@ libimcv {
               string_version = 7.5.8.2.3
               version = 00000007000000050000000800020003
             }
+            user-app-4 {
+              name = Happy Millionaire - Forge Your Own Currency (CHF, USD, EUR, AUD)
+              string_version = 0.9.7.8
+              version = 00000000000000090000000700080000
+            }
           }
-
-          certification_state = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
+          certification_state = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4f4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767678797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecededeff0f1f2f3f4f5f6f7f9f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4f4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767678797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecededeff0f1f2f3f4f5f6f7f9f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4f4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767678797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecededeff0f1f2f3f4f5f6f7f9f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4f4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767678797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecededeff0f1f2f3f4f5f6f7f9f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4f4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767678797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecededeff0f1f2f3f4f5f6f7f9f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4f4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767678797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecededeff0f1f2f3f4f5f6f7f9f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4f4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767678797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecededeff0f1f2f3f4f5f6f7f9f9fafbfcfdfeff
           configuration_state = f0f1f2f3f4f5f6f7f8f9fafbfcfdfeffe0e1e2e3e4e5e6e7e8e9eaebecedeeefd0d1d2d3d4d5d6d7d8d9dadbdcdddedf
         }
 
@@ -100,10 +111,19 @@ libimcv {
 
         interface {
           attributes_natural_language = en
+
+          firmware {
+            fw-if {
+              name = Interface Firmware
+              patches =
+              string_version = 7.8
+              version = 00000007000000080000000000000000
+            }
+          }
  
           resident_application {
 		    resident-app-if {
-              name = Resident App Interface+ 
+              name = Resident Interface App
               patches = "service patch 2015-02-09\r\n"
               string_version = 2.5
               version = 00000002000000050000000000000000
diff --git a/testing/tests/tnc/tnccs-20-hcd-eap/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-hcd-eap/hosts/dave/etc/strongswan.conf
index f9ae43222..dbc845de9 100644
--- a/testing/tests/tnc/tnccs-20-hcd-eap/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-hcd-eap/hosts/dave/etc/strongswan.conf
@@ -11,8 +11,8 @@ charon {
       max_message_count = 0
     }
     tnccs-20 {
-      max_batch_size = 16370
-      max_message_size = 16338
+      max_batch_size = 1600
+      max_message_size = 1568
     }
   }
 }
@@ -39,13 +39,13 @@ libimcv {
           user_application_persistence_enabled = no
 
           firmware {
-		    fw-1 {
+            fw-1 {
               name = Firmware ABC 
               patches = "security patch 2014-05-08\r\nupgrade 2014-08-16\r\nsecurity patch 2015-3-22\r\n"
               string_version = 1.0.7
               version = 00000001000000000000000700000000
             }
-		    fw-2 {
+            fw-2 {
               name = Firmware UVW 
               string_version = 13.8.5
               version = 0000000D000000080000000500000000
@@ -80,9 +80,18 @@ libimcv {
         interface {
           attributes_natural_language = en
  
+          firmware {
+            fw-if {
+              name = Interface Firmware
+              patches =
+              string_version = 7.8
+              version = 00000007000000080000000000000000
+            }
+          }
+
           resident_application {
 		    resident-app-if {
-              name = Resident App Interface+ 
+              name = Resident Interface App
               patches = "service patch 2015-02-09\r\n"
               string_version = 2.5
               version = 00000002000000050000000000000000