Handle tag separators

src/libpts/swid/swid_inventory.c

@@ -63,9 +63,10 @@ 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,
+	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 */
@@ -108,9 +109,10 @@ static status_t generate_tags(private_swid_inventory_t *this, char *generator,
 
 			tag_encoding = writer->get_buf(writer);
 
+			if (tag_encoding.len > 1)
+			{
 				/* remove trailing newline if present */
-			if (tag_encoding.len > 0 &&
+				if (tag_encoding.ptr[tag_encoding.len - 1] == '\n')
-				tag_encoding.ptr[tag_encoding.len - 1] == '\n')
 				{
 					tag_encoding.len--;
 				}
@@ -118,6 +120,7 @@ static status_t generate_tags(private_swid_inventory_t *this, char *generator,
 
 				tag = swid_tag_create(tag_encoding, tag_file_path);
 				this->list->insert_last(this->list, tag);
+			}
 			writer->destroy(writer);
 		}
 	}

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
     }
   }
 }