fix java 8 AES max key size bug

Author: Sven Ciesla

src/de/sveh/simpleserverclient/client/Client.java

@@ -115,7 +115,7 @@ public void connect() {
                 }
 
             } catch (IOException e) {
-                e.printStackTrace();
+                //e.printStackTrace();
             } finally {
                 try {
                     socket.close();

src/de/sveh/simpleserverclient/datapackage/AbstractDataPackage.java

@@ -21,10 +21,15 @@ public AbstractDataPackage(String... args) {
     public abstract void onClient(Sender paramSender);
 
     public String toString(AESEncoding aesEncoding) {
+    	
         GsonBuilder gsonBuilder = new GsonBuilder();
+        gsonBuilder.disableHtmlEscaping();
+        gsonBuilder.disableHtmlEscaping();
         gsonBuilder.registerTypeAdapter(AbstractDataPackage.class, new DataPackageSerializer());
         String json = gsonBuilder.create().toJson(this, AbstractDataPackage.class);
-
+        
+        //System.out.println("Send: " + json);
+        
         if (getClass().isAnnotationPresent(Encoding.class)) {
             json = aesEncoding.encrypt(json);
             json = "$" + json;
@@ -38,6 +43,8 @@ public static AbstractDataPackage fromString(String s, AESEncoding aesEncoding)
             s = s.substring(1);
             s = aesEncoding.decrypt(s);
         }
+        
+        //System.out.println("Get: " + s);
 
         GsonBuilder gsonBuilder = new GsonBuilder();
         gsonBuilder.registerTypeAdapter(AbstractDataPackage.class, new DataPackageDeserializer());

src/de/sveh/simpleserverclient/datapackage/DataPackageDeserializer.java

@@ -14,7 +14,7 @@ public AbstractDataPackage deserialize(JsonElement json, Type typeOfT, JsonDeser
         JsonObject jsonObject = json.getAsJsonObject();
         String type = jsonObject.get("type").getAsString();
         JsonElement element = jsonObject.get("properties");
-
+        
         try {
             return (AbstractDataPackage) context.deserialize(element, Class.forName(type));
         } catch (ClassNotFoundException e) {

src/de/sveh/simpleserverclient/datapackage/EncryptionDataPackage.java

@@ -12,6 +12,8 @@
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Base64;
 
+import javax.crypto.Cipher;
+
 public class EncryptionDataPackage extends AbstractDataPackage {
 
     public EncryptionDataPackage(String key) {
@@ -30,7 +32,7 @@ public void onServer(Sender sender) {
         Connection connection = sender.getConnection();
         String key = connection.getRsaEncoding().decrypt(getString(0));
         connection.getAesEncoding().setSecretKey(key);
-
+        
         if (connection.isAuthenticated())
             connection.setAuthenticated(true);
         else
@@ -43,7 +45,6 @@ public void onClient(Sender sender) {
 
         Client client = Client.getInstance();
         client.getAesEncoding().generateSecretKey(getInt(1));
-
         try {
             byte[] decodedKey = Base64.getDecoder().decode(getString(0));
             X509EncodedKeySpec spec = new X509EncodedKeySpec(decodedKey);

src/de/sveh/simpleserverclient/server/Server.java

@@ -191,7 +191,7 @@ public void stop() {
         } catch (IOException e) {
             e.printStackTrace();
         } catch (NullPointerException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
         }
 
         setServerState(ServerState.STOPPED);

src/de/sveh/simpleserverclient/server/connection/Connection.java

@@ -61,7 +61,7 @@ public void run() {
                 return;
             }
 
-            server.sendDataPackage(this, new EncryptionDataPackage(getRsaEncoding().getPublicKey(), 256));
+            server.sendDataPackage(this, new EncryptionDataPackage(getRsaEncoding().getPublicKey(), 128));
 
             String line;
             while (((line = in.readLine()) != null)) {