diff options
| -rw-r--r-- | src/libpts/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in | 10 | ||||
| -rw-r--r-- | src/libpts/swid/swid_inventory.c | 16 |
2 files changed, 7 insertions, 19 deletions
diff --git a/src/libpts/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in b/src/libpts/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in index 03650fe5f..8b7b50fdf 100644 --- a/src/libpts/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in +++ b/src/libpts/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in @@ -8,13 +8,5 @@ <Entity name="strongSwan Project" regid="regid.2004-03.org.strongswan" - role="tagcreator"/> - <Entity - name="strongSwan Project" - regid="regid.2004-03.org.strongswan" - role="publisher"/> - <Entity - name="strongSwan Project" - regid="regid.2004-03.org.strongswan" - role="licensor"/> + role="publisher licensor tagcreator"/> </SoftwareIdentity> diff --git a/src/libpts/swid/swid_inventory.c b/src/libpts/swid/swid_inventory.c index 86f47a357..e050e6129 100644 --- a/src/libpts/swid/swid_inventory.c +++ b/src/libpts/swid/swid_inventory.c @@ -159,7 +159,6 @@ static status_t generate_tags(private_swid_inventory_t *this, char *generator, { FILE *file; char command[BUF_LEN]; - char entity_name[] = "strongSwan Project"; char doc_separator[] = "'\n\n'"; status_t status = SUCCESS; @@ -169,10 +168,9 @@ static status_t generate_tags(private_swid_inventory_t *this, char *generator, /* Assemble the SWID generator command */ if (this->full_tags) { - snprintf(command, BUF_LEN, "%s swid --entity-name \"%s\" " - "--doc-separator %s%s%s", - generator, entity_name, doc_separator, - pretty ? " --pretty" : "", full ? " --full" : ""); + snprintf(command, BUF_LEN, "%s swid --doc-separator %s%s%s", + generator, doc_separator, pretty ? " --pretty" : "", + full ? " --full" : ""); } else { @@ -217,11 +215,9 @@ static status_t generate_tags(private_swid_inventory_t *this, char *generator, unique_sw_id.len, unique_sw_id.ptr); /* Assemble the SWID generator command */ - snprintf(command, BUF_LEN, "%s swid --software-id %s " - "--entity-name \"%s\"%s%s", - generator, software_id, entity_name, - pretty ? " --pretty" : "", - full ? " --full" : ""); + snprintf(command, BUF_LEN, "%s swid --software-id %s%s%s", + generator, software_id, pretty ? " --pretty" : "", + full ? " --full" : ""); /* Open a pipe stream for reading the SWID generator output */ file = popen(command, "r"); |