aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2017-07-26 10:21:28 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2017-07-26 10:21:28 +0200
commit6ccca3ba6245fe4517a37382eed75ade2edbfd6a (patch)
treec1320481ac9494760eb51b22e412f7e668237d4a /id
parent122de0a09f42fcc7e2fa0a429df5da37820fd730 (diff)
downloadmoa-id-spss-6ccca3ba6245fe4517a37382eed75ade2edbfd6a.tar.gz
moa-id-spss-6ccca3ba6245fe4517a37382eed75ade2edbfd6a.tar.bz2
moa-id-spss-6ccca3ba6245fe4517a37382eed75ade2edbfd6a.zip
update MOA-Sig to 3.1.0
update IAIK_JCE to 5.5-RC1 to solve problem with Java JDK 8.141
Diffstat (limited to 'id')
-rw-r--r--id/moa-spss-container/pom.xml53
-rw-r--r--id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml22
2 files changed, 51 insertions, 24 deletions
diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml
index 61e72989f..fe6ea0c47 100644
--- a/id/moa-spss-container/pom.xml
+++ b/id/moa-spss-container/pom.xml
@@ -47,7 +47,7 @@
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-sig-lib</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -65,18 +65,28 @@
<dependency>
<groupId>MOA.spss</groupId>
<artifactId>common</artifactId>
- <version>3.0.0</version>
- </dependency>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>MOA.spss</groupId>
+ <artifactId>tsl_lib</artifactId>
+ <version>2.0.0</version>
+ </dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_cms</artifactId>
<version>5.1</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_cpades</artifactId>
- <version>2.2b3_tmp</version>
- </dependency>
+ <version>2.3_moa</version>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_cpxlevel</artifactId>
+ <version>0.9_moa</version>
+ </dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_eccelerate</artifactId>
@@ -86,12 +96,12 @@
<groupId>iaik.prod</groupId>
<artifactId>iaik_eccelerate_addon</artifactId>
<version>3.01_eval</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_eccelerate_cms</artifactId>
<version>3.01</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_jce_full</artifactId>
@@ -101,46 +111,41 @@
<groupId>iaik.prod</groupId>
<artifactId>iaik_jsse</artifactId>
<version>4.4</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_moa</artifactId>
- <version>2.01</version>
- </dependency>
+ <version>2.04</version>
+ </dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_pki_module</artifactId>
- <version>1.1.1_moa</version>
- </dependency>
+ <version>1.02_moa</version>
+ </dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_sva</artifactId>
- <version>1.0.1_moa</version>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_tsl</artifactId>
- <version>1.1_moa</version>
- </dependency>
+ <version>1.0.2_moa</version>
+ </dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_tsp</artifactId>
<version>2.31_eval</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_util</artifactId>
<version>0.23</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_xades</artifactId>
- <version>2.11_moa</version>
+ <version>2.12_moa</version>
</dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_xsect</artifactId>
- <version>2.11_moa</version>
+ <version>2.12_moa</version>
</dependency>
diff --git a/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml b/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml
index d2facbd1a..31fc8a16c 100644
--- a/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml
+++ b/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml
@@ -3,6 +3,8 @@
<cfg:MOAConfiguration xmlns:cfg="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
<cfg:SignatureVerification>
<cfg:CertificateValidation>
+ <!-- ReadTimeout in seconds-->
+ <cfg:ReadTimeout>30</cfg:ReadTimeout>
<cfg:PathConstruction>
<cfg:AutoAddCertificates>true</cfg:AutoAddCertificates>
<cfg:UseAuthorityInformationAccess>true</cfg:UseAuthorityInformationAccess>
@@ -42,6 +44,13 @@
<cfg:TrustProfile>
<cfg:Id>C-PEPS-Test</cfg:Id>
<cfg:TrustAnchorsLocation>trustProfiles/C-PEPS-Test</cfg:TrustAnchorsLocation>
+ <!--cfg:EUTSL-->
+ <!-- Optional kann eine Länderliste mit zweistelligen Länderkürzeln angegeben werden (d.h. nur die -->
+ <!-- Vertrauensanker der angegeben Länder werden importiert) -->
+ <!--cfg:CountrySelection>AT,BE</cfg:CountrySelection>
+ <cfg:AllowedTSPStatus></cfg:AllowedTSPStatus>
+ <cfg:AllowedTSPServiceTypes></cfg:AllowedTSPServiceTypes>
+ </cfg:EUTSL-->
</cfg:TrustProfile>
<cfg:TrustProfile>
<cfg:Id>C-PEPS</cfg:Id>
@@ -86,6 +95,19 @@
</cfg:CA>
</cfg:CrlRetentionIntervals>
</cfg:RevocationChecking>
+ <!-- Optionale Angabe einer TSL Konfiguration-->
+ <!-- Wichtig: Das WorkingDirectory muss jedenfalls den Unterordner „trust“ aus der Beispielkonfiguration beinhalten. -->
+ <!-- <cfg:TSLConfiguration>
+ <cfg:UpdateSchedule>
+ <cfg:StartTime>02:00:00</cfg:StartTime>
+ <cfg:Period>86400000</cfg:Period>
+ </cfg:UpdateSchedule>
+ <cfg:WorkingDirectory>tslworking</cfg:WorkingDirectory>
+ <cfg:Evaluation>
+ <cfg:QCQualifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC,http://uri.etsi.org/TrstSvc/Svctype/TSA/QTST</cfg:QCQualifier>
+ <cfg:SSCDQualifier>http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD,http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithQSCD</cfg:SSCDQualifier>
+ </cfg:Evaluation>
+ </cfg:TSLConfiguration>-->
</cfg:CertificateValidation>
<cfg:VerifyTransformsInfoProfile>
<cfg:Id>MOAIDTransformAuthBlockTable_DE_2.0</cfg:Id>