From 05c598c830d4ff10b926a3f413e8a6129fd4337a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 8 Sep 2015 18:16:50 +0200
Subject: Stuff

---
 .../openslx/imagemaster/serverconnection/ConnectionHandler.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java')

diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
index 9340706..44c8e16 100644
--- a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
+++ b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
@@ -50,7 +50,7 @@ public class ConnectionHandler implements IncomingEvent
 	private static Listener listener;
 
 	static {
-		log.debug( "Starting listener on port " + Globals.getSslSocketPort() );
+		log.debug( "Starting listener on port " + Globals.getFiletransferPortSsl() );
 		try {
 			String pathToKeyStore = Globals.getSslKeystoreFile();
 			char[] passphrase = Globals.getSslKeystorePassword().toCharArray();
@@ -58,10 +58,10 @@ public class ConnectionHandler implements IncomingEvent
 			keystore.load( new FileInputStream( pathToKeyStore ), passphrase );
 			KeyManagerFactory kmf = KeyManagerFactory.getInstance( KeyManagerFactory.getDefaultAlgorithm() );
 			kmf.init( keystore, passphrase );
-			sslContext = SSLContext.getInstance( "SSLv3" );
+			sslContext = SSLContext.getInstance( "TLSv1.2" );
 			KeyManager[] keyManagers = kmf.getKeyManagers();
 			sslContext.init( keyManagers, null, null );
-			listener = new Listener( eventHandler, sslContext, Globals.getSslSocketPort(), 15000 );
+			listener = new Listener( eventHandler, sslContext, Globals.getFiletransferPortSsl(), Globals.getFiletransferTimeout() * 1000 );
 			listener.start();
 		} catch ( Exception e ) {
 			log.error( "Initialization failed.", e );
@@ -119,7 +119,7 @@ public class ConnectionHandler implements IncomingEvent
 
 		// TODO addUpload( token, image );
 		// TODO Set crc file on image - if there is already a crc file assigned, this does nothing
-		return new TransferInformation( token, Globals.getPlainSocketPort(), Globals.getSslSocketPort() );
+		return new TransferInformation( token, Globals.getFiletransferPortPlain(), Globals.getFiletransferPortSsl() );
 	}
 
 	/**
-- 
cgit v1.2.3-55-g7522