Commit a20dd435 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'cr/103120/118' into meeting/LI71

parents 0f524c51 436b23cc

103120/schema/xsd/ts_103120_Delivery.xsd

+8 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
                    <xs:element name="Delivery" type="Delivery" minOccurs="0"/>

                    <xs:element name="DeliveryStatus" type="common:DictionaryEntry" minOccurs="0"/>

                    <xs:element name="DeliveryDesiredStatus" type="common:DictionaryEntry" minOccurs="0"/>

                    <xs:element name="EncryptionDetails" type="DeliveryEncryptionDetails" minOccurs="0"/>

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>
@@ -90,4 +91,10 @@ 
            <xs:element name="Checksums" type="common:ListOfChecksumAndType" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="DeliveryEncryptionDetails">

        <xs:sequence>

            <xs:element name="EncryptionReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="AdditionalInformation" type="etsi:LongString" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

</xs:schema>

103120/schema/xsd/ts_103120_Encryption.xsd

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" xmlns="http://uri.etsi.org/03120/common/2026/01/Encryption" targetNamespace="http://uri.etsi.org/03120/common/2026/01/Encryption" elementFormDefault="qualified" attributeFormDefault="unqualified">

    <xs:import namespace="http://uri.etsi.org/03120/common/2016/02/Common"/>

    <xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core"/>

    <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

    <xs:complexType name="EncryptionObject">

        <xs:complexContent>

            <xs:extension base="core:HI1Object">

                <xs:sequence>

                    <xs:element name="EncryptionScheme" type="common:DictionaryEntry" minOccurs="1"/>

                    <xs:element name="X509EncryptionDetails" minOccurs="0"/>

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

    <xs:complexType name="X509EncryptionDetails">

        <xs:sequence>

            <xs:element name="X509Certificates" type="X509Certificate" minOccurs="0" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="X509Certificate">

        <xs:sequence>

            <xs:element name="X509CertificateDER" type="xs:base64Binary" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

</xs:schema>

103120/schema/xsd/ts_103120_Task.xsd

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ 
    <xs:complexType name="LDDeliveryDestination">

        <xs:sequence>

            <xs:element name="DeliveryAddress" type="DeliveryAddress" minOccurs="0"/>

            <xs:element name="EncryptionReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="EncryptionDetails" type="NationalEncryptionDetails" minOccurs="0"/>

            <xs:element name="LDHandoverFormat" type="common:DictionaryEntry" minOccurs="0"/>

            <xs:element name="LDDeliveryProfile" type="common:DictionaryEntry" minOccurs="0"/>

104144/examples/form1_encryptionRequested.xml

0 → 100644
+254 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation" xmlns:doc="http://uri.etsi.org/03120/common/2020/09/Document" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:encryption="http://uri.etsi.org/03120/common/2026/01/Encryption" xmlns:notify="http://uri.etsi.org/03120/common/2016/02/Notification" xmlns:ef1="http://uri.etsi.org/03120/common/2025/02/EpocForm1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:epoc="http://uri.etsi.org/03120/common/2025/06/EPOCAdditionalInfo">

    <Header>

        <SenderIdentifier>

            <CountryCode>DE</CountryCode>

            <UniqueIdentifier>issuing-authority-1</UniqueIdentifier>

        </SenderIdentifier>

        <ReceiverIdentifier>

            <CountryCode>IE</CountryCode>

            <UniqueIdentifier>service-provider-1</UniqueIdentifier>

        </ReceiverIdentifier>

        <TransactionIdentifier>16da9c07-df82-4630-8a55-8adb8291da79</TransactionIdentifier>

        <Timestamp>2026-01-01T14:53:46.000000+01:00</Timestamp>

        <Version>

            <ETSIVersion>V1.22.1</ETSIVersion>

            <NationalProfileOwner>EU</NationalProfileOwner>

            <NationalProfileVersion>v1.3.1</NationalProfileVersion>

        </Version>

    </Header>

    <Payload>

        <RequestPayload>

            <ActionRequests>

                <ActionRequest>

                    <ActionIdentifier>0</ActionIdentifier>

                    <CREATE>

                        <HI1Object xsi:type="auth:AuthorisationObject">

                            <ObjectIdentifier>72a5da8e-b965-4c1b-91cb-bd0ea6c2867b</ObjectIdentifier>

                            <!-- Country code of the Issuing Authority -->

                            <CountryCode>DE</CountryCode>

                            <!-- Unique identifier of the Issuing Authority in the DIS -->

                            <OwnerIdentifier>issuing-authority-1</OwnerIdentifier>

                            <auth:AuthorisationReference>EPOC-DE-IE-2025-05-20-0002-1</auth:AuthorisationReference>

                            <auth:AuthorisationLegalType>

                                <common:Owner>ETSI</common:Owner>

                                <common:Name>EPOCLegalType</common:Name>

                                <common:Value>EPOC</common:Value>

                            </auth:AuthorisationLegalType>

                            <auth:AuthorisationPriority>

                                <common:Owner>ETSI</common:Owner>

                                <common:Name>EPOCPriority</common:Name>

                                <common:Value>TenDaysASAP</common:Value>

                            </auth:AuthorisationPriority>

                            <auth:AuthorisationDesiredStatus>

                                <common:Owner>ETSI</common:Owner>

                                <common:Name>AuthorisationDesiredSatus</common:Name>

                                <common:Value>SubmittedToCSP</common:Value>

                            </auth:AuthorisationDesiredStatus>

                            <auth:AuthorisationCSPID>

                                <auth:CSPID>

                                    <CountryCode>IE</CountryCode>

                                    <UniqueIdentifier>service-provider-1</UniqueIdentifier>

                                </auth:CSPID>

                            </auth:AuthorisationCSPID>

                            <!-- Details of the Issuing Authority -->

                            <auth:AuthorisationApprovalDetails>

                                <common:ApprovalType>IssuingAuthority</common:ApprovalType>

                                <common:ApprovalReference>IA Approval Reference</common:ApprovalReference>

                                <common:ApproverDetails>

                                    <common:ApproverName>Issuing Authority</common:ApproverName>

                                    <common:ApproverRole>PublicProsecutor</common:ApproverRole>

                                    <common:ApproverContactDetails>

                                        <common:Name>Name of IA official</common:Name>

                                        <common:Role>Role of IA official</common:Role>

                                        <common:EmailAddress>issuing_authority@example.org</common:EmailAddress>

                                        <common:PhoneNumber>33199000000</common:PhoneNumber>

                                        <common:FaxNumber>33199000001</common:FaxNumber>

                                        <common:Address>Address of IA</common:Address>

                                        <common:Languages>

                                            <common:ISO639Set1LanguageIdentifier>de</common:ISO639Set1LanguageIdentifier>

                                        </common:Languages>

                                        <common:Languages>

                                            <common:ISO639Set1LanguageIdentifier>en</common:ISO639Set1LanguageIdentifier>

                                        </common:Languages>

                                    </common:ApproverContactDetails>

                                    <common:ApproverContactDetails>

                                        <common:Name>Issuing Authority Point of Contact</common:Name>

                                        <common:Role>Point of Contact</common:Role>

                                        <common:EmailAddress>issuing_authority_poc@example.org</common:EmailAddress>

                                        <common:PhoneNumber>33199000002</common:PhoneNumber>

                                        <common:FaxNumber>33199000003</common:FaxNumber>

                                        <common:Address>Point of contact address</common:Address>

                                    </common:ApproverContactDetails>

                                </common:ApproverDetails>

                                <common:ApprovalTimestamp>2025-05-30T00:00:00+01:00</common:ApprovalTimestamp>

                                <common:ApprovalIsEmergency>false</common:ApprovalIsEmergency>

                            </auth:AuthorisationApprovalDetails>

                            <!-- Details of the Validating Authority -->

                            <auth:AuthorisationApprovalDetails>

                                <common:ApprovalType>ValidatingAuthority</common:ApprovalType>

                                <common:ApprovalReference>Validating Authority Reference</common:ApprovalReference>

                                <common:ApproverDetails>

                                    <common:ApproverName>Validating Authority</common:ApproverName>

                                    <common:ApproverRole>PublicProsecutor</common:ApproverRole>

                                    <common:ApproverContactDetails>

                                        <common:Name>Name of Validating Authority</common:Name>

                                        <common:Role>Role of VA official</common:Role>

                                        <common:EmailAddress>validating_authority@example.org</common:EmailAddress>

                                        <common:PhoneNumber>33199000004</common:PhoneNumber>

                                        <common:FaxNumber>33199000005</common:FaxNumber>

                                        <common:Address>Address of Validating Authority</common:Address>

                                        <common:Languages>

                                            <common:ISO639Set1LanguageIdentifier>de</common:ISO639Set1LanguageIdentifier>

                                        </common:Languages>

                                        <common:Languages>

                                            <common:ISO639Set1LanguageIdentifier>nl</common:ISO639Set1LanguageIdentifier>

                                        </common:Languages>

                                    </common:ApproverContactDetails>

                                </common:ApproverDetails>

                                <common:ApprovalTimestamp>2025-08-30T00:00:00+01:00</common:ApprovalTimestamp>

                            </auth:AuthorisationApprovalDetails>

                            <auth:AuthorisationFlags>

                                <auth:AuthorisationFlag>

                                    <common:Owner>ETSI</common:Owner>

                                    <common:Name>EPOCAuthorisationFlag</common:Name>

                                    <common:Value>DelayInformingUser</common:Value>

                                </auth:AuthorisationFlag>

                                <auth:AuthorisationFlag>

                                    <common:Owner>ETSI</common:Owner>

                                    <common:Name>EPOCAuthorisationFlag</common:Name>

                                    <common:Value>EnforcingAuthorityNotified</common:Value>

                                </auth:AuthorisationFlag>

                            </auth:AuthorisationFlags>

                            <auth:AuthorisationLegalEntity>Service Provider 1</auth:AuthorisationLegalEntity>

                        </HI1Object>

                    </CREATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>1</ActionIdentifier>

                    <CREATE>

                        <HI1Object xsi:type="task:LDTaskObject">

                            <ObjectIdentifier>8b545f40-c856-4d28-b768-4b241c3ba10a</ObjectIdentifier>

                            <CountryCode>IE</CountryCode>

                            <OwnerIdentifier>issuing-authority-1</OwnerIdentifier>

                            <AssociatedObjects>

                                <AssociatedObject>72a5da8e-b965-4c1b-91cb-bd0ea6c2867b</AssociatedObject>

                            </AssociatedObjects>

                            <task:Reference>IE-service-provider-1-8b545f40-c856-4d28-b768-4b241c3ba10a1</task:Reference>

                            <task:DesiredStatus>

                                <common:Owner>ETSI</common:Owner>

                                <common:Name>LDTaskDesiredStatus</common:Name>

                                <common:Value>AwaitingDisclosure</common:Value>

                            </task:DesiredStatus>

                            <task:RequestDetails>

                                <task:Type>

                                    <common:Owner>ETSI</common:Owner>

                                    <common:Name>RequestType</common:Name>

                                    <common:Value>SubscriberData</common:Value>

                                </task:Type>

                                <task:StartTime>2025-05-26T23:03:00+01:00</task:StartTime>

                                <task:EndTime>2025-06-27T23:03:00+01:00</task:EndTime>

                                <task:RequestValues>

                                    <task:RequestValue>

                                        <task:FormatType>

                                            <task:FormatOwner>ETSI</task:FormatOwner>

                                            <task:FormatName>InternationalE164</task:FormatName>

                                        </task:FormatType>

                                        <task:Value>9995550123</task:Value>

                                    </task:RequestValue>

                                </task:RequestValues>

                                <task:Subtype>

                                    <task:RequestSubtype>

                                        <common:Owner>ETSI</common:Owner>

                                        <common:Name>EPOCRequestSubtype</common:Name>

                                        <common:Value>UserInformation</common:Value>

                                    </task:RequestSubtype>

                                    <task:RequestSubtype>

                                        <common:Owner>ETSI</common:Owner>

                                        <common:Name>EPOCRequestSubtype</common:Name>

                                        <common:Value>RegistrationInformation</common:Value>

                                    </task:RequestSubtype>

                                </task:Subtype>

                            </task:RequestDetails>

                            <task:DeliveryDetails>

                                <task:LDDeliveryDestination>

                                    <task:DeliveryAddress>

                                        <task:EndpointID>

                                            <CountryCode>DE</CountryCode>

                                            <UniqueIdentifier>issuing-authority-1</UniqueIdentifier>

                                        </task:EndpointID>

                                    </task:DeliveryAddress>

                                    <task:LDDeliveryProfile>

                                        <common:Owner>ETSI</common:Owner>

                                        <common:Name>EPOCDeliveryProfile</common:Name>

                                        <common:Value>IssuingAuthority</common:Value>

                                    </task:LDDeliveryProfile>

                                </task:LDDeliveryDestination>

                                <task:LDDeliveryDestination>

                                    <task:DeliveryAddress>

                                        <task:EndpointID>

                                            <CountryCode>FR</CountryCode>

                                            <UniqueIdentifier>epoc-authority-1</UniqueIdentifier>

                                        </task:EndpointID>

                                    </task:DeliveryAddress>

                                    <task:EncryptionReference>836014d8-1a98-4b57-ab9e-2136ee3c851c</task:EncryptionReference>

                                    <task:LDDeliveryProfile>

                                        <common:Owner>ETSI</common:Owner>

                                        <common:Name>EPOCDeliveryProfile</common:Name>

                                        <common:Value>ValidatingAuthority</common:Value>

                                    </task:LDDeliveryProfile>

                                </task:LDDeliveryDestination>

                            </task:DeliveryDetails>

                        </HI1Object>

                    </CREATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>2</ActionIdentifier>

                    <CREATE>

                        <HI1Object xsi:type="doc:DocumentObject">

                            <ObjectIdentifier>2aa38f59-5b78-41f4-8b6b-aa5751681584</ObjectIdentifier>

                            <CountryCode>DE</CountryCode>

                            <OwnerIdentifier>issuing-authority-1</OwnerIdentifier>

                            <AssociatedObjects>

                                <AssociatedObject>72a5da8e-b965-4c1b-91cb-bd0ea6c2867b</AssociatedObject>

                            </AssociatedObjects>

                            <doc:DocumentName>EPOC/EPOC-PR Form</doc:DocumentName>

                            <doc:DocumentType>

                                <common:Owner>ETSI</common:Owner>

                                <common:Name>EPOCDocumentType</common:Name>

                                <common:Value>Form1</common:Value>

                            </doc:DocumentType>

                            <doc:DocumentBody>

                                <doc:Contents>RVBPQy9FUE9DLVBSIEZvcm0=</doc:Contents>

                                <doc:ContentType>text/plain</doc:ContentType>

                            </doc:DocumentBody>

                        </HI1Object>

                    </CREATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>2</ActionIdentifier>

                    <CREATE>

                        <HI1Object xsi:type="encryption:EncryptionObject">

                            <ObjectIdentifier>836014d8-1a98-4b57-ab9e-2136ee3c851c</ObjectIdentifier>

                            <CountryCode>DE</CountryCode>

                            <OwnerIdentifier>issuing-authority-1</OwnerIdentifier>

                            <AssociatedObjects>

                                <AssociatedObject>72a5da8e-b965-4c1b-91cb-bd0ea6c2867b</AssociatedObject>

                            </AssociatedObjects>

                            <encryption:EncryptionScheme>

                                <common:Owner>ETSI</common:Owner>

                                <common:Name>EncryptionScheme</common:Name>

                                <common:Value>ExampleValue</common:Value>

                            </encryption:EncryptionScheme>

                            <encryption:X509EncryptionDetails>

                                <encryption:X509Certificates>

                                    <encryption:X509CertificateDER>MIIFrzCCA5egAwIBAgIUNnW+dC3d9OE7TYYMSrLqtrWq5SEwDQYJKoZIhvcNAQELBQAwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoME2lzc3VpbmctYXV0aG9yaXR5LTExHDAaBgNVBAsME2lzc3VpbmctYXV0aG9yaXR5LTExHDAaBgNVBAMME2lzc3VpbmctYXV0aG9yaXR5LTEwHhcNMjYwMTA1MTIyNzM5WhcNMjcwMTA1MTIyNzM5WjBnMQswCQYDVQQGEwJERTEcMBoGA1UECgwTaXNzdWluZy1hdXRob3JpdHktMTEcMBoGA1UECwwTaXNzdWluZy1hdXRob3JpdHktMTEcMBoGA1UEAwwTaXNzdWluZy1hdXRob3JpdHktMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOOf2/Ff0XsKLi/fqrfa1W6jG20c1M2v945jpcJ4symsXDZ7+Q17fs6hMDzfetFc9r2sy9lIF0v9Rd3yMnMwBCywKVDRFbPeRcYLXUzNyB99Vhza7g6tK20DcxnCTk/TZpII6sdnLUw3yQsB5awrRf1mUMtYZ7nqjMhNFvMNEmKIEStB/O4yvAZMjr69DQMtORFZjDUR4RMxBRzl6Hh+G/SGnFnAFhlc0mF24sX5JdpnY9mw5C2ZT/MSbBvzFz3DsOSenmeW2WyF6xnZt+LSKjEdpbyII9W+3rqB7h9dkHm8oyKHEilfk/vXbfh94pXydFrC7cTSJOiEWBiviidgvnCcdM6Ih/MjYcE+MDq4qjgfYPv+HpBL/QM3obN4ko3tx2pO74mPKvubqJnlbCm23VLgRA8wqARytzhxpUULUa3IvAloDIdi/sKT4pk112ncz/tcScCVn0vzLJE8LEIqvypJxxQyvaTFItw3ZtNsAsdv3tbEz9jvAVJSng5fEKJvj4AezB2RPDPZIF5mTcZd/uhH+S+a1WjTi9yqoEW1hmpom3krIxaLf5Th6QuBKo/02dkK7J1zhYIBVI6Fj8R+AraN8QMoq5EOKNspgrFqc57XKRt5MFsBCf0pVnqY4rEjFnxI/eH1FpC1fby9JEhBaVhI7cDhR7wV756HQ67svteDAgMBAAGjUzBRMB0GA1UdDgQWBBR9vU5oRVP2t1UmbZvpyWxMw6aaDDAfBgNVHSMEGDAWgBR9vU5oRVP2t1UmbZvpyWxMw6aaDDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQBN74VlUuAivHF56nYhCgdItCKThGG0zEmy2HwbJ+BGK9gLouMSBnw/uxfC+lM6+GWd4hmDqWOgpyUpCu9CD0grElguEjWwbr2jhZRLFxNZNV22XLyRgDsF3rGaJIc6t2VNmiKZzpKQ13CnIKXJ8Sfpt/9UktBYSwD0c9YnEJ6+M5pjz3NKYZakIlRw+ucfzE5H0cipT4hjomUyc2kUR7POZKG7SlEG10G3RnMt0N7b/dTHGdGshZkU3RmWUMGoNroF1ke25yRgN/chxDub+fhJSX7J9vt8lyb3IR3pMoomJJ/rDF23Iips038ZA0LvrdmzAT/+VRvcLkLY7bh9qmM6Zt9YBztrVuBUsgDr67m4waTlU6gC06SQJa+pdx4UJAjtwV23BX1tX+tlrED+1/F7cBe3RPJRESvejB2VibvYYvE34wMgYoMnATuJHDpD+o0a2NDy6dGwGgFs5Oy2QxBq5+f7Bl2z1o2FuAAeQKtwKwWFCPH2ARTRb1kadBSqDAFw9uJGzufX8kseSzvJkfKcG/qJxxzSp1aD8T+MNjwGF09BJ4IthuqcpkmcoOoWHJ+v3qwnhoGqAasI4j25qyYosHp3HtKN4HN5L90SjP1e5IJZWCWZQY1/H/qTss84Y3Gi3AOIQgSpc2zwiH9+gQ51btIifB8+yQJdLXHHqa+nAg==</encryption:X509CertificateDER>

                                </encryption:X509Certificates>

                            </encryption:X509EncryptionDetails>

                        </HI1Object>

                    </CREATE>

                </ActionRequest>

            </ActionRequests>

        </RequestPayload>

    </Payload>

</HI1Message>

104144/examples/form1_fullOutcome_encryptionRequested.xml

0 → 100644
+63 −0

File added.

Preview size limit exceeded, changes collapsed.