minimal fix in MOA-ID 1.5.1 to use 'https.cipherSuites' parameter if it is setMOA-ID-1.5.1.1

switch to version 1.5.1.1

1 files changed, 9 insertions, 12 deletions

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