From 6b6b857cb636b3d6610c6df7ec4257155f162e61 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Fri, 23 May 2014 13:35:34 +0200
Subject: [PATCH] Updated strongSwan SWID Tag from ISO 2009 to 2014 format

---
 ...04-03.org.strongswan_strongSwan.swidtag.in | 48 ++++++++-----------
 1 file changed, 19 insertions(+), 29 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 6945d8769..03650fe5f 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
@@ -1,30 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<software_identification_tag xmlns="http://standards.iso.org/iso/19770/-2/2009/schema.xsd">
-  <entitlement_required_indicator>true</entitlement_required_indicator>
-  <product_title>strongSwan</product_title>
-  <product_version>
-    <name>@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_BUILD@@VERSION_REVIEW@</name>
-    <numeric>
-      <major>@VERSION_MAJOR@</major>
-      <minor>@VERSION_MINOR@</minor>
-      <build>@VERSION_BUILD@</build>
-      <review>@VERSION_REVIEW@</review>
-    </numeric>
-  </product_version>
-  <software_creator>
-    <name>strongSwan Project</name>
-    <regid>regid.2004-03.org.strongswan</regid>
-  </software_creator>
-  <software_licensor>
-    <name>strongSwan Project</name>
-    <regid>regid.2004-03.org.strongswan</regid>
-  </software_licensor>
-  <software_id>
-    <unique_id>strongSwan-@VERSION_MAJOR@-@VERSION_MINOR@-@VERSION_BUILD@@VERSION_REVIEW@</unique_id>
-    <tag_creator_regid>regid.2004-03.org.strongswan</tag_creator_regid>
-  </software_id>
-  <tag_creator>
-    <name>strongSwan Project</name>
-    <regid>regid.2004-03.org.strongswan</regid>
-  </tag_creator>
-</software_identification_tag>
+
+<SoftwareIdentity
+  name="strongSwan"
+  uniqueId="strongSwan-@VERSION_MAJOR@-@VERSION_MINOR@-@VERSION_BUILD@@VERSION_REVIEW@"
+  version="@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_BUILD@@VERSION_REVIEW@" versionScheme="alphanumeric"
+  xmlns="http://standards.iso.org/iso/19770/-2/2014/schema.xsd">
+  <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"/>
+</SoftwareIdentity>