Skip to content

Commit 4a1b67d

Browse files
metsmametsma
committed
Validate TSL XSD schemas
IB-8160 Signed-off-by: Raul Metsma <[email protected]>
1 parent 79d7001 commit 4a1b67d

9 files changed

+1320
-2
lines changed

‎etc/schema/ts_119612v020101_additionaltypes_xsd.xsd

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- ****** NOTICE ******
3+
This document is part of ETSI TS 119 612. In the event that any
4+
part of this document in conflict with the text of TS 119 612
5+
then that text shall prevail as the authoritative source
6+
-->
7+
<xsd:schema targetNamespace="http://uri.etsi.org/02231/v2/additionaltypes#" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tslx="http://uri.etsi.org/02231/v2/additionaltypes#" xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" xmlns:tsl="http://uri.etsi.org/02231/v2#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="qualified" attributeFormDefault="unqualified">
8+
<xsd:import namespace="http://uri.etsi.org/02231/v2#" schemaLocation="ts_119612v020201_201601xsd.xsd"/>
9+
<xsd:import namespace="http://uri.etsi.org/01903/v1.3.2#" schemaLocation="XAdES01903v132-201601.xsd"/>
10+
<!-- -->
11+
<!-- -->
12+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.3.13 Pointers to other TSLs</xsd:documentation></xsd:annotation>
13+
<xsd:element name="MimeType" type="xsd:string"/>
14+
<xsd:annotation><xsd:documentation>X509CertificateLocation element was specified in TS 102 231 v3.1.2 clause B.4.3 The ServiceDigitalIdentityType. It is now deprecated and is not used</xsd:documentation></xsd:annotation>
15+
<xsd:element name="X509CertificateLocation" type="tsl:NonEmptyURIType"/>
16+
<xsd:annotation><xsd:documentation>PublicKeyLocation element was specified in TS 102 231 v3.1.2 clause B.4.3 The ServiceDigitalIdentityType. It is now deprecated and is not used</xsd:documentation></xsd:annotation>
17+
<xsd:element name="PublicKeyLocation" type="tsl:NonEmptyURIType"/>
18+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.3 OtherCriteria, bullet 1) ExtendedKeyUsage</xsd:documentation></xsd:annotation>
19+
<xsd:element name="ExtendedKeyUsage" type="tslx:ExtendedKeyUsageType"/>
20+
<xsd:complexType name="ExtendedKeyUsageType">
21+
<xsd:sequence maxOccurs="unbounded">
22+
<xsd:element name="KeyPurposeId" type="xades:ObjectIdentifierType"/>
23+
</xsd:sequence>
24+
</xsd:complexType>
25+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.3 TakenOverBy Extension</xsd:documentation></xsd:annotation>
26+
<xsd:element name="TakenOverBy" type="tslx:TakenOverByType"/>
27+
<xsd:complexType name="TakenOverByType">
28+
<xsd:sequence>
29+
<xsd:element name="URI" type="tsl:NonEmptyMultiLangURIType"/>
30+
<xsd:element name="TSPName" type="tsl:InternationalNamesType"/>
31+
<xsd:element ref="tsl:SchemeOperatorName"/>
32+
<xsd:element ref="tsl:SchemeTerritory"/>
33+
<xsd:element name="OtherQualifier" type="tsl:AnyType" minOccurs="0" maxOccurs="unbounded"/>
34+
</xsd:sequence>
35+
</xsd:complexType>
36+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.3 OtherCriteria, bullet 2) CertSubjectDNAttribute</xsd:documentation></xsd:annotation>
37+
<xsd:element name="CertSubjectDNAttribute" type="tslx:CertSubjectDNAttributeType"/>
38+
<xsd:complexType name="CertSubjectDNAttributeType">
39+
<xsd:sequence maxOccurs="unbounded">
40+
<xsd:element name="AttributeOID" type="xades:ObjectIdentifierType"/>
41+
</xsd:sequence>
42+
</xsd:complexType>
43+
</xsd:schema>

‎etc/schema/ts_119612v020101_additionaltypes_xsd.xsd.orig

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- ****** NOTICE ******
3+
This document is part of ETSI TS 119 612. In the event that any
4+
part of this document in conflict with the text of TS 119 612
5+
then that text shall prevail as the authoritative source
6+
-->
7+
<xsd:schema targetNamespace="http://uri.etsi.org/02231/v2/additionaltypes#" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tslx="http://uri.etsi.org/02231/v2/additionaltypes#" xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" xmlns:tsl="http://uri.etsi.org/02231/v2#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="qualified" attributeFormDefault="unqualified">
8+
<xsd:import namespace="http://uri.etsi.org/02231/v2#" schemaLocation="http://uri.etsi.org/19612/v1.2.1/tsl.xsd"/>
9+
<xsd:import namespace="http://uri.etsi.org/01903/v1.3.2#" schemaLocation="http://uri.etsi.org/01903/v1.3.2/XAdES.xsd"/>
10+
<!-- -->
11+
<!-- -->
12+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.3.13 Pointers to other TSLs</xsd:documentation></xsd:annotation>
13+
<xsd:element name="MimeType" type="xsd:string"/>
14+
<xsd:annotation><xsd:documentation>X509CertificateLocation element was specified in TS 102 231 v3.1.2 clause B.4.3 The ServiceDigitalIdentityType. It is now deprecated and is not used</xsd:documentation></xsd:annotation>
15+
<xsd:element name="X509CertificateLocation" type="tsl:NonEmptyURIType"/>
16+
<xsd:annotation><xsd:documentation>PublicKeyLocation element was specified in TS 102 231 v3.1.2 clause B.4.3 The ServiceDigitalIdentityType. It is now deprecated and is not used</xsd:documentation></xsd:annotation>
17+
<xsd:element name="PublicKeyLocation" type="tsl:NonEmptyURIType"/>
18+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.3 OtherCriteria, bullet 1) ExtendedKeyUsage</xsd:documentation></xsd:annotation>
19+
<xsd:element name="ExtendedKeyUsage" type="tslx:ExtendedKeyUsageType"/>
20+
<xsd:complexType name="ExtendedKeyUsageType">
21+
<xsd:sequence maxOccurs="unbounded">
22+
<xsd:element name="KeyPurposeId" type="xades:ObjectIdentifierType"/>
23+
</xsd:sequence>
24+
</xsd:complexType>
25+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.3 TakenOverBy Extension</xsd:documentation></xsd:annotation>
26+
<xsd:element name="TakenOverBy" type="tslx:TakenOverByType"/>
27+
<xsd:complexType name="TakenOverByType">
28+
<xsd:sequence>
29+
<xsd:element name="URI" type="tsl:NonEmptyMultiLangURIType"/>
30+
<xsd:element name="TSPName" type="tsl:InternationalNamesType"/>
31+
<xsd:element ref="tsl:SchemeOperatorName"/>
32+
<xsd:element ref="tsl:SchemeTerritory"/>
33+
<xsd:element name="OtherQualifier" type="tsl:AnyType" minOccurs="0" maxOccurs="unbounded"/>
34+
</xsd:sequence>
35+
</xsd:complexType>
36+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.3 OtherCriteria, bullet 2) CertSubjectDNAttribute</xsd:documentation></xsd:annotation>
37+
<xsd:element name="CertSubjectDNAttribute" type="tslx:CertSubjectDNAttributeType"/>
38+
<xsd:complexType name="CertSubjectDNAttributeType">
39+
<xsd:sequence maxOccurs="unbounded">
40+
<xsd:element name="AttributeOID" type="xades:ObjectIdentifierType"/>
41+
</xsd:sequence>
42+
</xsd:complexType>
43+
</xsd:schema>

‎etc/schema/ts_119612v020101_sie_xsd.xsd

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- ****** NOTICE ******
3+
This document is part of ETSI TS 119 612. In the event that any
4+
part of this document in conflict with the text of TS 119 612
5+
then that text shall prevail as the authoritative source
6+
-->
7+
<xsd:schema targetNamespace="http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#" xmlns:tsl="http://uri.etsi.org/02231/v2#" xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="qualified" attributeFormDefault="unqualified">
8+
<xsd:import namespace="http://uri.etsi.org/01903/v1.3.2#" schemaLocation="XAdES01903v132-201601.xsd"/>
9+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2 Qualifications Extension</xsd:documentation></xsd:annotation>
10+
<xsd:element name="Qualifications" type="tns:QualificationsType"/>
11+
<xsd:complexType name="QualificationsType">
12+
<xsd:sequence maxOccurs="unbounded">
13+
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.1 QualificationElement-->
14+
<xsd:element name="QualificationElement" type="tns:QualificationElementType"/>
15+
</xsd:sequence>
16+
</xsd:complexType>
17+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.1 QualificationElement</xsd:documentation></xsd:annotation>
18+
<xsd:complexType name="QualificationElementType">
19+
<xsd:sequence>
20+
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.3 Qualifier-->
21+
<xsd:element name="Qualifiers" type="tns:QualifiersType"/>
22+
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2 CriteriaList-->
23+
<xsd:element name="CriteriaList" type="tns:CriteriaListType"/>
24+
</xsd:sequence>
25+
</xsd:complexType>
26+
<xsd:annotation>
27+
<xsd:documentation>Please first try to use the CriteriaList before doing the OtherCriteria extension point.</xsd:documentation>
28+
</xsd:annotation>
29+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2 CriteriaList</xsd:documentation></xsd:annotation>
30+
<xsd:complexType name="CriteriaListType">
31+
<xsd:sequence>
32+
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.1 KeyUsage-->
33+
<xsd:element name="KeyUsage" type="tns:KeyUsageType" minOccurs="0" maxOccurs="unbounded"/>
34+
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.2 PolicySet-->
35+
<xsd:element name="PolicySet" type="tns:PoliciesListType" minOccurs="0" maxOccurs="unbounded"/>
36+
<xsd:element name="CriteriaList" type="tns:CriteriaListType" minOccurs="0" maxOccurs="unbounded"/>
37+
<xsd:element name="Description" type="xsd:string" minOccurs="0"/>
38+
<xsd:element name="otherCriteriaList" type="xades:AnyType" minOccurs="0"/>
39+
</xsd:sequence>
40+
<xsd:attribute name="assert">
41+
<xsd:simpleType>
42+
<xsd:restriction base="xsd:string">
43+
<xsd:enumeration value="all"/>
44+
<xsd:enumeration value="atLeastOne"/>
45+
<xsd:enumeration value="none"/>
46+
</xsd:restriction>
47+
</xsd:simpleType>
48+
</xsd:attribute>
49+
</xsd:complexType>
50+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.3 Qualifier</xsd:documentation></xsd:annotation>
51+
<xsd:complexType name="QualifiersType">
52+
<xsd:sequence maxOccurs="unbounded">
53+
<xsd:element name="Qualifier" type="tns:QualifierType"/>
54+
</xsd:sequence>
55+
</xsd:complexType>
56+
<xsd:complexType name="QualifierType">
57+
<xsd:attribute name="uri" type="anyURI"/>
58+
</xsd:complexType>
59+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.2 PolicySet</xsd:documentation></xsd:annotation>
60+
<xsd:complexType name="PoliciesListType">
61+
<xsd:sequence maxOccurs="unbounded">
62+
<xsd:element name="PolicyIdentifier" type="xades:ObjectIdentifierType"/>
63+
</xsd:sequence>
64+
</xsd:complexType>
65+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.1 KeyUsage</xsd:documentation></xsd:annotation>
66+
<xsd:complexType name="KeyUsageType">
67+
<xsd:sequence maxOccurs="9">
68+
<xsd:element name="KeyUsageBit" type="tns:KeyUsageBitType"/>
69+
</xsd:sequence>
70+
</xsd:complexType>
71+
<xsd:complexType name="KeyUsageBitType">
72+
<xsd:simpleContent>
73+
<xsd:extension base="xsd:boolean">
74+
<xsd:attribute name="name">
75+
<xsd:simpleType>
76+
<xsd:restriction base="xsd:string">
77+
<xsd:enumeration value="digitalSignature"/>
78+
<xsd:enumeration value="nonRepudiation"/>
79+
<xsd:enumeration value="keyEncipherment"/>
80+
<xsd:enumeration value="dataEncipherment"/>
81+
<xsd:enumeration value="keyAgreement"/>
82+
<xsd:enumeration value="keyCertSign"/>
83+
<xsd:enumeration value="crlSign"/>
84+
<xsd:enumeration value="encipherOnly"/>
85+
<xsd:enumeration value="decipherOnly"/>
86+
</xsd:restriction>
87+
</xsd:simpleType>
88+
</xsd:attribute>
89+
</xsd:extension>
90+
</xsd:simpleContent>
91+
</xsd:complexType>
92+
</xsd:schema>

‎etc/schema/ts_119612v020101_sie_xsd.xsd.orig

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- ****** NOTICE ******
3+
This document is part of ETSI TS 119 612. In the event that any
4+
part of this document in conflict with the text of TS 119 612
5+
then that text shall prevail as the authoritative source
6+
-->
7+
<xsd:schema targetNamespace="http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#" xmlns:tsl="http://uri.etsi.org/02231/v2#" xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="qualified" attributeFormDefault="unqualified">
8+
<xsd:import namespace="http://uri.etsi.org/01903/v1.3.2#" schemaLocation="http://uri.etsi.org/01903/v1.3.2/XAdES.xsd"/>
9+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2 Qualifications Extension</xsd:documentation></xsd:annotation>
10+
<xsd:element name="Qualifications" type="tns:QualificationsType"/>
11+
<xsd:complexType name="QualificationsType">
12+
<xsd:sequence maxOccurs="unbounded">
13+
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.1 QualificationElement-->
14+
<xsd:element name="QualificationElement" type="tns:QualificationElementType"/>
15+
</xsd:sequence>
16+
</xsd:complexType>
17+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.1 QualificationElement</xsd:documentation></xsd:annotation>
18+
<xsd:complexType name="QualificationElementType">
19+
<xsd:sequence>
20+
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.3 Qualifier-->
21+
<xsd:element name="Qualifiers" type="tns:QualifiersType"/>
22+
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2 CriteriaList-->
23+
<xsd:element name="CriteriaList" type="tns:CriteriaListType"/>
24+
</xsd:sequence>
25+
</xsd:complexType>
26+
<xsd:annotation>
27+
<xsd:documentation>Please first try to use the CriteriaList before doing the OtherCriteria extension point.</xsd:documentation>
28+
</xsd:annotation>
29+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2 CriteriaList</xsd:documentation></xsd:annotation>
30+
<xsd:complexType name="CriteriaListType">
31+
<xsd:sequence>
32+
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.1 KeyUsage-->
33+
<xsd:element name="KeyUsage" type="tns:KeyUsageType" minOccurs="0" maxOccurs="unbounded"/>
34+
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.2 PolicySet-->
35+
<xsd:element name="PolicySet" type="tns:PoliciesListType" minOccurs="0" maxOccurs="unbounded"/>
36+
<xsd:element name="CriteriaList" type="tns:CriteriaListType" minOccurs="0" maxOccurs="unbounded"/>
37+
<xsd:element name="Description" type="xsd:string" minOccurs="0"/>
38+
<xsd:element name="otherCriteriaList" type="xades:AnyType" minOccurs="0"/>
39+
</xsd:sequence>
40+
<xsd:attribute name="assert">
41+
<xsd:simpleType>
42+
<xsd:restriction base="xsd:string">
43+
<xsd:enumeration value="all"/>
44+
<xsd:enumeration value="atLeastOne"/>
45+
<xsd:enumeration value="none"/>
46+
</xsd:restriction>
47+
</xsd:simpleType>
48+
</xsd:attribute>
49+
</xsd:complexType>
50+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.3 Qualifier</xsd:documentation></xsd:annotation>
51+
<xsd:complexType name="QualifiersType">
52+
<xsd:sequence maxOccurs="unbounded">
53+
<xsd:element name="Qualifier" type="tns:QualifierType"/>
54+
</xsd:sequence>
55+
</xsd:complexType>
56+
<xsd:complexType name="QualifierType">
57+
<xsd:attribute name="uri" type="anyURI"/>
58+
</xsd:complexType>
59+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.2 PolicySet</xsd:documentation></xsd:annotation>
60+
<xsd:complexType name="PoliciesListType">
61+
<xsd:sequence maxOccurs="unbounded">
62+
<xsd:element name="PolicyIdentifier" type="xades:ObjectIdentifierType"/>
63+
</xsd:sequence>
64+
</xsd:complexType>
65+
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.1 KeyUsage</xsd:documentation></xsd:annotation>
66+
<xsd:complexType name="KeyUsageType">
67+
<xsd:sequence maxOccurs="9">
68+
<xsd:element name="KeyUsageBit" type="tns:KeyUsageBitType"/>
69+
</xsd:sequence>
70+
</xsd:complexType>
71+
<xsd:complexType name="KeyUsageBitType">
72+
<xsd:simpleContent>
73+
<xsd:extension base="xsd:boolean">
74+
<xsd:attribute name="name">
75+
<xsd:simpleType>
76+
<xsd:restriction base="xsd:string">
77+
<xsd:enumeration value="digitalSignature"/>
78+
<xsd:enumeration value="nonRepudiation"/>
79+
<xsd:enumeration value="keyEncipherment"/>
80+
<xsd:enumeration value="dataEncipherment"/>
81+
<xsd:enumeration value="keyAgreement"/>
82+
<xsd:enumeration value="keyCertSign"/>
83+
<xsd:enumeration value="crlSign"/>
84+
<xsd:enumeration value="encipherOnly"/>
85+
<xsd:enumeration value="decipherOnly"/>
86+
</xsd:restriction>
87+
</xsd:simpleType>
88+
</xsd:attribute>
89+
</xsd:extension>
90+
</xsd:simpleContent>
91+
</xsd:complexType>
92+
</xsd:schema>

0 commit comments

Comments
 (0)