Relay-Server in einen eigenen Ordner verschoben

pom.xml

@@ -0,0 +1,16 @@
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <version>3.3.0</version>
+            <configuration>
+                <archive>
+                    <manifest>
+                        <mainClass>main.Main</mainClass>
+                    </manifest>
+                </archive>
+            </configuration>
+        </plugin>
+    </plugins>
+</build>

src/main/java/main/RoleSelector.java

@@ -1,5 +1,7 @@
 package main;
 
+import net.relay.RelayServer;
+
 import javax.swing.*;
 
 public class RoleSelector {
@@ -17,7 +19,7 @@ public class RoleSelector {
         );
 
         if (choice == 0) {
-            new net.RelayServer().start();
+            new RelayServer().start();
             JOptionPane.showMessageDialog(null, "Relay Server läuft jetzt auf Port 12345.");
         } else {
             new ui.MainWindow();

src/main/java/net/Handshake.java

@@ -1,79 +0,0 @@
-package net;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-
-public class Handshake {
-    private static final String AES = "AES";
-    private static final String AES_CIPHER_ALGORITHM
-            = "AES/CBC/PKCS5PADDING";
-
-    private PublicKey handShakeInitiator, handShakeAcceptor;
-    private SecretKey secretKey;
-    private String secretKeyStr;
-    public Handshake(PublicKey initiator, PublicKey acceptor) throws Exception {
-        this.handShakeInitiator = initiator;
-        this.handShakeAcceptor = acceptor;
-        this.secretKey = createAESKey();
-    }
-
-    byte[] initializationVector = createInitializationVector();
-
-    public static SecretKey createAESKey() throws Exception {
-        SecureRandom securerandom = new SecureRandom();
-        KeyGenerator keygenerator = KeyGenerator.getInstance(AES);
-
-        keygenerator.init(256, securerandom);
-        SecretKey key = keygenerator.generateKey();
-
-        return key;
-    }
-
-    // Function to initialize a vector
-    // with an arbitrary value
-    public static byte[] createInitializationVector()
-    {
-
-        // Used with encryption
-        byte[] initializationVector = new byte[16];
-        SecureRandom secureRandom = new SecureRandom();
-        secureRandom.nextBytes(initializationVector);
-        return initializationVector;
-    }
-
-    // This function takes plaintext,
-    // the key with an initialization
-    // vector to convert plainText
-    // into CipherText.
-    public static byte[] do_AESEncryption(String plainText, SecretKey secretKey) throws Exception {
-        byte[] initializationVector = createInitializationVector();
-        Cipher cipher = Cipher.getInstance(AES_CIPHER_ALGORITHM);
-
-        IvParameterSpec ivParameterSpec = new IvParameterSpec(initializationVector);
-
-        cipher.init(Cipher.ENCRYPT_MODE, secretKey, ivParameterSpec);
-
-        return cipher.doFinal(plainText.getBytes());
-    }
-
-    // This function performs the
-    // reverse operation of the
-    // do_AESEncryption function.
-    // It converts ciphertext to
-    // the plaintext using the key.
-    public static String do_AESDecryption(byte[] cipherText, SecretKey secretKey, byte[] initializationVector) throws Exception {
-        Cipher cipher = Cipher.getInstance(AES_CIPHER_ALGORITHM);
-
-        IvParameterSpec ivParameterSpec = new IvParameterSpec(initializationVector);
-
-        cipher.init(Cipher.DECRYPT_MODE, secretKey, ivParameterSpec);
-
-        byte[] result = cipher.doFinal(cipherText);
-
-        return new String(result);
-    }
-}

src/main/java/net/direct/DirectClient.java

@@ -4,7 +4,7 @@ package net.direct;
 import config.Config;
 import crypto.KeyManager;
 import model.Message;
-import net.RelayClient;
+import net.relay.RelayClient;
 
 import java.io.*;
 import java.net.*;

src/main/java/net/direct/DirectServer.java

@@ -6,7 +6,7 @@ import java.net.*;
 import config.Config;
 import crypto.KeyManager;
 import model.Message;
-import net.RelayClient;
+import net.relay.RelayClient;
 
 public class DirectServer extends Thread {
     private RelayClient.MessageReceiver messageReceiver;

src/main/java/net/RelayClient.java → src/main/java/net/relay/RelayClient.java

@@ -1,4 +1,4 @@
-package net;
+package net.relay;
 
 import config.Config;
 import crypto.KeyManager;

src/main/java/net/RelayHandler.java → src/main/java/net/relay/RelayHandler.java

@@ -1,4 +1,4 @@
-package net;
+package net.relay;
 
 import java.io.*;
 import java.net.*;

src/main/java/net/RelayServer.java → src/main/java/net/relay/RelayServer.java

@@ -1,4 +1,4 @@
-package net;
+package net.relay;
 
 import model.AuthMessage;
 import model.Message;

src/main/java/ui/ChatWindow.java

@@ -4,7 +4,7 @@ import crypto.KeyManager;
 import model.Chat;
 import model.FileTransfer;
 import model.Message;
-import net.RelayClient;
+import net.relay.RelayClient;
 import net.direct.DirectClient;
 
 import javax.swing.*;

src/main/java/ui/MainWindow.java

@@ -4,7 +4,7 @@ import config.Config;
 import crypto.KeyManager;
 import model.Chat;
 import model.Message;
-import net.RelayClient;
+import net.relay.RelayClient;
 import net.direct.DirectServer;
 
 import javax.swing.*;