From 5e72494c61164869fbb605a134fe224ac5d5e7d8 Mon Sep 17 00:00:00 2001 From: kstranacher_eGovL Date: Thu, 27 Dec 2012 21:25:50 +0000 Subject: Update Integration TSL Library Update MOA-SP documentation Update repository (for TSL integration) Update MOA-ID (Organwalter bPK from MIS) git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1302 d688527b-c9ab-4aba-bd8d-4036d912da1d --- common/.settings/org.eclipse.jdt.core.prefs | 19 ++- .../org.eclipse.wst.common.project.facet.core.xml | 2 +- .../resources/schemas/MOA-SPSS-config-1.5.2.xsd | 2 +- .../auth/.settings/org.eclipse.jdt.core.prefs | 19 ++- .../.settings/org.eclipse.wst.common.component | 5 +- .../org.eclipse.wst.common.project.facet.core.xml | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 +- .../.settings/org.eclipse.wst.common.component | 7 +- .../moa/id/auth/AuthenticationServer.java | 16 +- .../id/auth/servlet/GetMISSessionIDServlet.java | 9 +- .../moa/id/util/client/mis/simple/MISMandate.java | 10 +- .../id/util/client/mis/simple/MISSimpleClient.java | 19 ++- .../proxy/.settings/org.eclipse.jdt.core.prefs | 9 +- .../org.eclipse.wst.common.project.facet.core.xml | 2 +- id/templates/.classpath | 2 +- id/templates/.settings/org.eclipse.jdt.core.prefs | 9 +- .../org.eclipse.wst.common.project.facet.core.xml | 2 +- pom.xml | 18 +- .../iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar | Bin 0 -> 34853 bytes .../iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar.md5 | 1 + .../iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar.sha1 | 1 + .../iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom | 9 + .../iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom.md5 | 1 + .../iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom.sha1 | 1 + .../iaik/prod/iaik_jsse/maven-metadata-local.xml | 12 ++ .../0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar | Bin 0 -> 543360 bytes .../iaik_tsl-0.0.2-SNAPSHOT.jar.lastUpdated | 3 + .../0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar.md5 | 1 + .../iaik_tsl-0.0.2-SNAPSHOT.jar.sha1 | 1 + .../0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom | 9 + .../iaik_tsl-0.0.2-SNAPSHOT.pom.lastUpdated | 3 + .../0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom.md5 | 1 + .../iaik_tsl-0.0.2-SNAPSHOT.pom.sha1 | 1 + .../0.0.2-SNAPSHOT/maven-metadata-local.xml | 12 ++ .../0.0.2-SNAPSHOT/resolver-status.properties | 3 + .../iaik/prod/iaik_tsl/maven-metadata-local.xml | 12 ++ .../iaik/prod/iaik_util/0.23/iaik_util-0.23.jar | Bin 0 -> 39372 bytes .../prod/iaik_util/0.23/iaik_util-0.23.jar.md5 | 1 + .../prod/iaik_util/0.23/iaik_util-0.23.jar.sha1 | 1 + .../iaik/prod/iaik_util/0.23/iaik_util-0.23.pom | 9 + .../prod/iaik_util/0.23/iaik_util-0.23.pom.md5 | 1 + .../prod/iaik_util/0.23/iaik_util-0.23.pom.sha1 | 1 + .../iaik/prod/iaik_util/maven-metadata-local.xml | 12 ++ .../iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar | Bin 0 -> 401150 bytes .../1.1709142/iaik_xsect-1.1709142.jar.md5 | 1 + .../1.1709142/iaik_xsect-1.1709142.jar.sha1 | 1 + .../iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom | 9 + .../1.1709142/iaik_xsect-1.1709142.pom.md5 | 1 + .../1.1709142/iaik_xsect-1.1709142.pom.sha1 | 1 + .../iaik/prod/iaik_xsect/maven-metadata-local.xml | 12 ++ .../3.7.8-SNAPSHOT/maven-metadata-local.xml | 12 ++ .../3.7.8-SNAPSHOT/resolver-status.properties | 3 + .../3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar | Bin 0 -> 3516830 bytes .../sqlite-jdbc-3.7.8-SNAPSHOT.jar.lastUpdated | 3 + .../sqlite-jdbc-3.7.8-SNAPSHOT.jar.md5 | 1 + .../sqlite-jdbc-3.7.8-SNAPSHOT.jar.sha1 | 1 + .../3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom | 9 + .../sqlite-jdbc-3.7.8-SNAPSHOT.pom.lastUpdated | 3 + .../sqlite-jdbc-3.7.8-SNAPSHOT.pom.md5 | 1 + .../sqlite-jdbc-3.7.8-SNAPSHOT.pom.sha1 | 1 + .../xerial/sqlite-jdbc/maven-metadata-local.xml | 12 ++ spss/handbook/clients/api/.classpath | 10 +- .../api/.settings/org.eclipse.jdt.core.prefs | 9 +- spss/handbook/clients/referencedData/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 9 +- .../org.eclipse.wst.common.project.facet.core.xml | 2 +- spss/handbook/clients/webservice/.classpath | 10 +- .../.settings/org.eclipse.jdt.core.prefs | 9 +- .../handbook/config/MOA-SPSS-config-1.5.2.xsd | 12 +- spss/handbook/handbook/config/config.html | 51 +++++- spss/handbook/handbook/install/install.html | 2 +- spss/server/history.txt | 12 ++ .../serverlib/.settings/org.eclipse.jdt.core.prefs | 2 +- .../org.eclipse.wst.common.project.facet.core.xml | 2 +- spss/server/serverlib/pom.xml | 27 ++- .../xmlbind/VerifyCMSSignatureResponseBuilder.java | 3 +- .../moa/spss/server/init/SystemInitializer.java | 30 ++-- .../invoke/CMSSignatureVerificationInvoker.java | 80 ++++++++- .../invoke/VerifyCMSSignatureResponseBuilder.java | 27 ++- .../invoke/XMLSignatureVerificationInvoker.java | 29 ++-- .../moa/spss/tsl/config/Configurator.java | 6 +- .../moa/spss/tsl/connector/TSLConnector.java | 9 +- .../moa/spss/tsl/timer/TSLUpdaterTimerTask.java | 181 ++++++++++++--------- .../properties/spss_messages_de.properties | 5 +- spss/server/serverws/.classpath | 46 ++++-- .../serverws/.settings/org.eclipse.jdt.core.prefs | 11 +- .../org.eclipse.wst.common.project.facet.core.xml | 6 +- spss/server/tools/.classpath | 2 +- .../tools/.settings/org.eclipse.jdt.core.prefs | 9 +- 89 files changed, 669 insertions(+), 263 deletions(-) create mode 100644 repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar create mode 100644 repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar.md5 create mode 100644 repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar.sha1 create mode 100644 repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom create mode 100644 repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom.md5 create mode 100644 repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom.sha1 create mode 100644 repository/iaik/prod/iaik_jsse/maven-metadata-local.xml create mode 100644 repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar create mode 100644 repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar.lastUpdated create mode 100644 repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar.md5 create mode 100644 repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar.sha1 create mode 100644 repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom create mode 100644 repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom.lastUpdated create mode 100644 repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom.md5 create mode 100644 repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom.sha1 create mode 100644 repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/maven-metadata-local.xml create mode 100644 repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/resolver-status.properties create mode 100644 repository/iaik/prod/iaik_tsl/maven-metadata-local.xml create mode 100644 repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar create mode 100644 repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar.md5 create mode 100644 repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar.sha1 create mode 100644 repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.pom create mode 100644 repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.pom.md5 create mode 100644 repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.pom.sha1 create mode 100644 repository/iaik/prod/iaik_util/maven-metadata-local.xml create mode 100644 repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar create mode 100644 repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.md5 create mode 100644 repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.sha1 create mode 100644 repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom create mode 100644 repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.md5 create mode 100644 repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.sha1 create mode 100644 repository/iaik/prod/iaik_xsect/maven-metadata-local.xml create mode 100644 repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/maven-metadata-local.xml create mode 100644 repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/resolver-status.properties create mode 100644 repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar create mode 100644 repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar.lastUpdated create mode 100644 repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar.md5 create mode 100644 repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar.sha1 create mode 100644 repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom create mode 100644 repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom.lastUpdated create mode 100644 repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom.md5 create mode 100644 repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom.sha1 create mode 100644 repository/org/xerial/sqlite-jdbc/maven-metadata-local.xml diff --git a/common/.settings/org.eclipse.jdt.core.prefs b/common/.settings/org.eclipse.jdt.core.prefs index 9c6309855..926e77f2f 100644 --- a/common/.settings/org.eclipse.jdt.core.prefs +++ b/common/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,13 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate +#Thu Dec 27 15:45:20 CET 2012 org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning diff --git a/common/.settings/org.eclipse.wst.common.project.facet.core.xml b/common/.settings/org.eclipse.wst.common.project.facet.core.xml index eb7de6322..656f15b87 100644 --- a/common/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/common/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file 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 4791c1488..669ebe53f 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 @@ -156,7 +156,7 @@ - + diff --git a/id/server/auth/.settings/org.eclipse.jdt.core.prefs b/id/server/auth/.settings/org.eclipse.jdt.core.prefs index 7ba572a76..f9077e609 100644 --- a/id/server/auth/.settings/org.eclipse.jdt.core.prefs +++ b/id/server/auth/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,13 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate +#Thu Dec 27 15:45:26 CET 2012 org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component index 45a7c1471..7b7368902 100644 --- a/id/server/auth/.settings/org.eclipse.wst.common.component +++ b/id/server/auth/.settings/org.eclipse.wst.common.component @@ -14,9 +14,8 @@ uses - - - + + diff --git a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml index a801c94a0..564572b10 100644 --- a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs b/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs index 6d046587d..735c5ab7c 100644 --- a/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs +++ b/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,13 @@ +#Thu Dec 27 16:30:52 CET 2012 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.source=1.5 diff --git a/id/server/idserverlib/.settings/org.eclipse.wst.common.component b/id/server/idserverlib/.settings/org.eclipse.wst.common.component index 7ea6221a5..de749d201 100644 --- a/id/server/idserverlib/.settings/org.eclipse.wst.common.component +++ b/id/server/idserverlib/.settings/org.eclipse.wst.common.component @@ -3,9 +3,6 @@ - - - - + - + \ No newline at end of file diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java index 2964f8a88..a2c1d6131 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java @@ -1872,6 +1872,7 @@ public class AuthenticationServer implements MOAIDAuthConstants { identificationType = ParepUtils.getIdentification(mandator, "Type"); identificationValue = ParepUtils.extractMandatorWbpk(mandator); + prPerson = ParepUtils.extractPrPersonOfMandate(mandate); if (physical && session.getBusinessService() @@ -1911,14 +1912,15 @@ public class AuthenticationServer implements MOAIDAuthConstants { // vsresp, // replacementIdentityLink); + Element mandatePerson = tempIdentityLink.getPrPerson(); - // try { - // System.out.println("MANDATE: " + - // DOMUtils.serializeNode(mandatePerson)); - // } - // catch(Exception e) { - // e.printStackTrace(); - // } +// try { +// System.out.println("MANDATE: " + +// DOMUtils.serializeNode(mandatePerson)); +// } +// catch(Exception e) { +// e.printStackTrace(); +// } String mandateData = null; boolean useCondition = false; int conditionLength = -1; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java index 74b2f80b9..a1b03fcad 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java @@ -35,6 +35,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerException; import org.apache.commons.lang.StringEscapeUtils; import org.w3c.dom.Element; @@ -44,6 +45,7 @@ import at.gv.egovernment.moa.id.MOAIDException; import at.gv.egovernment.moa.id.auth.AuthenticationServer; import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; import at.gv.egovernment.moa.id.auth.WrongParametersException; +import at.gv.egovernment.moa.id.auth.builder.BPKBuilder; import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.config.ConnectionParameter; @@ -158,7 +160,8 @@ public class GetMISSessionIDServlet extends AuthServlet { } // for now: list contains only one element - MISMandate mandate = (MISMandate)list.get(0); + MISMandate mandate = (MISMandate)list.get(0); + // verify mandate signature AuthenticationServer.getInstance().verifyMandate(sessionID, mandate); @@ -166,7 +169,9 @@ public class GetMISSessionIDServlet extends AuthServlet { byte[] byteMandate = mandate.getMandate(); String stringMandate = new String(byteMandate); Element mandateDoc = DOMUtils.parseDocument(stringMandate, false, null, null).getDocumentElement(); - //session.setMandateElem(mandateDoc.getDocumentElement()); + + //TODO OW bPK (Offen: was bei saml:NameIdentifier NameQualifier="urn:publicid:gv.at:cdid+bpk"> und - + \ No newline at end of file diff --git a/id/templates/.classpath b/id/templates/.classpath index ca3d70965..0173dfd90 100644 --- a/id/templates/.classpath +++ b/id/templates/.classpath @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/id/templates/.settings/org.eclipse.jdt.core.prefs b/id/templates/.settings/org.eclipse.jdt.core.prefs index a519d2f62..ac2f76dec 100644 --- a/id/templates/.settings/org.eclipse.jdt.core.prefs +++ b/id/templates/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,6 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 -org.eclipse.jdt.core.compiler.compliance=1.4 +#Thu Dec 27 15:45:24 CET 2012 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml index a801c94a0..564572b10 100644 --- a/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 32fcbff5e..4f8d9cd55 100644 --- a/pom.xml +++ b/pom.xml @@ -46,8 +46,8 @@ true ${env.BUILD_EXECUTEABLE} ${env.BUILD_VERSION} - 1.4 - 1.4 + 1.5 + 1.5 @@ -338,18 +338,18 @@ - iaik + iaik.prod iaik_tsl 0.0.2-SNAPSHOT - iaik - iaik.util + iaik.prod + iaik_util 0.23 - iaik - iaik.xsect + iaik.prod + iaik_xsect 1.1709142 @@ -368,8 +368,8 @@ 3.7.8-SNAPSHOT - iaik - iaik.jsse + iaik.prod + iaik_jsse 4.4 diff --git a/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar b/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar new file mode 100644 index 000000000..15b320422 Binary files /dev/null and b/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar differ diff --git a/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar.md5 b/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar.md5 new file mode 100644 index 000000000..d423f8914 --- /dev/null +++ b/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar.md5 @@ -0,0 +1 @@ +e8ca0f20a1d31626a240f29997a69407 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar.sha1 b/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar.sha1 new file mode 100644 index 000000000..b08ba905d --- /dev/null +++ b/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar.sha1 @@ -0,0 +1 @@ +7db1305a10af438876c69800c0341c330747005a \ No newline at end of file diff --git a/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom b/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom new file mode 100644 index 000000000..f61afb3c1 --- /dev/null +++ b/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + iaik.prod + iaik_jsse + 4.4 + POM was created from install:install-file + diff --git a/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom.md5 b/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom.md5 new file mode 100644 index 000000000..f96359f79 --- /dev/null +++ b/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom.md5 @@ -0,0 +1 @@ +e488d7e61470a8d36ecfd5dd6981bdd6 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom.sha1 b/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom.sha1 new file mode 100644 index 000000000..67421c871 --- /dev/null +++ b/repository/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.pom.sha1 @@ -0,0 +1 @@ +39ab0c22044b57bdee9ae3a56afa7349a0bc41c4 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_jsse/maven-metadata-local.xml b/repository/iaik/prod/iaik_jsse/maven-metadata-local.xml new file mode 100644 index 000000000..5363e86d8 --- /dev/null +++ b/repository/iaik/prod/iaik_jsse/maven-metadata-local.xml @@ -0,0 +1,12 @@ + + + iaik.prod + iaik_jsse + 4.4 + + + 4.4 + + 20121227130938 + + diff --git a/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar new file mode 100644 index 000000000..241dbff7f Binary files /dev/null and b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar differ diff --git a/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar.lastUpdated b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar.lastUpdated new file mode 100644 index 000000000..ab7af62d9 --- /dev/null +++ b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar.lastUpdated @@ -0,0 +1,3 @@ +#Last modified on: Thu Dec 27 14:05:38 CET 2012 +#Thu Dec 27 14:05:38 CET 2012 +MOA=1356613538568 diff --git a/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar.md5 b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar.md5 new file mode 100644 index 000000000..e89eb733d --- /dev/null +++ b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar.md5 @@ -0,0 +1 @@ +d61e17cfab195ace55d6aab4134057cc \ No newline at end of file diff --git a/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar.sha1 b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar.sha1 new file mode 100644 index 000000000..c07abd7e7 --- /dev/null +++ b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar.sha1 @@ -0,0 +1 @@ +ba408f6a16ddf375c6dc8c5925bee66a2fef0bf9 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom new file mode 100644 index 000000000..6e923d489 --- /dev/null +++ b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + iaik.prod + iaik_tsl + 0.0.2-SNAPSHOT + POM was created from install:install-file + diff --git a/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom.lastUpdated b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom.lastUpdated new file mode 100644 index 000000000..b50698d8c --- /dev/null +++ b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom.lastUpdated @@ -0,0 +1,3 @@ +#Last modified on: Thu Dec 27 14:05:37 CET 2012 +#Thu Dec 27 14:05:37 CET 2012 +MOA=1356613537915 diff --git a/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom.md5 b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom.md5 new file mode 100644 index 000000000..c33b19dcf --- /dev/null +++ b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom.md5 @@ -0,0 +1 @@ +e045e46303c2c1bb348b5137489b209e \ No newline at end of file diff --git a/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom.sha1 b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom.sha1 new file mode 100644 index 000000000..2f3293a26 --- /dev/null +++ b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.pom.sha1 @@ -0,0 +1 @@ +31236933e6104b6165e39b1184c04c41132b6c24 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/maven-metadata-local.xml b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/maven-metadata-local.xml new file mode 100644 index 000000000..3e04f192d --- /dev/null +++ b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/maven-metadata-local.xml @@ -0,0 +1,12 @@ + + + iaik.prod + iaik_tsl + 0.0.2-SNAPSHOT + + + true + + 20121227131129 + + diff --git a/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/resolver-status.properties b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/resolver-status.properties new file mode 100644 index 000000000..acb8f4807 --- /dev/null +++ b/repository/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/resolver-status.properties @@ -0,0 +1,3 @@ +#Last modified on: Thu Dec 27 14:05:37 CET 2012 +#Thu Dec 27 14:05:37 CET 2012 +MOA.maven-metadata-MOA.xml.lastUpdated=1356613537913 diff --git a/repository/iaik/prod/iaik_tsl/maven-metadata-local.xml b/repository/iaik/prod/iaik_tsl/maven-metadata-local.xml new file mode 100644 index 000000000..ba442c16e --- /dev/null +++ b/repository/iaik/prod/iaik_tsl/maven-metadata-local.xml @@ -0,0 +1,12 @@ + + + iaik.prod + iaik_tsl + 0.0.2-SNAPSHOT + + + 0.0.2-SNAPSHOT + + 20121227131129 + + diff --git a/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar b/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar new file mode 100644 index 000000000..78370c31e Binary files /dev/null and b/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar differ diff --git a/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar.md5 b/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar.md5 new file mode 100644 index 000000000..4edf13692 --- /dev/null +++ b/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar.md5 @@ -0,0 +1 @@ +c6ef3fbb7016e67e3908ece9692b69fe \ No newline at end of file diff --git a/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar.sha1 b/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar.sha1 new file mode 100644 index 000000000..059a1cfbf --- /dev/null +++ b/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar.sha1 @@ -0,0 +1 @@ +0293046456e4ecd4eade95a093d691a9df37d401 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.pom b/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.pom new file mode 100644 index 000000000..9611eb92d --- /dev/null +++ b/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + iaik.prod + iaik_util + 0.23 + POM was created from install:install-file + diff --git a/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.pom.md5 b/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.pom.md5 new file mode 100644 index 000000000..562d7488a --- /dev/null +++ b/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.pom.md5 @@ -0,0 +1 @@ +b0aadf66e779c8eb81ed79e43878ec6f \ No newline at end of file diff --git a/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.pom.sha1 b/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.pom.sha1 new file mode 100644 index 000000000..214268856 --- /dev/null +++ b/repository/iaik/prod/iaik_util/0.23/iaik_util-0.23.pom.sha1 @@ -0,0 +1 @@ +bf46929ec8d2d6c7326288908f33f18717419a38 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_util/maven-metadata-local.xml b/repository/iaik/prod/iaik_util/maven-metadata-local.xml new file mode 100644 index 000000000..f17c31182 --- /dev/null +++ b/repository/iaik/prod/iaik_util/maven-metadata-local.xml @@ -0,0 +1,12 @@ + + + iaik.prod + iaik_util + 0.23 + + + 0.23 + + 20121227131037 + + diff --git a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar new file mode 100644 index 000000000..96732584e Binary files /dev/null and b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar differ diff --git a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.md5 b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.md5 new file mode 100644 index 000000000..3a8da6efa --- /dev/null +++ b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.md5 @@ -0,0 +1 @@ +89b44f2bb7af33e0d64c44d7e29bf44f \ No newline at end of file diff --git a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.sha1 b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.sha1 new file mode 100644 index 000000000..75ba4775e --- /dev/null +++ b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar.sha1 @@ -0,0 +1 @@ +05f1f36dc4236378636b3729aee8c3c06833e1fa \ No newline at end of file diff --git a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom new file mode 100644 index 000000000..ee8f8bc32 --- /dev/null +++ b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + iaik.prod + iaik_xsect + 1.1709142 + POM was created from install:install-file + diff --git a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.md5 b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.md5 new file mode 100644 index 000000000..bd6040e63 --- /dev/null +++ b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.md5 @@ -0,0 +1 @@ +aa4706972500d34752b02a3742be0b7c \ No newline at end of file diff --git a/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.sha1 b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.sha1 new file mode 100644 index 000000000..65a5f1f18 --- /dev/null +++ b/repository/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.pom.sha1 @@ -0,0 +1 @@ +8433f3cc273a6ed6f507a7ee15918f80872d6b61 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_xsect/maven-metadata-local.xml b/repository/iaik/prod/iaik_xsect/maven-metadata-local.xml new file mode 100644 index 000000000..cc6ac059e --- /dev/null +++ b/repository/iaik/prod/iaik_xsect/maven-metadata-local.xml @@ -0,0 +1,12 @@ + + + iaik.prod + iaik_xsect + 1.1709142 + + + 1.1709142 + + 20121227130718 + + diff --git a/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/maven-metadata-local.xml b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/maven-metadata-local.xml new file mode 100644 index 000000000..1a07edf04 --- /dev/null +++ b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/maven-metadata-local.xml @@ -0,0 +1,12 @@ + + + org.xerial + sqlite-jdbc + 3.7.8-SNAPSHOT + + + true + + 20121227132151 + + diff --git a/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/resolver-status.properties b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/resolver-status.properties new file mode 100644 index 000000000..bf40cd793 --- /dev/null +++ b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/resolver-status.properties @@ -0,0 +1,3 @@ +#Last modified on: Thu Dec 27 12:24:22 CET 2012 +#Thu Dec 27 12:24:22 CET 2012 +MOA.maven-metadata-MOA.xml.lastUpdated=1356607462439 diff --git a/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar new file mode 100644 index 000000000..bcea83745 Binary files /dev/null and b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar differ diff --git a/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar.lastUpdated b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar.lastUpdated new file mode 100644 index 000000000..78b5176b5 --- /dev/null +++ b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar.lastUpdated @@ -0,0 +1,3 @@ +#Last modified on: Mon Dec 17 20:58:30 CET 2012 +#Mon Dec 17 20:58:30 CET 2012 +MOA=1355774310289 diff --git a/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar.md5 b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar.md5 new file mode 100644 index 000000000..78dcc204f --- /dev/null +++ b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar.md5 @@ -0,0 +1 @@ +73e977c31630c2bebb4a476665bbf7fb \ No newline at end of file diff --git a/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar.sha1 b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar.sha1 new file mode 100644 index 000000000..59e8f1e98 --- /dev/null +++ b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar.sha1 @@ -0,0 +1 @@ +7193374401097a37e24bc30a961c19e1af732493 \ No newline at end of file diff --git a/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom new file mode 100644 index 000000000..3f3f3b91b --- /dev/null +++ b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + org.xerial + sqlite-jdbc + 3.7.8-SNAPSHOT + POM was created from install:install-file + diff --git a/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom.lastUpdated b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom.lastUpdated new file mode 100644 index 000000000..b4f47fc4d --- /dev/null +++ b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom.lastUpdated @@ -0,0 +1,3 @@ +#Last modified on: Thu Dec 27 12:24:22 CET 2012 +#Thu Dec 27 12:24:22 CET 2012 +MOA=1356607462442 diff --git a/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom.md5 b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom.md5 new file mode 100644 index 000000000..219a81671 --- /dev/null +++ b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom.md5 @@ -0,0 +1 @@ +2f52b7cb16e62c757bd1db86a2f8e407 \ No newline at end of file diff --git a/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom.sha1 b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom.sha1 new file mode 100644 index 000000000..5580b6c42 --- /dev/null +++ b/repository/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.pom.sha1 @@ -0,0 +1 @@ +8d25a1093d4bb59daac35b0355851e162ce4c8c2 \ No newline at end of file diff --git a/repository/org/xerial/sqlite-jdbc/maven-metadata-local.xml b/repository/org/xerial/sqlite-jdbc/maven-metadata-local.xml new file mode 100644 index 000000000..ed1392d3a --- /dev/null +++ b/repository/org/xerial/sqlite-jdbc/maven-metadata-local.xml @@ -0,0 +1,12 @@ + + + org.xerial + sqlite-jdbc + 3.7.8-SNAPSHOT + + + 3.7.8-SNAPSHOT + + 20121227132151 + + diff --git a/spss/handbook/clients/api/.classpath b/spss/handbook/clients/api/.classpath index 0fb87fef8..cb29bfb96 100644 --- a/spss/handbook/clients/api/.classpath +++ b/spss/handbook/clients/api/.classpath @@ -5,7 +5,8 @@ - + + @@ -29,5 +30,12 @@ + + + + + + + \ No newline at end of file diff --git a/spss/handbook/clients/api/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/api/.settings/org.eclipse.jdt.core.prefs index a519d2f62..48249af31 100644 --- a/spss/handbook/clients/api/.settings/org.eclipse.jdt.core.prefs +++ b/spss/handbook/clients/api/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,6 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 -org.eclipse.jdt.core.compiler.compliance=1.4 +#Thu Dec 27 15:45:23 CET 2012 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/spss/handbook/clients/referencedData/.classpath b/spss/handbook/clients/referencedData/.classpath index ca3d70965..0173dfd90 100644 --- a/spss/handbook/clients/referencedData/.classpath +++ b/spss/handbook/clients/referencedData/.classpath @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs index a519d2f62..86859a78d 100644 --- a/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs +++ b/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,6 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 -org.eclipse.jdt.core.compiler.compliance=1.4 +#Thu Dec 27 15:45:22 CET 2012 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.project.facet.core.xml b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.project.facet.core.xml index a801c94a0..564572b10 100644 --- a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/spss/handbook/clients/webservice/.classpath b/spss/handbook/clients/webservice/.classpath index 0fb87fef8..cb29bfb96 100644 --- a/spss/handbook/clients/webservice/.classpath +++ b/spss/handbook/clients/webservice/.classpath @@ -5,7 +5,8 @@ - + + @@ -29,5 +30,12 @@ + + + + + + + \ No newline at end of file diff --git a/spss/handbook/clients/webservice/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/webservice/.settings/org.eclipse.jdt.core.prefs index a519d2f62..48249af31 100644 --- a/spss/handbook/clients/webservice/.settings/org.eclipse.jdt.core.prefs +++ b/spss/handbook/clients/webservice/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,6 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 -org.eclipse.jdt.core.compiler.compliance=1.4 +#Thu Dec 27 15:45:23 CET 2012 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/spss/handbook/handbook/config/MOA-SPSS-config-1.5.2.xsd b/spss/handbook/handbook/config/MOA-SPSS-config-1.5.2.xsd index 9fdaac33e..669ebe53f 100644 --- a/spss/handbook/handbook/config/MOA-SPSS-config-1.5.2.xsd +++ b/spss/handbook/handbook/config/MOA-SPSS-config-1.5.2.xsd @@ -156,13 +156,14 @@ - + + @@ -282,16 +284,14 @@ - - - - - + + + diff --git a/spss/handbook/handbook/config/config.html b/spss/handbook/handbook/config/config.html index 3863f6c5b..6cb0d4a37 100644 --- a/spss/handbook/handbook/config/config.html +++ b/spss/handbook/handbook/config/config.html @@ -87,6 +87,7 @@
  • Archivierung von Widerrufsinformationen
  • Manuelle Konfiguration von Verteilungspunkten für Widerrufsinformationen
    • +
  • TSL Konfiguration
    • @@ -707,22 +708,27 @@ als relativ zum Pfad jenes Verzeichnisses interpretiert werden, in dem die zentr

    Das Element cfg:TrustProfile weist folgende Kindelemente auf:

      -
    • Id: Dieses obligatorische Element vom Typ xs:token enthält einen +
    • cfg:Id: Dieses obligatorische Element vom Typ xs:token enthält einen frei wählbaren Identifikator für dieses Konfigurationselement, der innerhalb der XML-Konfigurationsdatei eindeutig sein muss. Dieser Identifikator wird im Request zur Signaturprüfung verwendet, um das zu verwendende Vertrauensprofil auszuwählen.
      • -
    • Element TrustAnchorsLocation: Dieses obligatorische Element vom Typ xs:anyURI enthält +
    • Element cfg:TrustAnchorsLocation: Dieses obligatorische Element vom Typ xs:anyURI enthält eine relative oder absolute URL, die ein Verzeichnis im lokalen Dateisystem referenziert. Eine relative URL wird relativ zum Pfad jenes Verzeichnisses interpretiert, in dem die zentrale Konfigurationsdatei gespeichert ist. Eine absolute URL muss als Protokoll-Teil file verwenden. Das referenzierte Verzeichnis muss eine oder mehrere DER-kodierte Zertifikatsdateien beinhalten. Jede Zertifikatsdatei repräsentiert einen Vertrauensanker.
      • -
    • Element SignerCertsLocation: Dieses optionale Element vom Typ xs:anyURI enthält +
    • Element cfg:SignerCertsLocation: Dieses optionale Element vom Typ xs:anyURI enthält eine relative oder absolute URL, die ein Verzeichnis im lokalen Dateisystem referenziert. Eine relative URL wird relativ zum Pfad jenes Verzeichnisses interpretiert, in dem die zentrale Konfigurationsdatei gespeichert ist. Eine absolute URL muss als Protokoll-Teil file verwenden. Das referenzierte Verzeichnis muss eine oder mehrere DER-kodierte Zertifikatsdateien beinhalten. Jede Zertifikatsdatei - repräsentiert ein explizit erlaubtes Signatorzertifikat.
      • + repräsentiert ein explizit erlaubtes Signatorzertifikat. +
    • Element cfg:EUTSL: Dieses optionale Element aktiviert bei Vorhandensein die EU-TSL Unterstüzung für dieses Vertrauensprofile. D.h. als Vertrauensanker werden jene CA-Zertifikate herangezogen, die zum gegenwärtigen Zeitpunkt auf der EU-TSL bzw. den entsprechenden TSLs der Mitgliedsstaaten befugt sind qualifizierte Zertifikate auszustellen und dessen Zertififierungsdiensteanbieter unter dem ServiceLevel "accredited" oder "undersupervision" stehen. Des Weiteren werden bei TSL-aktivierten Vertrauensprofilen, die Überprüfung auf qualifiziertes Zertifikat (QC-Überprüfung) und die Überprüfung auf sichere Signaturerstellungseinheit (SSCD-Überprüfung) über die EU-TSL durchgeführt.
      + Zusätzliche kann ein optionales Kind-Element + cfg:CountrySelection angegeben werden. Dieses Element definiert eine komma-separierte Liste an zweistelligen Länderkürzeln nach ISO 3166. Ist so eine Liste vorhanden, werden nur die Vertrauensanker der angegebenen Ländern herangezogen.
      + Wichtig: Es können zusätzlich manuelle Vertrauensanker via cfg:TrustAnchorsLocation konfiguriert werden. Hierbei ist jedoch, insbesondere beim Hinzufügen von Enduser-Zertifikaten als Vertrauensanker, zu beachten, dass eine QC- bzw. SSCD-Überprüfung gegebenfalls nicht erfolgreich durchgeführt werden kann.
      + Wichtig: Bei aktivierter TSL-Unterstützung muss einen entsprechende TSL Konfiguration angegeben werden (siehe TSL Konfiguration).
    @@ -992,7 +998,42 @@ Wird der Wert auf -1 gesetzt, dann bedeutet das ein unendlich langes Intervall. -

    2.3.2 Profil für Transformationen

    +
    2.3.1.3.7 + TSL Konfiguration
    + + + + + + + + + + + + + + + + + +
    Namecfg:SignatureVerification/cfg:CertificateValidation/cfg:TSLConfiguration
    GebrauchNull oder einmal
    Erläuterung

    Das Element cfg:TSLConfiguration legt die TSL Konfiguration fest, wenn Vertrauensprofile mit TSL Unterstützung konfiguriert sind. Das Element weist folgende Kind-Elemente auf: +

      +
        +
      • Element cfg:UpdateSchedule: Dieses Element legt fest wann und in welchem Intervall die EU-TSL erneut eingelesen werden soll. Das Element cfg:UpdateSchedule besteht dabei aus folgenden Kind-Elementen:
        • +
          +
        • Element cfg:StartTime: Legt eine Startzeit im Format hh:mm:ss fest.
          • +
        • Element cfg:Period: Legt das Intervall (in Millisekunden) fest, in welchem die EU-TSL erneut eingelesen werden soll
          • +
        + Hinweis: Wird kein cfg:UpdateSchedule Element angegeben so wird defaultmäßig 02:00.00 als Startzeit und 86400000 Millisekunden (=1 Tag) als Intervall herangezogen + +
      • Element cfg:WorkingDirectory: Diese Element gibt einen Pfad zum Arbeitsverzeichnis (inkl. Lese- und Schreibrechte) für die TSL an. Enthält dieses Element eine relative Pfadangabe, so wird dieser relativ zum Verzeichnis in dem sich die MOA-SPSS Konfigurationsdatei befindet interpretiert.
        + Wichtig: Das angegebene Verzeichnis muss jedenfalls die Unterverzeichnis + "trust" aus der Beispiel-Konfiguration beinhalten. In dessen Unterverzeichnis "eu" müssen jene vertrauenswürdige Zertifikate angegeben werden, mit denen die EU-TSL signiert ist.
        • +
      +

      Wichtig: Beim Tomcat-Start muss zusätzlich noch ein so genannten Hashcache Verzeichnis angegeben werden. Dies erfolgt mit dem Parameter iaik.xml.crypto.tsl.BinaryHashCache.DIR (siehe auch Starten und Stoppen von Tomcat).

      +

      Hinweis: Um die TSL Überprüfung zu aktivieren muss auch (zumindest) ein Vertrauensprofil mit TSL Überprüfung konfiguriert werden (siehe Vertrauensprofil)

      
    +

    2.3.2 Profil für Transformationen

    diff --git a/spss/handbook/handbook/install/install.html b/spss/handbook/handbook/install/install.html index 1f9ed69e4..7abb103bd 100644 --- a/spss/handbook/handbook/install/install.html +++ b/spss/handbook/handbook/install/install.html @@ -40,7 +40,7 @@
  • Einsatz des MOA SP/SS Webservices in Tomcat
    • -
  • Starten und Stoppen von Tomcat +
  • Starten und Stoppen von Tomcat
    1. Unter Windows
    2. Unter Unix
      3. diff --git a/spss/server/history.txt b/spss/server/history.txt index 7154bd22f..7d1d3d323 100644 --- a/spss/server/history.txt +++ b/spss/server/history.txt @@ -1,3 +1,15 @@ +############## +1.5.2 +############## + +- TSL Unterstützung +- Libraries aktualisiert bzw. hinzugefügt: + iaik-moa: Version 1.32 ? + iaik-ixsil: Version 1.2.2.5 ? + Axis: Version 1.0_IAIK ? + iaik-tsl Versio x.x + + ############## 1.5.1 ############## diff --git a/spss/server/serverlib/.settings/org.eclipse.jdt.core.prefs b/spss/server/serverlib/.settings/org.eclipse.jdt.core.prefs index 7dfadf4fe..81f1dbf57 100644 --- a/spss/server/serverlib/.settings/org.eclipse.jdt.core.prefs +++ b/spss/server/serverlib/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Tue Dec 18 14:23:26 CET 2012 +#Thu Dec 27 13:40:40 CET 2012 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 diff --git a/spss/server/serverlib/.settings/org.eclipse.wst.common.project.facet.core.xml b/spss/server/serverlib/.settings/org.eclipse.wst.common.project.facet.core.xml index 3679d8190..656f15b87 100644 --- a/spss/server/serverlib/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/spss/server/serverlib/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -4,4 +4,4 @@ - + \ No newline at end of file diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index 481464f63..d425edb83 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -143,40 +143,33 @@ - iaik + iaik.prod iaik_tsl - - iaik - iaik.util - + iaik.prod + iaik_util - iaik - iaik.xsect - + iaik.prod + iaik_xsect javax.xml.bind jaxb-api - - + com.sun.xml.bind jaxb-impl - org.xerial sqlite-jdbc - - + - iaik - iaik.jsse - - + iaik.prod + iaik_jsse + diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java index 1971096a8..7ad838822 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java @@ -99,7 +99,6 @@ public class VerifyCMSSignatureResponseBuilder { CheckResult signatureCheck = responseElement.getSignatureCheck(); CheckResult certCheck = responseElement.getCertificateCheck(); - // TODO CMS TSL check ResponseBuilderUtils.addSignerInfo( responseDoc, responseElem, @@ -107,7 +106,7 @@ public class VerifyCMSSignatureResponseBuilder { signerInfo.isQualifiedCertificate(), signerInfo.isPublicAuthority(), signerInfo.getPublicAuhtorityID(), - false); + signerInfo.isSSCD()); ResponseBuilderUtils.addCodeInfoElement( responseDoc, diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java index c9b76dd7e..d9e20fda9 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java @@ -135,7 +135,7 @@ public class SystemInitializer { //start TSL Update TSLUpdaterTimerTask.tslconnector_ = tslconnector; - TSLUpdaterTimerTask.update(); + //TSLUpdaterTimerTask.update(); //initialize TSL Update Task initTSLUpdateTask(tslconfig); @@ -147,20 +147,20 @@ public class SystemInitializer { catch (TSLEngineDiedException e) { Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e); } - catch (TSLSearchException e) { - Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e); - } - catch (CertStoreException e) { - Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e); - } catch (TrustStoreException e) { - Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e); - } catch (CertificateException e) { - Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e); - } catch (FileNotFoundException e) { - Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e); - } catch (IOException e) { - Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e); - } +// catch (TSLSearchException e) { +// Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e); +// } +// catch (CertStoreException e) { +// Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e); +// } catch (TrustStoreException e) { +// Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e); +// } catch (CertificateException e) { +// Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e); +// } catch (FileNotFoundException e) { +// Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e); +// } catch (IOException e) { +// Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e); +// } // set IXSIL debug output IXSILInit.setPrintDebugLog( diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java index ba2513d2f..2c4bbd4eb 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java @@ -30,6 +30,9 @@ import iaik.server.modules.cmsverify.CMSSignatureVerificationModule; import iaik.server.modules.cmsverify.CMSSignatureVerificationModuleFactory; import iaik.server.modules.cmsverify.CMSSignatureVerificationProfile; import iaik.server.modules.cmsverify.CMSSignatureVerificationResult; +import iaik.x509.X509Certificate; +import iaik.xml.crypto.tsl.ex.TSLEngineDiedException; +import iaik.xml.crypto.tsl.ex.TSLSearchException; import java.io.IOException; import java.io.InputStream; @@ -37,6 +40,8 @@ import java.util.Date; import java.util.Iterator; import java.util.List; +import at.gv.egovernment.moa.logging.LogMsg; +import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.logging.LoggingContext; import at.gv.egovernment.moa.logging.LoggingContextManager; import at.gv.egovernment.moa.spss.MOAApplicationException; @@ -52,6 +57,8 @@ import at.gv.egovernment.moa.spss.server.logging.IaikLog; import at.gv.egovernment.moa.spss.server.logging.TransactionId; import at.gv.egovernment.moa.spss.server.transaction.TransactionContext; import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager; +import at.gv.egovernment.moa.spss.tsl.timer.TSLUpdaterTimerTask; +import at.gv.egovernment.moa.spss.util.MessageProvider; /** * A class providing an interface to the @@ -183,7 +190,12 @@ public class CMSSignatureVerificationInvoker { for (resultIter = results.iterator(); resultIter.hasNext();) { result = (CMSSignatureVerificationResult) resultIter.next(); - responseBuilder.addResult(result, trustProfile); + + // check QC and SSCD via TSL (if enabled) + boolean checkQCFromTSL = checkQC(trustProfile.isTSLEnabled(), result.getCertificateValidationResult().getCertificateChain()); + boolean checkSSCDFromTSL = checkSSCD(trustProfile.isTSLEnabled(), result.getCertificateValidationResult().getCertificateChain());; + + responseBuilder.addResult(result, trustProfile, checkQCFromTSL, checkSSCDFromTSL); } } else { int i; @@ -194,7 +206,12 @@ public class CMSSignatureVerificationInvoker { try { result = (CMSSignatureVerificationResult) results.get(signatories[i] - 1); - responseBuilder.addResult(result, trustProfile); + // check QC and SSCD via TSL (if enabled) + boolean checkQCFromTSL = checkQC(trustProfile.isTSLEnabled(), result.getCertificateValidationResult().getCertificateChain()); + boolean checkSSCDFromTSL = checkSSCD(trustProfile.isTSLEnabled(), result.getCertificateValidationResult().getCertificateChain());; + + + responseBuilder.addResult(result, trustProfile, checkQCFromTSL, checkSSCDFromTSL); } catch (IndexOutOfBoundsException e) { throw new MOAApplicationException( "2249", @@ -206,6 +223,65 @@ public class CMSSignatureVerificationInvoker { return responseBuilder.getResponse(); } + private boolean checkQC(boolean tslEnabledTrustProfile, List chainlist) { + boolean checkQCFromTSL = false; + try { + if (tslEnabledTrustProfile) { + if (chainlist != null) { + X509Certificate[] chain = new X509Certificate[chainlist.size()]; + + Iterator it = chainlist.iterator(); + int i = 0; + while(it.hasNext()) { + chain[i] = (X509Certificate)it.next(); + i++; + } + + checkQCFromTSL = TSLUpdaterTimerTask.tslconnector_.checkQC(chain); + //checkSSCDFromTSL = TSLUpdaterTimerTask.tslconnector_.checkSSCD(chain); + } + } + } + catch (TSLEngineDiedException e) { + MessageProvider msg = MessageProvider.getInstance(); + Logger.error(new LogMsg(msg.getMessage("tsl.01", null)), e); + } catch (TSLSearchException e) { + MessageProvider msg = MessageProvider.getInstance(); + Logger.error(new LogMsg(msg.getMessage("tsl.01", null)), e); + } + + return checkQCFromTSL; + } + + private boolean checkSSCD(boolean tslEnabledTrustProfile, List chainlist) { + boolean checkSSCDFromTSL = false; + try { + if (tslEnabledTrustProfile) { + if (chainlist != null) { + X509Certificate[] chain = new X509Certificate[chainlist.size()]; + + Iterator it = chainlist.iterator(); + int i = 0; + while(it.hasNext()) { + chain[i] = (X509Certificate)it.next(); + i++; + } + + checkSSCDFromTSL = TSLUpdaterTimerTask.tslconnector_.checkSSCD(chain); + } + } + } + catch (TSLEngineDiedException e) { + MessageProvider msg = MessageProvider.getInstance(); + Logger.error(new LogMsg(msg.getMessage("tsl.01", null)), e); + } catch (TSLSearchException e) { + MessageProvider msg = MessageProvider.getInstance(); + Logger.error(new LogMsg(msg.getMessage("tsl.01", null)), e); + } + + return checkSSCDFromTSL; + } + /** * Get the signed content contained either in the request itself or given as a * reference to external data. diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java index fcd5ae0e7..3b82c6caf 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java @@ -71,9 +71,13 @@ public class VerifyCMSSignatureResponseBuilder { * * @param result The result to add. * @param trustprofile The actual trustprofile + * @param checkQCFromTSL true, if the TSL check verifies the + * certificate as qualified, otherwise false. + * @param checkSSCDFromTSL true, if the TSL check verifies the + * signature based on a SSDC, otherwise false. * @throws MOAException */ - public void addResult(CMSSignatureVerificationResult result, TrustProfile trustProfile) + public void addResult(CMSSignatureVerificationResult result, TrustProfile trustProfile, boolean checkQCFromTSL, boolean checkSSCDFromTSL) throws MOAException { CertificateValidationResult certResult = @@ -86,16 +90,28 @@ public class VerifyCMSSignatureResponseBuilder { SignerInfo signerInfo; CheckResult signatureCheck; CheckResult certificateCheck; - - // TODO Check TSL check + + + boolean qualifiedCertificate = false; + + // verify qualified certificate checks (certificate or TSL) + if (trustProfile.isTSLEnabled()) { + // take TSL result + qualifiedCertificate = checkQCFromTSL; + } + else { + // take result from certificate + qualifiedCertificate = certResult.isQualifiedCertificate(); + } + // add SignerInfo element signerInfo = factory.createSignerInfo( (X509Certificate) certResult.getCertificateChain().get(0), - certResult.isQualifiedCertificate(), + qualifiedCertificate, certResult.isPublicAuthorityCertificate(), certResult.getPublicAuthorityID(), - false); + checkSSCDFromTSL); // add SignatureCheck element signatureCheck = factory.createCheckResult(signatureCheckCode, null); @@ -103,6 +119,7 @@ public class VerifyCMSSignatureResponseBuilder { // add CertificateCheck element certificateCheck = factory.createCheckResult(certificateCheckCode, null); + // build the response element diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java index 290841c66..8a5b6f5b7 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java @@ -229,6 +229,14 @@ public class XMLSignatureVerificationInvoker { profile, signingTime, new TransactionId(context.getTransactionID())); + } catch (IAIKException e) { + MOAException moaException = IaikExceptionMapper.getInstance().map(e); + throw moaException; + } catch (IAIKRuntimeException e) { + MOAException moaException = IaikExceptionMapper.getInstance().map(e); + throw moaException; + } + try { if (tp.isTSLEnabled()) { List list = result.getCertificateValidationResult().getCertificateChain(); if (list != null) { @@ -245,21 +253,14 @@ public class XMLSignatureVerificationInvoker { checkQCFromTSL = TSLUpdaterTimerTask.tslconnector_.checkQC(chain); checkSSCDFromTSL = TSLUpdaterTimerTask.tslconnector_.checkSSCD(chain); } - - } - - } catch (IAIKException e) { - MOAException moaException = IaikExceptionMapper.getInstance().map(e); - throw moaException; - } catch (IAIKRuntimeException e) { - MOAException moaException = IaikExceptionMapper.getInstance().map(e); - throw moaException; - } catch (TSLEngineDiedException e) { - MOAException moaException = IaikExceptionMapper.getInstance().map(e); - throw moaException; + } + } + catch (TSLEngineDiedException e) { + MessageProvider msg = MessageProvider.getInstance(); + Logger.error(new LogMsg(msg.getMessage("tsl.01", null)), e); } catch (TSLSearchException e) { - MOAException moaException = IaikExceptionMapper.getInstance().map(e); - throw moaException; + MessageProvider msg = MessageProvider.getInstance(); + Logger.error(new LogMsg(msg.getMessage("tsl.01", null)), e); } // swap back in the request as root document diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/config/Configurator.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/config/Configurator.java index 7e8dcf0c4..defaedd86 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/config/Configurator.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/config/Configurator.java @@ -41,8 +41,10 @@ public class Configurator { throw new TSLEngineDiedException(e); } - //@TODO Check "/" - Configurator._TSLWorkingDirectoryPath = TSLWorkingDirectoryPath + "/"; + if (!TSLWorkingDirectoryPath.endsWith("/")) + TSLWorkingDirectoryPath += "/"; + + Configurator._TSLWorkingDirectoryPath = TSLWorkingDirectoryPath; initialDefaultConfig(); diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/TSLConnector.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/TSLConnector.java index b88255115..2e4af2817 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/TSLConnector.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/connector/TSLConnector.java @@ -92,17 +92,12 @@ public class TSLConnector implements TSLConnectorInterface { //TODO: clean hascash and TLS Download folder String hashcachedir = System.getProperty("iaik.xml.crypto.tsl.BinaryHashCache.DIR"); - System.out.println("hashcachedir: " + hashcachedir); - if (hashcachedir==null) hashcachedir = DEFAULT_HASHCACHE_DIR; String tsldownloaddir = Configurator.get_TSLWorkingDirectoryPath() + "TslDownload"; - System.out.println("hashcachedir: " + hashcachedir); - File hashcachefile = new File(hashcachedir); - System.out.println("Hashcache: " + hashcachefile.getAbsolutePath()); File[] filelist = hashcachefile.listFiles(); @@ -247,8 +242,8 @@ public class TSLConnector implements TSLConnectorInterface { Countries expectedTerritory = entry.getValue().getSchemeTerritory(); try { - if (expectedTerritory.equals("RO")) - System.out.println("Stop"); +// if (expectedTerritory.equals("RO")) +// System.out.println("Stop"); Number otpId = entry.getKey(); LocationAndCertHash lac = entry.getValue(); diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java index 6798a5db1..c365a1121 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java @@ -1,21 +1,40 @@ package at.gv.egovernment.moa.spss.tsl.timer; import iaik.pki.store.certstore.CertStoreException; +import iaik.pki.store.certstore.CertStoreParameters; import iaik.pki.store.truststore.TrustStoreException; +import iaik.pki.store.truststore.TrustStoreProfile; +import iaik.pki.store.utils.StoreUpdater; +import iaik.server.ConfigurationData; +import iaik.x509.X509Certificate; import iaik.xml.crypto.tsl.ex.TSLEngineDiedException; import iaik.xml.crypto.tsl.ex.TSLSearchException; +import java.io.File; +import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.security.cert.CertificateException; +import java.util.ArrayList; +import java.util.Date; +import java.util.Iterator; +import java.util.Map; import java.util.TimerTask; import at.gv.egovernment.moa.logging.LogMsg; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.spss.MOAApplicationException; +import at.gv.egovernment.moa.spss.api.common.TSLConfiguration; import at.gv.egovernment.moa.spss.server.config.ConfigurationException; +import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider; +import at.gv.egovernment.moa.spss.server.config.TrustProfile; +import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator; +import at.gv.egovernment.moa.spss.server.iaik.pki.store.truststore.TrustStoreProfileImpl; +import at.gv.egovernment.moa.spss.server.logging.TransactionId; import at.gv.egovernment.moa.spss.tsl.connector.TSLConnector; import at.gv.egovernment.moa.spss.util.MessageProvider; +import at.gv.egovernment.moa.util.StringUtils; + public class TSLUpdaterTimerTask extends TimerTask { @@ -31,7 +50,7 @@ public class TSLUpdaterTimerTask extends TimerTask { Logger.error(new LogMsg(msg.getMessage("tsl.00", null)), e); // TODO wenn update nicht erfolgreich, dann soll TSL-Trustprofil nicht zur - // Verfügung stehen. + // Verfügung stehen? } catch (TSLSearchException e) { MessageProvider msg = MessageProvider.getInstance(); @@ -62,86 +81,86 @@ public class TSLUpdaterTimerTask extends TimerTask { } public static void update() throws TSLEngineDiedException, TSLSearchException, ConfigurationException, MOAApplicationException, CertStoreException, TrustStoreException, CertificateException, FileNotFoundException, IOException { -// MessageProvider msg = MessageProvider.getInstance(); -// -// //get TSl configuration -// ConfigurationProvider config = ConfigurationProvider.getInstance(); -// ConfigurationData configData = new IaikConfigurator().configure(config); -// TSLConfiguration tslconfig = config.getTSLConfiguration(); -// if (tslconfig != null) { -// -// Logger.info(new LogMsg(msg.getMessage("config.42", null))); -// -// // get certstore parameters -// CertStoreParameters[] certStoreParameters = configData.getPKIConfiguration().getCertStoreConfiguration().getParameters(); -// -// // iterate over all truststores -// Map mapTrustProfiles = config.getTrustProfiles(); -// Iterator it = mapTrustProfiles.entrySet().iterator(); -// while (it.hasNext()) { -// Map.Entry pairs = (Map.Entry)it.next(); -// TrustProfile tp = (TrustProfile) pairs.getValue(); -// if (tp.isTSLEnabled()) { -// TrustStoreProfile tsp = new TrustStoreProfileImpl(config, tp.getId()); -// TrustStoreProfile[] trustStoreProfiles = new TrustStoreProfile[1]; -// trustStoreProfiles[0] = tsp; -// -// Logger.debug(new LogMsg(msg.getMessage("config.43", new String[]{tp.getId()}))); -// -// TransactionId tid = new TransactionId("TSLConfigurator-" + tp.getId()); -// ArrayList tsl_certs = null; -// if (StringUtils.isEmpty(tp.getCountries())) { -// Logger.debug(new LogMsg(msg.getMessage("config.44", null))); -// -// // get certificates from TSL from all countries -// tsl_certs = tslconnector_.updateAndGetQualifiedCACertificates(new Date(), new String[]{"accredited","undersupervision"}); -// } -// else { -// Logger.debug(new LogMsg(msg.getMessage("config.44", null))); -// // get selected countries as array -// String countries = tp.getCountries(); -// String[] array = countries.split(","); -// for (int i = 0; i < array.length; i++) -// array[i] = array[i].trim(); -// -// // get certificates from TSL from given countries -// tsl_certs = tslconnector_.updateAndGetQualifiedCACertificates(new Date(), array, new String[]{"accredited","undersupervision"}); -// } -// -// // create store updater for each TSL enabled truststore -// Logger.debug(new LogMsg(msg.getMessage("config.45", null))); -// StoreUpdater storeUpdater = new StoreUpdater(certStoreParameters, trustStoreProfiles, tid); -// -// // convert ArrayList to X509Certificate[] -// X509Certificate[] addCertificates = new X509Certificate[tsl_certs.size()]; -// Iterator itcert = tsl_certs.iterator(); -// int i = 0; -// while(itcert.hasNext()) { -// File f = (File)itcert.next(); -// X509Certificate cert = new X509Certificate(new FileInputStream(f)); -// addCertificates[i] = cert; -// -// i++; -// } -// -// // get certificates to be removed -// X509Certificate[] removeCertificates = tp.getCertficatesToBeRemoved(); -// -// -// //Logger.debug(new LogMsg(msg.getMessage("config.44", null))); -// Logger.debug(new LogMsg("Remove " + removeCertificates.length + " certificates.")); -// storeUpdater.removeCertificatesFromTrustStores(removeCertificates, tid); -// -// -// Logger.debug(new LogMsg("Add " + addCertificates.length + " certificates.")); -// storeUpdater.addCertificatesToTrustStores(addCertificates, tid); -// -// // set the certifcates to be removed for the next TSL update -// tp.setCertificatesToBeRemoved(addCertificates); -// -// } -// } -// } + MessageProvider msg = MessageProvider.getInstance(); + + //get TSl configuration + ConfigurationProvider config = ConfigurationProvider.getInstance(); + ConfigurationData configData = new IaikConfigurator().configure(config); + TSLConfiguration tslconfig = config.getTSLConfiguration(); + if (tslconfig != null) { + + Logger.info(new LogMsg(msg.getMessage("config.42", null))); + + // get certstore parameters + CertStoreParameters[] certStoreParameters = configData.getPKIConfiguration().getCertStoreConfiguration().getParameters(); + + // iterate over all truststores + Map mapTrustProfiles = config.getTrustProfiles(); + Iterator it = mapTrustProfiles.entrySet().iterator(); + while (it.hasNext()) { + Map.Entry pairs = (Map.Entry)it.next(); + TrustProfile tp = (TrustProfile) pairs.getValue(); + if (tp.isTSLEnabled()) { + TrustStoreProfile tsp = new TrustStoreProfileImpl(config, tp.getId()); + TrustStoreProfile[] trustStoreProfiles = new TrustStoreProfile[1]; + trustStoreProfiles[0] = tsp; + + Logger.debug(new LogMsg(msg.getMessage("config.43", new String[]{tp.getId()}))); + + TransactionId tid = new TransactionId("TSLConfigurator-" + tp.getId()); + ArrayList tsl_certs = null; + if (StringUtils.isEmpty(tp.getCountries())) { + Logger.debug(new LogMsg(msg.getMessage("config.44", null))); + + // get certificates from TSL from all countries + tsl_certs = tslconnector_.updateAndGetQualifiedCACertificates(new Date(), new String[]{"accredited","undersupervision"}); + } + else { + Logger.debug(new LogMsg(msg.getMessage("config.44", null))); + // get selected countries as array + String countries = tp.getCountries(); + String[] array = countries.split(","); + for (int i = 0; i < array.length; i++) + array[i] = array[i].trim(); + + // get certificates from TSL from given countries + tsl_certs = tslconnector_.updateAndGetQualifiedCACertificates(new Date(), array, new String[]{"accredited","undersupervision"}); + } + + // create store updater for each TSL enabled truststore + Logger.debug(new LogMsg(msg.getMessage("config.45", null))); + StoreUpdater storeUpdater = new StoreUpdater(certStoreParameters, trustStoreProfiles, tid); + + // convert ArrayList to X509Certificate[] + X509Certificate[] addCertificates = new X509Certificate[tsl_certs.size()]; + Iterator itcert = tsl_certs.iterator(); + int i = 0; + while(itcert.hasNext()) { + File f = (File)itcert.next(); + X509Certificate cert = new X509Certificate(new FileInputStream(f)); + addCertificates[i] = cert; + + i++; + } + + // get certificates to be removed + X509Certificate[] removeCertificates = tp.getCertficatesToBeRemoved(); + + + //Logger.debug(new LogMsg(msg.getMessage("config.44", null))); + Logger.debug(new LogMsg("Remove " + removeCertificates.length + " certificates.")); + storeUpdater.removeCertificatesFromTrustStores(removeCertificates, tid); + + + Logger.debug(new LogMsg("Add " + addCertificates.length + " certificates.")); + storeUpdater.addCertificatesToTrustStores(addCertificates, tid); + + // set the certifcates to be removed for the next TSL update + tp.setCertificatesToBeRemoved(addCertificates); + + } + } + } diff --git a/spss/server/serverlib/src/main/resources/resources/properties/spss_messages_de.properties b/spss/server/serverlib/src/main/resources/resources/properties/spss_messages_de.properties index 60786dc8a..645ff9f6d 100644 --- a/spss/server/serverlib/src/main/resources/resources/properties/spss_messages_de.properties +++ b/spss/server/serverlib/src/main/resources/resources/properties/spss_messages_de.properties @@ -145,7 +145,7 @@ config.34=Blacklisted URI: {0}. config.35=External URIs not allowed. config.36=No blacklisted URIs given. config.37=Fehler beim Erstellen der TSL Konfiguration: Name des TSL Arbeits-Verzeichnisses konnte nicht in eine URL umgewandet werden (Wert="{0}") -config.38=Fehler beim Erstellen der TSL Konfiguration: Das TSL Arbeits-Verzeichnis zeigt nicht auf ein existierendes Objekt, das kein Verzeichnis ist (Wert="{0}") +config.38=Fehler beim Erstellen der TSL Konfiguration: Das TSL Arbeits-Verzeichnis ist kein Verzeichnis (Wert="{0}") config.39=TSL Konfguration: Kein Attribut "{0}" angegeben oder Attribut konnte nicht ausgewertet werden. Verwenden Default-Wert ("{1}") config.40=Fehler beim Erstellen der TSL Konfiguration: Es wurde mindestens ein TrustProfile mit aktivierter TSL-Unterstützung konfiguriert. Die allgemeine TSL-Konfiguration ist jedoch fehlerhaft. config.41=Initialisiere TSL Bibliothek @@ -169,4 +169,5 @@ invoker.01=Keine passende Transformationskette gefunden (Index={0}) invoker.02=Der Hashwert der Transformation stimmt nicht überein (Index={0}) invoker.03=Signatorzertifikat aus Trustprofile mit id={0} konnte nicht geparst werden (Dateiname={1}) -tsl.00=Aktulisierung der TSL konnte nicht durchgeführt werden. TrustProfile mit aktiviertem TSL-Support stehen nicht zur Verfügung. \ No newline at end of file +tsl.00=Aktulisierung der TSL konnte nicht durchgeführt werden. TrustProfile mit aktiviertem TSL-Support stehen nicht zur Verfügung. +tsl.01=Fehler bei der QC (qualifiziertes Zertifikat) bzw. SSCD (sichere Signaturerstellungseinheit) Überprüfung via TSL. \ No newline at end of file diff --git a/spss/server/serverws/.classpath b/spss/server/serverws/.classpath index af4743f8a..bd0d802c7 100644 --- a/spss/server/serverws/.classpath +++ b/spss/server/serverws/.classpath @@ -1,12 +1,38 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spss/server/serverws/.settings/org.eclipse.jdt.core.prefs b/spss/server/serverws/.settings/org.eclipse.jdt.core.prefs index 7e3b7e969..0e32dbb18 100644 --- a/spss/server/serverws/.settings/org.eclipse.jdt.core.prefs +++ b/spss/server/serverws/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,8 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +#Thu Dec 27 15:45:22 CET 2012 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml b/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml index df66dd21b..564572b10 100644 --- a/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -2,6 +2,6 @@ - - - + + + \ No newline at end of file diff --git a/spss/server/tools/.classpath b/spss/server/tools/.classpath index a9bfad977..65abf443d 100644 --- a/spss/server/tools/.classpath +++ b/spss/server/tools/.classpath @@ -3,7 +3,7 @@ - + diff --git a/spss/server/tools/.settings/org.eclipse.jdt.core.prefs b/spss/server/tools/.settings/org.eclipse.jdt.core.prefs index a519d2f62..3bfb290ea 100644 --- a/spss/server/tools/.settings/org.eclipse.jdt.core.prefs +++ b/spss/server/tools/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,6 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 -org.eclipse.jdt.core.compiler.compliance=1.4 +#Thu Dec 27 15:45:21 CET 2012 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 -- cgit v1.2.3
    • Name