aboutsummaryrefslogtreecommitdiff
path: root/common/src
diff options
context:
space:
mode:
authorKlaus Stranacher <kstranacher@iaik.tugraz.at>2013-04-16 14:44:08 +0200
committerKlaus Stranacher <kstranacher@iaik.tugraz.at>2013-04-16 14:44:08 +0200
commit1ad814ccbbe4f65f430ac738104e3f3c8256c229 (patch)
tree1a260bdee968138978f32040831e5627d402da1a /common/src
parent2e54605e4b6b828137ae92ac91564b833bdb8a14 (diff)
downloadmoa-id-spss-1ad814ccbbe4f65f430ac738104e3f3c8256c229.tar.gz
moa-id-spss-1ad814ccbbe4f65f430ac738104e3f3c8256c229.tar.bz2
moa-id-spss-1ad814ccbbe4f65f430ac738104e3f3c8256c229.zip
Update digest algorithm, XAdES version, whitelisting
Diffstat (limited to 'common/src')
-rw-r--r--common/src/main/java/at/gv/egovernment/moa/util/Constants.java14
-rw-r--r--common/src/main/resources/resources/schemas/MOA-SPSS-config-1.5.2.xsd60
2 files changed, 59 insertions, 15 deletions
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"/>