From 9d6d2d83a605fec1f68c1e8eee4822867573cd38 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Fri, 27 Aug 2021 11:35:56 +0100
Subject: [PATCH 1/2] Updating draft CR

---
 103221-1/TS_103_221_01.xsd                    |  18 +++++++++++++-----
 .../GetAllDetailsResponse_example.xml         |   6 ++++++
 .../ListAllDetailsResponse_example.xml        |   3 +++
 103221-1/examples/desktop.ini                 | Bin 246 -> 0 bytes
 4 files changed, 22 insertions(+), 5 deletions(-)
 delete mode 100644 103221-1/examples/desktop.ini

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index 0dab420..27439ca 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -631,6 +631,7 @@
 					<xs:element name="neStatusDetails" type="NeStatusDetails"/>
 					<xs:element name="listOfTaskResponseDetails" type="ListOfTaskResponseDetails"/>
 					<xs:element name="listOfDestinationResponseDetails" type="ListOfDestinationResponseDetails"/>
+          <xs:element name="listOfGenericObjectDetails" type="ListOfGenericObjects"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -660,6 +661,7 @@
 				<xs:sequence>
 					<xs:element name="ListOfXIDs" type="ListOfXids"/>
 					<xs:element name="ListOfDIDs" type="ListOfDids"/>
+          <xs:element name="ListOfObjectIDs" type="ListOfX1ObjectIDs"></xs:element>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -914,7 +916,7 @@
   </xs:complexType>
   
 
-  <xs:complexType name="ListObjectsOfTypeRequest">
+  <xs:complexType name="ListObjectsIDsOfTypeRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
@@ -924,20 +926,26 @@
     </xs:complexContent>
   </xs:complexType>
 
-  <xs:complexType name="ListObjectsOfTypeResponse">
+  <xs:complexType name="ListObjectsIDsOfTypeResponse">
     <xs:complexContent>
       <xs:extension base="X1ResponseMessage">
         <xs:sequence>
-          <xs:element name="listOfObjects" type="ListOfX1Objects"></xs:element>
+          <xs:element name="listOfObjectIDs" type="ListOfX1ObjectIDs"></xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
-  <xs:complexType name="ListOfX1Objects">
+  <xs:complexType name="ListOfX1ObjectIDs">
     <xs:sequence>
       <xs:element name="objectId" type="X1ObjectID" minOccurs="0" maxOccurs="unbounded"></xs:element>
     </xs:sequence>
   </xs:complexType>
-  
+
+  <xs:complexType name="ListOfGenericObjects">
+    <xs:sequence>
+      <xs:element name="object" type="X1Object" minOccurs="0" maxOccurs="unbounded"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
 </xs:schema>
diff --git a/103221-1/examples/GetAllDetailsResponse_example.xml b/103221-1/examples/GetAllDetailsResponse_example.xml
index 5bb7998..caff9f0 100644
--- a/103221-1/examples/GetAllDetailsResponse_example.xml
+++ b/103221-1/examples/GetAllDetailsResponse_example.xml
@@ -52,5 +52,11 @@
         </ns1:destinationStatus>
       </ns1:destinationResponseDetails>
     </ns1:listOfDestinationResponseDetails>
+    <ns1:listOfGenericObjectDetails>
+      <ns1:object xsi:type="ns1:FooObject">
+        <ns1:objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</ns1:objectId>
+        <ns1:Foo>1</ns1:Foo>
+      </ns1:object>
+    </ns1:listOfGenericObjectDetails>
   </ns1:x1ResponseMessage>
 </ns1:X1Response>
diff --git a/103221-1/examples/ListAllDetailsResponse_example.xml b/103221-1/examples/ListAllDetailsResponse_example.xml
index e5e9096..39afbae 100644
--- a/103221-1/examples/ListAllDetailsResponse_example.xml
+++ b/103221-1/examples/ListAllDetailsResponse_example.xml
@@ -12,5 +12,8 @@
     <ns1:ListOfDIDs>
       <ns1:dId>b0ce308c-aa17-42bd-a27b-287bcb5b3468</ns1:dId>
     </ns1:ListOfDIDs>
+    <ns1:ListOfObjectIDs>
+      <ns1:objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</ns1:objectId>
+    </ns1:ListOfObjectIDs>
   </ns1:x1ResponseMessage>
 </ns1:X1Response>
diff --git a/103221-1/examples/desktop.ini b/103221-1/examples/desktop.ini
deleted file mode 100644
index 8b699c692d358fa29d7ac0976e524fe25c5da053..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmY+9%?iRW5QM+8;5+mIB=`d!gr1a2Pl_Imhf<;jsu82&<2%X0BEyE+-I+;pz_90n
zqZ5{@hA7nBI1xB9WT1J-z30J|3NM{w!<~|GR@Agvv(r3^y`*f#OL-Sqw(0|CosANT
zUq;k!txejcOv_3d&s)4#6?)@SbC=zgnP7CYVZuDK|CBzXlGDidQH_{NpZ@a&#q=qQ

-- 
GitLab


From 2bad8116995b22921730e47f181b8e97953c210a Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Fri, 27 Aug 2021 12:14:43 +0100
Subject: [PATCH 2/2] New draft

---
 103221-1/TS_103_221_01.xsd                   | 12 +++++--
 103221-1/TS_103_221_01_HashedID.xsd          | 37 +++++++++++++++++++
 103221-1/examples/CreateHashedID_example.xml | 38 ++++++++++++++++++++
 3 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 103221-1/TS_103_221_01_HashedID.xsd
 create mode 100644 103221-1/examples/CreateHashedID_example.xml

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index 27439ca..a4d622b 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.8.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+           xmlns="http://uri.etsi.org/03221/X1/2017/10" 
+					 xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" 
+					 xmlns:hashedID="http://uri.etsi.org/03221/X1/2017/10/HashedID" 
+					 targetNamespace="http://uri.etsi.org/03221/X1/2017/10" 
+					 elementFormDefault="qualified" version="1.8.1">
 	<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+	<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10/HashedID"/>
+  
 	<!-- Message containers -->
 	<xs:element name="X1Request" type="RequestContainer"/>
 	<xs:element name="X1Response" type="ResponseContainer"/>
@@ -22,7 +29,7 @@
 			<xs:element name="admfIdentifier" type="AdmfIdentifier"/>
 			<xs:element name="neIdentifier" type="NeIdentifier"/>
 			<xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"/>
-			<xs:element name="version" type="Version"/>
+      <xs:element name="version" type="Version"/>
 			<xs:element name="x1TransactionId" type="X1TransactionId"/>
 		</xs:sequence>
 	</xs:complexType>
@@ -178,6 +185,7 @@
 			<xs:element name="peiImeisv" type="etsi103280:PEIIMEISV"/>
 			<xs:element name="gpsiMsisdn" type="etsi103280:GPSIMSISDN"/>
 			<xs:element name="gpsiNai" type="etsi103280:GPSINAI"/>
+      <xs:element name="hashedIdentifier" type="hashedID:HashedIdentifier"></xs:element>
 			<xs:element name="targetIdentifierExtension" type="TargetIdentifierExtension"/>
 		</xs:choice>
 	</xs:complexType>
diff --git a/103221-1/TS_103_221_01_HashedID.xsd b/103221-1/TS_103_221_01_HashedID.xsd
new file mode 100644
index 0000000..49b325d
--- /dev/null
+++ b/103221-1/TS_103_221_01_HashedID.xsd
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+           xmlns="http://uri.etsi.org/03221/X1/2017/10/HashedID" 
+           xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" 
+           xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" 
+           targetNamespace="http://uri.etsi.org/03221/X1/2017/10/HashedID" 
+           elementFormDefault="qualified" version="1.9.1">
+
+  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
+  <!-- Message containers -->
+
+  <xs:complexType name="HashContext">
+    <xs:complexContent>
+      <xs:extension base="x1:X1Object">
+        <xs:sequence>
+          <xs:element name="hashAlgorithm" type="etsi103280:ShortString"></xs:element>
+          <xs:element name="salt" type="Salt"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:simpleType name="Salt">
+    <xs:restriction base="xs:hexBinary">
+      <xs:minLength value="8"></xs:minLength>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="HashedIdentifier">
+    <xs:sequence>
+      <xs:element name="hashContextID" type="x1:X1ObjectID"></xs:element>
+      <xs:element name="targetIdentityType" type="etsi103280:ShortString"></xs:element>
+      <xs:element name="hashDigest" type="xs:hexBinary"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
diff --git a/103221-1/examples/CreateHashedID_example.xml b/103221-1/examples/CreateHashedID_example.xml
new file mode 100644
index 0000000..89dea20
--- /dev/null
+++ b/103221-1/examples/CreateHashedID_example.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" ?>
+<X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:hashedID="http://uri.etsi.org/03221/X1/2017/10/HashedID">
+  <x1RequestMessage xsi:type="CreateObjectRequest">
+    <admfIdentifier>admfID</admfIdentifier>
+    <neIdentifier>neID</neIdentifier>
+    <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
+    <version>v1.9.1</version>
+    <x1TransactionId>f9138c05-f82e-4cf4-a1ae-ae92fed2d564</x1TransactionId>
+    <createObject xsi:type="hashedID:HashContext">
+      <objectId>30fbde5e-3195-4a22-b3e9-15e1d60d0528</objectId>
+      <hashedID:hashAlgorithm>sha-256</hashedID:hashAlgorithm>
+      <hashedID:salt>4241792fc4d3d097</hashedID:salt>
+    </createObject>
+  </x1RequestMessage>
+  <x1RequestMessage xsi:type="ActivateTaskRequest">
+    <admfIdentifier>admfID</admfIdentifier>
+    <neIdentifier>neID</neIdentifier>
+    <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
+    <version>v1.9.1</version>
+    <x1TransactionId>f9138c05-f82e-4cf4-a1ae-ae92fed2d565</x1TransactionId>
+    <taskDetails>
+      <xId>30fbde5e-3195-4a22-b3e9-15e1d60d0529</xId>
+      <targetIdentifiers>
+        <targetIdentifier>
+          <hashedIdentifier>
+            <hashedID:hashContextID>30fbde5e-3195-4a22-b3e9-15e1d60d0528</hashedID:hashContextID>
+            <hashedID:targetIdentityType>InternationalE164</hashedID:targetIdentityType>
+            <hashedID:hashDigest>303e57c6968f308a6a7df0ef48c0e21580bc29ae2ed1bd8e5466eb42e72cc39a</hashedID:hashDigest>
+          </hashedIdentifier>
+        </targetIdentifier>
+      </targetIdentifiers>
+      <deliveryType>X2andX3</deliveryType>
+      <listOfDIDs></listOfDIDs>      
+    </taskDetails>
+  </x1RequestMessage>
+</X1Request>
-- 
GitLab