Fix message signing

1 files changed, 4 insertions, 9 deletions

diff --git a/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java b/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java
index 8a8e426..5660f2f 100644
--- a/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java
+++ b/src/main/java/org/openslx/imagemaster/serversession/ServerAuthenticator.java
@@ -5,8 +5,6 @@ import java.util.HashMap;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
-import org.openslx.imagemaster.Globals;
-import org.openslx.imagemaster.Globals.PropString;
 import org.openslx.imagemaster.thrift.iface.AuthenticationException;
 import org.openslx.imagemaster.util.AsymMessageSign;
 import org.openslx.imagemaster.util.RandomString;
@@ -24,9 +22,7 @@ public class ServerAuthenticator
 	 */
 	static {
 		try {
-			messageSign = new AsymMessageSign( Globals.getPropertyString( PropString.KEYSTOREALIAS ),
-					Globals.getPropertyString( PropString.KEYSTOREPASSWORD ),
-					Globals.getPropertyString( PropString.KEYSTOREFILE ) );
+			messageSign = new AsymMessageSign( "./config/servers.jks", "password" );
 			log.info( "Loaded keystore" );
 		} catch ( Exception e ) {
 			log.error( "Error loading the keystore", e );
@@ -54,7 +50,7 @@ public class ServerAuthenticator
 	}
 
 	/**
-	 * Authenticate with the challengeResponse
+	 * Authenticate with the challengeResponse.
 	 * 
 	 * @param organization
 	 * @param address
@@ -72,7 +68,7 @@ public class ServerAuthenticator
 		boolean result = false;
 
 		try {
-			result = messageSign.verifyMessage( bytes, authenticatingServers.get( organization ).getBytes() );
+			result = messageSign.verifyMessage( bytes, authenticatingServers.get( organization ).getBytes() , "uni-freiburg.de" );
 		} catch ( Exception e ) {
 			log.error( "Error while verifying message", e );
 		}
@@ -81,8 +77,7 @@ public class ServerAuthenticator
 			throw new AuthenticationException();
 		}
 
-		log.info( "Server of organinzation '" + organization
-				+ " authenticated." );
+		log.info( "Server of organinzation '" + organization + " authenticated." );
 
 		authenticatingServers.remove( organization );