Adapt to login@uni format for user-ids, Put asym keys in extra class

1 files changed, 3 insertions, 24 deletions

diff --git a/src/main/java/org/openslx/satellitedaemon/App.java b/src/main/java/org/openslx/satellitedaemon/App.java
index 2dcaec6..e29520f 100644
--- a/src/main/java/org/openslx/satellitedaemon/App.java
+++ b/src/main/java/org/openslx/satellitedaemon/App.java
@@ -1,10 +1,6 @@
 package org.openslx.satellitedaemon;
 
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
-import java.security.interfaces.RSAPrivateKey;
-import java.security.interfaces.RSAPublicKey;
 
 import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.Logger;
@@ -19,29 +15,12 @@ import org.openslx.satellitedaemon.filetransfer.FileUploadWorker;
 public class App
 {
 	private static Logger log = Logger.getLogger( App.class );
-	
+
 	public static void main( String[] args ) throws NoSuchAlgorithmException
 	{
 		BasicConfigurator.configure();
-		
-//		KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
-//		kpg.initialize(4096);
-//		KeyPair kp = kpg.generateKeyPair();
-//		RSAPrivateKey privateKey = (RSAPrivateKey) kp.getPrivate();
-//		RSAPublicKey publicKey = (RSAPublicKey) kp.getPublic();
-//		
-//		log.debug("modulus: " + privateKey.getModulus().toString());
-//		log.debug("exponent: " + privateKey.getPrivateExponent().toString());
-//		
-//		
-//		log.debug("modulus: " + publicKey.getModulus().toString());
-//		log.debug("exponent: " + publicKey.getPublicExponent().toString());
-//		
-//		System.exit(1);
-		
-		// Loads all entries from the configuration file config/globals.properties 
-		Globals.init();
-		if (!Globals.masterServerSslContextInit()){
+
+		if ( !Globals.masterServerSslContextInit() ) {
 			log.error( "Problem with initializing the SSLContext" );
 			System.exit( 1 );
 		}