enable encrypt of eIDAS assertion as default

1 files changed, 6 insertions, 2 deletions

diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/config/ModifiedEncryptionSW.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/config/ModifiedEncryptionSW.java
index 9ad5f0db3..de4f3fc9c 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/config/ModifiedEncryptionSW.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/config/ModifiedEncryptionSW.java
@@ -90,17 +90,21 @@ public class ModifiedEncryptionSW extends KeyStoreSamlEngineEncryption {
 	 */
 	@Override
 	public boolean isEncryptionEnabled(String countryCode) {
-		// - encrypt if so configured
+		//encryption is enabled by default in MOA-ID configuration object 				
 		try {
 			AuthConfiguration moaconfig = AuthConfigurationProviderFactory.getInstance();
 			Boolean useEncryption = moaconfig.getStorkConfig().getCPEPS(countryCode).isXMLSignatureSupported();
-			Logger.info(useEncryption ? "using encryption" : "do not use encrpytion");
+			String logResult = useEncryption ? " using encryption" : " do not use encrpytion";
+			Logger.debug("eIDAS respone for country " + countryCode + logResult);
 			return useEncryption;
+			
 		} catch(NullPointerException | ConfigurationException e) {
 			Logger.warn("failed to gather information about encryption for countryCode " + countryCode + " - thus, enabling encryption");
 			if(Logger.isDebugEnabled())
 				e.printStackTrace();
 			return true;
+			
 		}
+		
 	}
 }