From a52d3300d20837b12b45a0d4fb2b0ee520f6e641 Mon Sep 17 00:00:00 2001
From: Klaus Stranacher <kstranacher@iaik.tugraz.at>
Date: Wed, 14 Aug 2013 16:36:40 +0200
Subject: TSL integration updates: - Setting of hashcache parameter in MOA -
 Update MOA-SP Response (Source attribute in QualifiedCertificate and
 SecureSignatureCreationDevice element) - Hidden truststores (for TSL enabled
 truststore: given certificates are copied to hidden truststore, where TSL
 certificates are copied) - Update of QC and SSCD detection - Update MOA-SPSS
 config: EU TSL URL can be set via configuration

---
 .../main/resources/resources/schemas/MOA-SPSS-1.5.2.xsd | 17 ++++++++++++++---
 .../resources/schemas/MOA-SPSS-config-1.5.2.xsd         |  1 +
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'common/src/main/resources')

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 de49a4c75..640f577aa 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</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</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</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</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="HashInputData" type="InputDataType" minOccurs="0" maxOccurs="unbounded"/>
@@ -455,7 +455,18 @@
 		</xsd:choice>
 	</xsd:complexType>
 	<xsd:element name="QualifiedCertificate"/>
-	<xsd:element name="SecureSignatureCreationDevice"/>
+	<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:complexType>
+	</xsd:element>
 	<xsd:element name="PublicAuthority" type="PublicAuthorityType"/>
 	<xsd:complexType name="PublicAuthorityType">
 		<xsd:sequence>
diff --git a/common/src/main/resources/resources/schemas/MOA-SPSS-config-1.5.2.xsd b/common/src/main/resources/resources/schemas/MOA-SPSS-config-1.5.2.xsd
index 63b09f45a..91d281171 100644
--- a/common/src/main/resources/resources/schemas/MOA-SPSS-config-1.5.2.xsd
+++ b/common/src/main/resources/resources/schemas/MOA-SPSS-config-1.5.2.xsd
@@ -313,6 +313,7 @@
 										<xs:element name="TSLConfiguration" minOccurs="0">
 											<xs:complexType>
 												<xs:sequence>
+													<xs:element name="EUTSLUrl" type="xs:anyURI" minOccurs="0"/>
 													<xs:element name="UpdateSchedule" minOccurs="0">
 														<xs:complexType>
 															<xs:sequence>
-- 
cgit v1.2.3