aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorKlaus Stranacher <kstranacher@iaik.tugraz.at>2013-08-21 13:12:26 +0200
committerKlaus Stranacher <kstranacher@iaik.tugraz.at>2013-08-21 13:12:26 +0200
commit5b697c424d24a7523dccd210454d029368e34898 (patch)
tree9dc5efda7d874930db0245ae34d3cd676b6c7c11 /common
parenta52d3300d20837b12b45a0d4fb2b0ee520f6e641 (diff)
downloadmoa-id-spss-5b697c424d24a7523dccd210454d029368e34898.tar.gz
moa-id-spss-5b697c424d24a7523dccd210454d029368e34898.tar.bz2
moa-id-spss-5b697c424d24a7523dccd210454d029368e34898.zip
Update QC/SSCD check
WSDL location updated
Diffstat (limited to 'common')
-rw-r--r--common/src/main/resources/resources/schemas/MOA-SPSS-1.5.2.xsd34
1 files changed, 23 insertions, 11 deletions
diff --git a/common/src/main/resources/resources/schemas/MOA-SPSS-1.5.2.xsd b/common/src/main/resources/resources/schemas/MOA-SPSS-1.5.2.xsd
index 640f577aa..144918778 100644
--- a/common/src/main/resources/resources/schemas/MOA-SPSS-1.5.2.xsd
+++ b/common/src/main/resources/resources/schemas/MOA-SPSS-1.5.2.xsd
@@ -147,7 +147,7 @@
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="SignerInfo" type="dsig:KeyInfoType">
<xsd:annotation>
- <xsd:documentation>only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any; SecureSignatureCreationDevice is included as X509Data/any</xsd:documentation>
+ <xsd:documentation>only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any; SecureSignatureCreationDevice is included as X509Data/any, IssuingCountry is included as X509Data/any</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="SignatureCheck" type="CheckResultType"/>
@@ -198,7 +198,7 @@
<xsd:sequence>
<xsd:element name="SignerInfo" type="dsig:KeyInfoType">
<xsd:annotation>
- <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any; SecureSignatureCreationDevice is included as X509Data/any</xsd:documentation>
+ <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any; SecureSignatureCreationDevice is included as X509Data/any, IssuingCountry is included as X509Data/any</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="HashInputData" type="InputDataType" minOccurs="0" maxOccurs="unbounded"/>
@@ -454,19 +454,31 @@
</xsd:element>
</xsd:choice>
</xsd:complexType>
- <xsd:element name="QualifiedCertificate"/>
+ <xsd:element name="QualifiedCertificate">
+ <xsd:complexType>
+ <xsd:attribute name="source" use="optional">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="TSL"/>
+ <xsd:enumeration value="Certificate"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
<xsd:element name="SecureSignatureCreationDevice">
<xsd:complexType>
- <xsd:attribute name="source" use="required">
- <xsd:simpleType>
- <xsd:restriction base="xsd:token">
- <xsd:enumeration value="TSL"/>
- <xsd:enumeration value="Certificate"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
+ <xsd:attribute name="source" use="optional">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="TSL"/>
+ <xsd:enumeration value="Certificate"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
</xsd:complexType>
</xsd:element>
+ <xsd:element name="IssuingCountry" type="xsd:token"/>
<xsd:element name="PublicAuthority" type="PublicAuthorityType"/>
<xsd:complexType name="PublicAuthorityType">
<xsd:sequence>