From 1ad814ccbbe4f65f430ac738104e3f3c8256c229 Mon Sep 17 00:00:00 2001
From: Klaus Stranacher <kstranacher@iaik.tugraz.at>
Date: Tue, 16 Apr 2013 14:44:08 +0200
Subject: Update digest algorithm, XAdES version, whitelisting

---
 common/.settings/org.eclipse.wst.common.component  |  5 +-
 .../java/at/gv/egovernment/moa/util/Constants.java | 14 +++++
 .../resources/schemas/MOA-SPSS-config-1.5.2.xsd    | 60 ++++++++++++++++------
 3 files changed, 61 insertions(+), 18 deletions(-)

(limited to 'common')

diff --git a/common/.settings/org.eclipse.wst.common.component b/common/.settings/org.eclipse.wst.common.component
index 4dd7e3409..386d0ebba 100644
--- a/common/.settings/org.eclipse.wst.common.component
+++ b/common/.settings/org.eclipse.wst.common.component
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
   <wb-module deploy-name="moa-common">
     <wb-resource deploy-path="/" source-path="src/main/java"/>
     <wb-resource deploy-path="/" source-path="src/main/resources"/>
   </wb-module>
-</project-modules>
\ No newline at end of file
+</project-modules>
diff --git a/common/src/main/java/at/gv/egovernment/moa/util/Constants.java b/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
index c4f7eb3f3..7e98f0427 100644
--- a/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
@@ -397,6 +397,20 @@ public interface Constants {
   /** URI of the SHA1 digest algorithm */
   public static final String SHA1_URI =
     "http://www.w3.org/2000/09/xmldsig#sha1";
+  
+  /** URI of the SHA1 digest algorithm */
+  public static final String SHA256_URI =
+    "http://www.w3.org/2000/09/xmldsig#sha256";
+  
+  /** URI of the SHA1 digest algorithm */
+  public static final String SHA384_URI =
+    "http://www.w3.org/2000/09/xmldsig#sha384";
+  
+  /** URI of the SHA1 digest algorithm */
+  public static final String SHA512_URI =
+    "http://www.w3.org/2000/09/xmldsig#sha512";
+  
+  // TODO Supported Hash-Algorithms?
 
   /** URI of the Canonical XML algorithm */
   public static final String C14N_URI =
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 669ebe53f..63b09f45a 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
@@ -19,20 +19,36 @@
 									</xs:sequence>
 								</xs:complexType>
 							</xs:element>
-							<xs:element name="PermitExternalUris" minOccurs="0">
-								<xs:complexType>
-									<xs:sequence minOccurs="0" maxOccurs="unbounded">
-										<xs:element name="BlackListUri">
-											<xs:complexType>
-												<xs:sequence>
-													<xs:element name="IP" type="xs:string"/>
-													<xs:element name="Port" type="xs:int" minOccurs="0"/>
-												</xs:sequence>
-											</xs:complexType>
-										</xs:element>
-									</xs:sequence>
-								</xs:complexType>
-							</xs:element>
+							<xs:choice>
+								<xs:element name="PermitExternalUris" minOccurs="0">
+									<xs:complexType>
+										<xs:sequence minOccurs="0">
+											<xs:element name="BlackListUri" minOccurs="0" maxOccurs="unbounded">
+												<xs:complexType>
+													<xs:sequence>
+														<xs:element name="IP" type="xs:string"/>
+														<xs:element name="Port" type="xs:int" minOccurs="0"/>
+													</xs:sequence>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
+								<xs:element name="ForbidExternalUris" minOccurs="0">
+									<xs:complexType>
+										<xs:sequence>
+											<xs:element name="WhiteListUri" minOccurs="0" maxOccurs="unbounded">
+												<xs:complexType>
+													<xs:sequence>
+														<xs:element name="IP" type="xs:string"/>
+														<xs:element name="Port" type="xs:int" minOccurs="0"/>
+													</xs:sequence>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
+							</xs:choice>
 						</xs:sequence>
 					</xs:complexType>
 				</xs:element>
@@ -78,6 +94,7 @@
 												</xs:complexType>
 											</xs:element>
 										</xs:sequence>
+										<xs:element name="DigestMethodAlgorithm" minOccurs="0"/>
 									</xs:sequence>
 								</xs:complexType>
 							</xs:element>
@@ -99,6 +116,19 @@
 							</xs:element>
 							<xs:element name="CreateTransformsInfoProfile" type="config:ProfileType" minOccurs="0" maxOccurs="unbounded"/>
 							<xs:element name="CreateSignatureEnvironmentProfile" type="config:ProfileType" minOccurs="0" maxOccurs="unbounded"/>
+							<xs:element name="XAdES" minOccurs="0">
+								<xs:complexType>
+									<xs:sequence>
+										<xs:element name="Version">
+											<xs:simpleType>
+												<xs:restriction base="xs:token">
+													<xs:enumeration value="1.4.2"/>
+												</xs:restriction>
+											</xs:simpleType>
+										</xs:element>
+									</xs:sequence>
+								</xs:complexType>
+							</xs:element>
 						</xs:sequence>
 					</xs:complexType>
 				</xs:element>
@@ -147,7 +177,7 @@
 															</xs:sequence>
 														</xs:complexType>
 													</xs:element>
-													<xs:element name="TrustProfile" maxOccurs="unbounded">
+													<xs:element name="TrustProfile" minOccurs="0" maxOccurs="unbounded">
 														<xs:complexType>
 															<xs:sequence>
 																<xs:element name="Id" type="xs:token"/>
-- 
cgit v1.2.3