diff options
Diffstat (limited to 'id')
| -rw-r--r-- | id/pom.xml | 4 | ||||
| -rw-r--r-- | id/server/auth/pom.xml | 4 | ||||
| -rw-r--r-- | id/server/idserverlib/pom.xml | 4 | ||||
| -rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java | 21 | ||||
| -rw-r--r-- | id/server/pom.xml | 4 |
5 files changed, 17 insertions, 20 deletions
diff --git a/id/pom.xml b/id/pom.xml index ec5e48494..b8ac973fe 100644 --- a/id/pom.xml +++ b/id/pom.xml @@ -3,14 +3,14 @@ <parent> <groupId>MOA</groupId> <artifactId>MOA</artifactId> - <version>1.5.1</version> + <version>1.5.1.1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>MOA</groupId> <artifactId>id</artifactId> <packaging>pom</packaging> - <version>1.5.1</version> + <version>1.5.1.1</version> <name>MOA ID</name> <modules> diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index e1aeb2802..1e54df19a 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -2,14 +2,14 @@ <parent> <groupId>MOA.id</groupId> <artifactId>moa-id</artifactId> - <version>1.5.1</version> + <version>1.5.1.1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>MOA.id.server</groupId> <artifactId>moa-id-auth</artifactId> <packaging>war</packaging> - <version>1.5.1</version> + <version>1.5.1.1</version> <name>MOA ID-Auth WebService</name> <properties> diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 9b266e00e..087fe6e06 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -2,14 +2,14 @@ <parent>
<groupId>MOA.id</groupId>
<artifactId>moa-id</artifactId>
- <version>1.5.1</version>
+ <version>1.5.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-lib</artifactId>
<packaging>jar</packaging>
- <version>1.5.1</version>
+ <version>1.5.1.1</version>
<name>MOA ID API</name>
<properties>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java index 924e9d643..1aa8c79d9 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java @@ -24,12 +24,10 @@ package at.gv.egovernment.moa.id.auth; -import iaik.pki.PKIException; -import iaik.pki.jsse.IAIKX509TrustManager; - import java.io.IOException; import java.security.GeneralSecurityException; import java.util.Properties; +import java.util.logging.Logger; import javax.activation.CommandMap; import javax.activation.MailcapCommandMap; @@ -37,18 +35,15 @@ import javax.mail.Session; import javax.net.ssl.SSLSocketFactory; import at.gv.egovernment.moa.id.config.ConfigurationException; +import at.gv.egovernment.moa.id.config.ConfigurationProvider; import at.gv.egovernment.moa.id.config.ConnectionParameter; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.id.iaik.config.LoggerConfigImpl; import at.gv.egovernment.moa.id.util.AxisSecureSocketFactory; import at.gv.egovernment.moa.id.util.MOAIDMessageProvider; import at.gv.egovernment.moa.id.util.SSLUtils; -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.server.config.ConfigurationProvider; -import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator; -import at.gv.egovernment.moa.util.Constants; +import iaik.pki.PKIException; +import iaik.pki.jsse.IAIKX509TrustManager; /** * Web application initializer @@ -85,9 +80,11 @@ public class MOAIDAuthInitializer { Session session = Session.getDefaultInstance(props, null); // Restricts TLS cipher suites - System.setProperty( - "https.cipherSuites", - "SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_RC4_128_MD5,SSL_RSA_WITH_3DES_EDE_CBC_SHA"); + if ((System.getProperty("https.cipherSuites") == null) || + System.getProperty("https.cipherSuites").isEmpty() ) + System.setProperty( + "https.cipherSuites", + "SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_RC4_128_MD5,SSL_RSA_WITH_3DES_EDE_CBC_SHA"); // load some jsse classes so that the integrity of the jars can be // verified // before the iaik jce is installed as the security provider diff --git a/id/server/pom.xml b/id/server/pom.xml index 72a47385c..146821454 100644 --- a/id/server/pom.xml +++ b/id/server/pom.xml @@ -4,14 +4,14 @@ <parent>
<groupId>MOA</groupId>
<artifactId>id</artifactId>
- <version>1.5.1</version>
+ <version>1.5.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>MOA.id</groupId>
<artifactId>moa-id</artifactId>
<packaging>pom</packaging>
- <version>1.5.1</version>
+ <version>1.5.1.1</version>
<name>MOA ID Server</name>
<modules>
|