1 files changed, 5 insertions, 2 deletions
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 c2eefa3d8..8d2684c9b 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
@@ -11,6 +11,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.security.NoSuchAlgorithmException;
 import java.security.Principal;
@@ -1663,7 +1664,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 	    	SZRGWClient client = new SZRGWClient(connectionParameters);
 	    	 	    	
 	    	CreateIdentityLinkRequest request = new CreateIdentityLinkRequest();
-	    	request.setSignature(citizenSignature.getBytes());
+	    	request.setSignature(citizenSignature.getBytes("UTF-8"));
 	
             PEPSData data = new PEPSData();
             data.setDateOfBirth(PEPSDateOfBirth);
@@ -1711,6 +1712,8 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 	    catch (ConfigurationException e) {
 	    	Logger.warn(e);
 	    	Logger.warn(MOAIDMessageProvider.getInstance().getMessage("config.12", null ));
+		} catch (UnsupportedEncodingException e) {
+			Logger.warn(e);
 		}
 	    
 	    return null;
@@ -1912,7 +1915,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
             template.merge(context, writer);
 
             resp.setContentType("text/html;charset=UTF-8");            
-            resp.getOutputStream().write(writer.toString().getBytes());
+            resp.getOutputStream().write(writer.toString().getBytes("UTF-8"));
 
         } catch (Exception e) {
             Logger.error("Error sending STORK SAML AuthnRequest.", e);