Merge branch 'cr/TS103221-1/028' into 'cr/TS103221-1/027'

TS 103 221-1 CR028 - Hashed Identifiers

See merge request !44

103221-1/TS_103_221_01.xsd

 <?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"/>
@@ -179,6 +187,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>

103221-1/TS_103_221_01_HashedID.xsd

+<?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:GenericObject">
+        <xs:sequence>
+          <xs:element name="hashAlgorithm" type="HashAlgorithm"></xs:element>
+          <xs:element name="salt" type="Salt"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:simpleType name="HashAlgorithm">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="sha-256"/>
+      <xs:enumeration value="sha-512"/>
+      <xs:enumeration value="sha3-512"/>
+    </xs:restriction>
+  </xs:simpleType>
+    
+  <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:GenericObjectID"></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>

103221-1/examples/CreateHashedID_example.xml

+<?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>