git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1186 d688527b-c9ab-4aba-bd8d-4036d912da1d

4 files changed, 13 insertions, 12 deletions

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 45b46242e..863ff13bc 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.4.7</version>

+		<version>1.4.8</version>

 	</parent>

 

 	<modelVersion>4.0.0</modelVersion>

 	<groupId>MOA.id.server</groupId>

 	<artifactId>moa-id-lib</artifactId>

 	<packaging>jar</packaging>

-	<version>1.4.7</version>

+	<version>1.4.8</version>

 	<name>MOA ID API</name>

 

 	<properties>

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 6b6f48646..8de82a8d6 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
@@ -181,9 +181,9 @@ public class AuthenticationServer implements MOAIDAuthConstants {
     if ((!authURL.startsWith("https:")) && (false == BoolUtils.valueOf(boolStr)))
       throw new AuthenticationException("auth.07", new Object[] { authURL + "*" });
     if (isEmpty(authURL))
-      throw new WrongParametersException("StartAuthentication", "AuthURL", "auth.5");
+      throw new WrongParametersException("StartAuthentication", "AuthURL", "auth.05");
     if (isEmpty(oaURL))
-      throw new WrongParametersException("StartAuthentication", PARAM_OA, "auth.5");
+      throw new WrongParametersException("StartAuthentication", PARAM_OA, "auth.05");
 
     ConnectionParameter bkuConnParam =
       AuthConfigurationProvider.getInstance().getBKUConnectionParameter();
@@ -198,7 +198,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
     
     if (!oaParam.getBusinessService()) {
       if (isEmpty(target))
-        throw new WrongParametersException("StartAuthentication", PARAM_TARGET, "auth.5");
+        throw new WrongParametersException("StartAuthentication", PARAM_TARGET, "auth.05");
     } else {
       if (!isEmpty(target)) {
         Logger.info("Ignoring target parameter thus application type is \"businessService\"");
@@ -307,7 +307,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 
     if (isEmpty(sessionID)) {
       if (isEmpty(authURL))
-        throw new WrongParametersException("StartAuthentication", "AuthURL", "auth.5");
+        throw new WrongParametersException("StartAuthentication", "AuthURL", "auth.05");
 
       //check if HTTP Connection may be allowed (through FRONTEND_SERVLETS_ENABLE_HTTP_CONNECTION_PROPERTY)
       String boolStr =
@@ -316,7 +316,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
       if ((!authURL.startsWith("https:")) && (false == BoolUtils.valueOf(boolStr)))
         throw new AuthenticationException("auth.07", new Object[] { authURL + "*" });
       if (isEmpty(oaURL))
-        throw new WrongParametersException("StartAuthentication", PARAM_OA, "auth.5");
+        throw new WrongParametersException("StartAuthentication", PARAM_OA, "auth.05");
     }
     AuthenticationSession session;
     OAAuthParameter oaParam;
@@ -332,7 +332,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
         throw new AuthenticationException("auth.00", new Object[] { oaURL });
       if (!oaParam.getBusinessService()) {
         if (isEmpty(target))
-          throw new WrongParametersException("StartAuthentication", PARAM_TARGET, "auth.5");
+          throw new WrongParametersException("StartAuthentication", PARAM_TARGET, "auth.05");
       } else {
         target = null;
       }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/WrongParametersException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/WrongParametersException.java
index f4827c189..720bb9bb0 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/WrongParametersException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/WrongParametersException.java
@@ -31,7 +31,7 @@ public class WrongParametersException extends MOAIDException {
    */
   public WrongParametersException(String call, String parameter, String errorID) {
      super(errorID, new Object[] {call, parameter});
-        //super("auth.5", new Object[] {call, parameter});
+        //super("auth.05", new Object[] {call, parameter});
              //super("auth.12", new Object[] {call, parameter});
   }
   
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java
index a50a366a5..c40c07b38 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java
@@ -20,6 +20,7 @@ import iaik.pki.PKIException;
 import iaik.pki.PKIFactory;
 import iaik.pki.PKIProfile;
 import iaik.pki.jsse.IAIKX509TrustManager;
+import iaik.security.provider.IAIK;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -70,9 +71,9 @@ public class SSLUtils {
   public static void initialize() {
     sslSocketFactories = new HashMap();
     // JSSE Abhängigkeit
-    Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
-    //Security.addProvider(new IAIK());
-    System.setProperty("java.protocol.handler.pkgs", "com.sun.net.ssl.internal.www.protocol");
+    //Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
+    Security.addProvider(new IAIK());
+    //System.setProperty("java.protocol.handler.pkgs", "com.sun.net.ssl.internal.www.protocol");
     
     
   }