1 files changed, 10 insertions, 2 deletions
diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/MOAWhiteListConfigurator.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/MOAWhiteListConfigurator.java
index 7d647ff15..a2c6a3ad9 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/MOAWhiteListConfigurator.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/MOAWhiteListConfigurator.java
@@ -22,7 +22,6 @@
  */
 package at.gv.egovernment.moa.id.auth.modules.eidas.utils;
 
-import java.util.Locale;
 import java.util.regex.Pattern;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -48,6 +47,11 @@ public class MOAWhiteListConfigurator  {
 	        }
 	        ImmutableSet.Builder<String> allowed = ImmutableSet.builder();
 	        String[] wlAlgorithms = WHITE_LIST_SPLITTER.split(algorithmWhiteListValue);
+	        
+	        //BugFix: remove newlines from configuration
+	        for (int i=0; i<wlAlgorithms.length; i++)
+	        	wlAlgorithms[i] = StringUtils.trimToNull(KeyValueUtils.removeAllNewlineFromString(wlAlgorithms[i]));
+ 	        
 	        if (null != wlAlgorithms && wlAlgorithms.length > 0) {
 	            return getAllowedAlgorithms(defaultWhiteList, allowedValues, ImmutableSet.<String>copyOf(wlAlgorithms));
 	        }
@@ -72,7 +76,11 @@ public class MOAWhiteListConfigurator  {
 	            candidateValue = StringUtils.trimToNull(
 	            		KeyValueUtils.removeAllNewlineFromString(candidateValue));
 	            if (StringUtils.isNotBlank(candidateValue)) {
-	            	String candidateAlgorithm = StringUtils.lowerCase(candidateValue, Locale.ENGLISH);
+	            	
+	            	//BUGFIX: eIDAS SAML-engine MPF1 signature schemes problem 
+	            	String candidateAlgorithm = candidateValue;
+	            	//String candidateAlgorithm = StringUtils.lowerCase(candidateValue, Locale.ENGLISH);
+	            	
 	                if (allowedValues.contains(candidateAlgorithm)) {
 	                    allowed.add(candidateValue);
 	                    if (!modified && !candidateAlgorithm.equals(candidateValue)) {