Handle tag separators

diff --git a/src/libpts/swid/swid_inventory.c b/src/libpts/swid/swid_inventory.c
index 062bf4ec5d0e79b697f3ca6d2e47e426a3f510d3..9d49324582bee2da55561ced76fd9d62296c2792 100644 (file)
--- a/src/libpts/swid/swid_inventory.c
+++ b/src/libpts/swid/swid_inventory.c
@@ -63,10 +63,11 @@ static status_t generate_tags(private_swid_inventory_t *this, char *generator,
        status_t status = SUCCESS;
 
        /* Assemble the SWID generator command */
-       snprintf(command, sizeof(command), "%s %s%s%s\n", generator,
-                       (this->full_tags)           ? "swid" : "software-id",
-                       (this->full_tags && pretty) ? " --pretty" : "",
-                       (this->full_tags && full)   ? " --full" : "");
+       snprintf(command, sizeof(command), "%s %s%s%s%s\n", generator,
+                       (this->full_tags)            ? "swid" : "software-id",
+                       (this->full_tags && pretty)  ? " --pretty" : "",
+                       (this->full_tags && !pretty) ? " --doc-separator $'\n\n'" : "",
+                       (this->full_tags && full)    ? " --full" : "");
 
        /* Open a pipe stream for reading the output of the dpkg-query commmand */
        file = popen(command, "r");
@@ -108,16 +109,18 @@ static status_t generate_tags(private_swid_inventory_t *this, char *generator,
 
                        tag_encoding = writer->get_buf(writer);
 
-                       /* remove trailing newline if present */
-                       if (tag_encoding.len > 0 &&
-                               tag_encoding.ptr[tag_encoding.len - 1] == '\n')
+                       if (tag_encoding.len > 1)
                        {
-                               tag_encoding.len--;
-                       }
-                       DBG2(DBG_IMC, "  %.*s", tag_encoding.len, tag_encoding.ptr);
+                               /* remove trailing newline if present */
+                               if (tag_encoding.ptr[tag_encoding.len - 1] == '\n')
+                               {
+                                       tag_encoding.len--;
+                               }
+                               DBG2(DBG_IMC, "  %.*s", tag_encoding.len, tag_encoding.ptr);
 
-                       tag = swid_tag_create(tag_encoding, tag_file_path);
-                       this->list->insert_last(this->list, tag);
+                               tag = swid_tag_create(tag_encoding, tag_file_path);
+                               this->list->insert_last(this->list, tag);
+                       }
                        writer->destroy(writer);
                }
        }

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 e9dfc8d9fb0a89241502d18941b2e5bee323d5c2..aefbfde95b4e8085b7ebe1556fca1d71699052be 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
@@ -24,7 +24,7 @@ libimcv {
      push_info = no
     }
     imc-swid {
-      swid_pretty = yes
+      swid_pretty = no
     }
   }
 }