From 86b4083482be4120d721b577be2ad2b9d9022bf5 Mon Sep 17 00:00:00 2001
From: Laurian-Dufrechou <lauriandugers@hotmail.fr>
Date: Wed, 26 Oct 2022 20:25:14 +0200
Subject: [PATCH] fix RemoveCharNull

remove tout les char null maintenant
---
 src/cryptography/Des.java          | 22 +++++++++++-----------
 src/cryptography/temp/testDes.java |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/cryptography/Des.java b/src/cryptography/Des.java
index 182f507..5b23faf 100644
--- a/src/cryptography/Des.java
+++ b/src/cryptography/Des.java
@@ -290,20 +290,20 @@ public class Des {
 
         int[][] blocsOfOctet = decoupage(message_decrypte, message_decrypte.length / 8);
 
+        ArrayList<Integer> msg_decrypt = new ArrayList<>();
 
-        int[] octet = blocsOfOctet[blocsOfOctet.length - 1];
-        StringBuilder stringBuilderOctet = new StringBuilder();
-        for (int i : octet) stringBuilderOctet.append(i);
-        String stringOctet = stringBuilderOctet.toString();
-        int c = Integer.parseInt(stringOctet, 2);
+        for (int[] octet: blocsOfOctet){
+            StringBuilder stringBuilderOctet = new StringBuilder();
+            for (int i : octet) stringBuilderOctet.append(i);
+            String stringOctet = stringBuilderOctet.toString();
+            int c = Integer.parseInt(stringOctet, 2);
 
-        if ((char) c == 0) {
-            int[] newTab = new int[message_decrypte.length - 8];
-            System.arraycopy(message_decrypte, 0, newTab, 0, newTab.length);
-            return newTab;
-        } else {
-            return message_decrypte;
+            if ((char) c != 0) {
+                for (int i : octet) msg_decrypt.add(i);
+            }
         }
+
+        return msg_decrypt.stream().mapToInt(i->i).toArray();
     }
 
     /* Genere */
diff --git a/src/cryptography/temp/testDes.java b/src/cryptography/temp/testDes.java
index ce6ffce..ee4f5c4 100644
--- a/src/cryptography/temp/testDes.java
+++ b/src/cryptography/temp/testDes.java
@@ -107,7 +107,7 @@ public class testDes {
 
     private static void testDecrypte() {
         Des des = new Des();
-        int[] msg = des.crypte("Bonjour");
+        int[] msg = des.crypte("Bonjour, je suis super heureux de vous voir");
         System.out.println("Message crypté : " + Des.bitsToString(msg));
         System.out.println(des.decrypte(msg));
     }