diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2020-08-20 06:44:45 +0200 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2020-08-20 06:44:45 +0200 |
| commit | c10ade6cd189b02723bf365230d7152b7d0af970 (patch) | |
| tree | 5d0450147512e6cbb6583739cd927fa66eeb12cf /moaSig/moa-sig-lib/src/main/java/at/gv/egovernment | |
| parent | 4b15590f8200ebad838dcd9c6d593df25e2433ec (diff) | |
| download | moa-sig-c10ade6cd189b02723bf365230d7152b7d0af970.tar.gz moa-sig-c10ade6cd189b02723bf365230d7152b7d0af970.tar.bz2 moa-sig-c10ade6cd189b02723bf365230d7152b7d0af970.zip | |
some test updates
Diffstat (limited to 'moaSig/moa-sig-lib/src/main/java/at/gv/egovernment')
2 files changed, 8 insertions, 7 deletions
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/TSLConfiguration.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/TSLConfiguration.java index 642c28d..be6fe4b 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/TSLConfiguration.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/TSLConfiguration.java @@ -39,7 +39,7 @@ import java.util.List; public interface TSLConfiguration {
/** Default URL of EU TSL */
- public String DEFAULT_EU_TSL_URL = "https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml";
+ public String DEFAULT_EU_TSL_URL = "https://ec.europa.eu/tools/lotl/eu-lotl.xml";
/** Default period (1day=86400000 msec) for update schedule */
public String DEFAULT_UPDATE_SCHEDULE_PERIOD = "86400000";
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java index d023d18..d08669e 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java @@ -24,9 +24,7 @@ package at.gv.egovernment.moa.spss.server.init; -import java.io.FileNotFoundException; import java.io.IOException; -import java.security.cert.CertificateException; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -41,7 +39,6 @@ import at.gv.egovernment.moa.spss.MOAException; import at.gv.egovernment.moa.spss.api.common.TSLConfiguration; import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider; import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator; -import at.gv.egovernment.moa.spss.server.monitoring.ServiceStatusContainer; import at.gv.egovernment.moa.spss.server.service.RevocationArchiveCleaner; import at.gv.egovernment.moa.spss.tsl.TSLServiceFactory; import at.gv.egovernment.moa.spss.tsl.timer.TSLUpdaterTimerTask; @@ -53,9 +50,7 @@ import at.gv.egovernment.moaspss.logging.LoggingContextManager; import at.gv.egovernment.moaspss.util.Constants; import at.gv.egovernment.moaspss.util.DOMUtils; import iaik.asn1.ObjectID; -import iaik.pki.store.certstore.CertStoreException; -import iaik.pki.store.truststore.TrustStoreException; -import iaik.server.ConfigurationData; +import iaik.utils.RFC2253NameParser; /** * MOA SP/SS web service initialization. @@ -165,6 +160,12 @@ public class SystemInitializer { } + Logger.info("Register additional RFC2253 Object identifier"); + RFC2253NameParser.register( + "organizationIdentifier", + new ObjectID("2.5.4.97", "organizationIdentifier", (String) null, false)); + + Logger.info("Building IAIK-MOA configuration ... "); new IaikConfigurator().configure(config); |