Corrections des entrées et du traitement de ces entrées

8 files changed, 37 insertions, 31 deletions

diff --git a/src/add_vhdltbc/i/i-128/tb/top_tb.vhd b/src/add_vhdltbc/i/i-128/tb/top_tb.vhd
index 0be09a9..4175e4e 100644
--- a/src/add_vhdltbc/i/i-128/tb/top_tb.vhd
+++ b/src/add_vhdltbc/i/i-128/tb/top_tb.vhd
@@ -151,12 +151,11 @@ begin
     end procedure check;
 
   begin
-    data_vect    <= (X"0F0E0D0C0B0A09080706050403020100",X"02F81164834A06C57E4398D85E31B003");
-    key_vect     <= (X"0F0E0D0C0B0A09080706050403020100",X"0F0E0D0C0B0A09080706050403020100");
-    tweak_vect   <= (X"17161514131211100F0E0D0C0B0A09080706050403020100",X"17161514131211100F0E0D0C0B0A09080706050403020100");
+    data_vect    <= (X"F0E0D0C0B0A090807060504030201000",X"208f114638a4605CE734898DE5130B30");
+    key_vect     <= (X"F0E0D0C0B0A090807060504030201000",X"F0E0D0C0B0A090807060504030201000");
+    tweak_vect   <= (X"7161514131211101F0E0D0C0B0A090807060504030201000",X"7161514131211101F0E0D0C0B0A090807060504030201000");
     decrypt_vect <= ('0','1');
-    res_vect     <= (X"02F81164834A06C57E4398D85E31B003",X"0F0E0D0C0B0A09080706050403020100");
-
+    res_vect     <= (X"208f114638a4605CE734898DE5130B30",X"F0E0D0C0B0A090807060504030201000");
     wait for 30 ns;
 
     check(data_vect(0),key_vect(0),tweak_vect(0),decrypt_vect(0),res_vect(0));
diff --git a/src/add_vhdltbc/i/i-192/tb/top_tb.vhd b/src/add_vhdltbc/i/i-192/tb/top_tb.vhd
index 441640d..f7c45dd 100644
--- a/src/add_vhdltbc/i/i-192/tb/top_tb.vhd
+++ b/src/add_vhdltbc/i/i-192/tb/top_tb.vhd
@@ -151,11 +151,11 @@ begin
     end procedure check;
 
   begin
-    data_vect    <= (X"0F0E0D0C0B0A09080706050403020100",X"BF5D3C1638DB9E69A2AA078FFB4FF78B");
-    key_vect     <= (X"17161514131211100F0E0D0C0B0A09080706050403020100",X"17161514131211100F0E0D0C0B0A09080706050403020100");
-    tweak_vect   <= (X"17161514131211100F0E0D0C0B0A09080706050403020100",X"17161514131211100F0E0D0C0B0A09080706050403020100");
+    data_vect    <= (X"F0E0D0C0B0A090807060504030201000",X"FBD5C36183BDE9962AAA70F8BFF47FB8");
+    key_vect     <= (X"7161514131211101F0E0D0C0B0A090807060504030201000",X"7161514131211101F0E0D0C0B0A090807060504030201000");
+    tweak_vect   <= (X"7161514131211101F0E0D0C0B0A090807060504030201000",X"7161514131211101F0E0D0C0B0A090807060504030201000");
     decrypt_vect <= ('0','1');
-    res_vect     <= (X"BF5D3C1638DB9E69A2AA078FFB4FF78B",X"0F0E0D0C0B0A09080706050403020100");
+    res_vect     <= (X"FBD5C36183BDE9962AAA70F8BFF47FB8",X"F0E0D0C0B0A090807060504030201000");
 
     wait for 30 ns;
 
diff --git a/src/add_vhdltbc/i/i-256/tb/top_tb.vhd b/src/add_vhdltbc/i/i-256/tb/top_tb.vhd
index 35ded40..d21b4ba 100644
--- a/src/add_vhdltbc/i/i-256/tb/top_tb.vhd
+++ b/src/add_vhdltbc/i/i-256/tb/top_tb.vhd
@@ -151,11 +151,11 @@ begin
     end procedure check;
 
   begin
-    data_vect    <= (X"0F0E0D0C0B0A09080706050403020100",X"BCC8EF1B60C09C62403F6FBF90AA8309");
-    key_vect     <= (X"1F1E1D1C1B1A191817161514131211100F0E0D0C0B0A09080706050403020100",X"1F1E1D1C1B1A191817161514131211100F0E0D0C0B0A09080706050403020100");
-    tweak_vect   <= (X"17161514131211100F0E0D0C0B0A09080706050403020100",X"17161514131211100F0E0D0C0B0A09080706050403020100");
+    data_vect    <= (X"F0E0D0C0B0A090807060504030201000",X"CB8CFEB1060CC92604F3F6FB09AA389D");
+    key_vect     <= (X"F1E1D1C1B1A191817161514131211101F0E0D0C0B0A090807060504030201000",X"F1E1D1C1B1A191817161514131211101F0E0D0C0B0A090807060504030201000");
+    tweak_vect   <= (X"7161514131211101F0E0D0C0B0A090807060504030201000",X"7161514131211101F0E0D0C0B0A090807060504030201000");
     decrypt_vect <= ('0','1');
-    res_vect     <= (X"BCC8EF1B60C09C62403F6FBF90AA8309",X"0F0E0D0C0B0A09080706050403020100");
+    res_vect     <= (X"CB8CFEB1060CC92604F3F6FB09AA389D",X"F0E0D0C0B0A090807060504030201000");
 
     wait for 30 ns;
 
diff --git a/src/add_vhdltbc/i/roundexe_liliput.vhd b/src/add_vhdltbc/i/roundexe_liliput.vhd
index a91fe79..8f69cb5 100644
--- a/src/add_vhdltbc/i/roundexe_liliput.vhd
+++ b/src/add_vhdltbc/i/roundexe_liliput.vhd
@@ -73,8 +73,11 @@ begin
 
 	convertion_ligne : for i in 0 to 3 generate
 		convertion_colonne : for j in 0 to 3 generate
-		 data_i_s(i)(j) <= data_i((7+(8*(4*i+j)))downto((8*(4*i+j))));
-		 data_o(7+(8*(4*i+j)) downto (8*(4*i+j))) <= state_o_s(i)(j) when data_out_valid_s = '1' else X"00";		end generate;
+			data_i_s(i)(j)(7 downto 4)                       <= data_i((3+(8*(4*i+j)))downto((8*(4*i+j))));
+			data_i_s(i)(j)(3 downto 0)                       <= data_i((7+(8*(4*i+j)))downto(4+(8*(4*i+j))));
+			data_o(7+(8*(4*i+j)) downto 4+(8*(4*i+j)))       <= state_o_s(i)(j)(3 downto 0) when data_out_valid_s = '1' else X"0";
+			data_o(3+(8*(4*i+j)) downto (8*(4*i+j)))         <= state_o_s(i)(j)(7 downto 4)  when data_out_valid_s = '1' else X"0";
+		 end generate;
 	end generate;
 
 	data_out_valid_o <= data_out_valid_s;
@@ -102,7 +105,8 @@ begin
 	--formatting tweak_key in type_tweak_key_array
 	convertion_ligne_key : for i in 0 to LANE_NB-1 generate
 		convertion_colonne_key : for j in 0 to 7 generate
-			tk_s(i)(j) <= tweak_key_i(((64*i)+(8*j)+7)downto((64*i)+(8*j)));
+			tk_s(i)(j)(7 downto 4) <= tweak_key_i(((64*i)+(8*j)+3)downto((64*i)+(8*j)));
+			tk_s(i)(j)(3 downto 0) <= tweak_key_i(((64*i)+(8*j)+7)downto((64*i)+(8*j)+4));
 		end generate;
 	end generate;
 
diff --git a/src/add_vhdltbc/ii/ii-128/tb/top_tb.vhd b/src/add_vhdltbc/ii/ii-128/tb/top_tb.vhd
index 18e4d8a..79d76f4 100644
--- a/src/add_vhdltbc/ii/ii-128/tb/top_tb.vhd
+++ b/src/add_vhdltbc/ii/ii-128/tb/top_tb.vhd
@@ -151,11 +151,11 @@ begin
     end procedure check;
 
   begin
-    data_vect    <= (X"0F0E0D0C0B0A09080706050403020100",X"0F0E0D0C0B0A09080706050403020100");
-    key_vect     <= (X"0F0E0D0C0B0A09080706050403020100",X"0F0E0D0C0B0A09080706050403020100");
-    tweak_vect   <= (X"0F0E0D0C0B0A09080706050403020100",X"0F0E0D0C0B0A09080706050403020100");
+    data_vect    <= (X"F0E0D0C0B0A090807060504030201000",X"F0E0D0C0B0A090807060504030201000");
+    key_vect     <= (X"F0E0D0C0B0A090807060504030201000",X"F0E0D0C0B0A090807060504030201000");
+    tweak_vect   <= (X"F0E0D0C0B0A090807060504030201000",X"F0E0D0C0B0A090807060504030201000");
     decrypt_vect <= ('0','1');
-    res_vect     <= (X"5DD938CAEDA68DA8FC1041BA58DD000E",X"5DD938CAEDA68DA8FC1041BA58DD000E");
+    res_vect     <= (X"D59D83ACDE6AD88ACF0114AB85DD00E0",X"D59D83ACDE6AD88ACF0114AB85DD00E0");
 
     wait for 30 ns;
 
diff --git a/src/add_vhdltbc/ii/ii-192/tb/top_tb.vhd b/src/add_vhdltbc/ii/ii-192/tb/top_tb.vhd
index 24dc8f6..b16a7b5 100644
--- a/src/add_vhdltbc/ii/ii-192/tb/top_tb.vhd
+++ b/src/add_vhdltbc/ii/ii-192/tb/top_tb.vhd
@@ -151,11 +151,11 @@ begin
     end procedure check;
 
   begin
-    data_vect    <= (X"0F0E0D0C0B0A09080706050403020100",X"0F0E0D0C0B0A09080706050403020100");
-    key_vect     <= (X"17161514131211100F0E0D0C0B0A09080706050403020100",X"17161514131211100F0E0D0C0B0A09080706050403020100");
-    tweak_vect   <= (X"0F0E0D0C0B0A09080706050403020100",X"0F0E0D0C0B0A09080706050403020100");
+    data_vect    <= (X"F0E0D0C0B0A090807060504030201000",X"F0E0D0C0B0A090807060504030201000");
+    key_vect     <= (X"7161514131211101F0E0D0C0B0A090807060504030201000",X"7161514131211101F0E0D0C0B0A090807060504030201000");
+    tweak_vect   <= (X"F0E0D0C0B0A090807060504030201000",X"F0E0D0C0B0A090807060504030201000");
     decrypt_vect <= ('0','1');
-    res_vect     <= (X"49203FD848F8C39784B3128A6CB8873B",X"49203FD848F8C39784B3128A6CB8873B");
+    res_vect     <= (X"9402F38D848F3C79483B21A8C68B78B3",X"9402F38D848F3C79483B21A8C68B78B3");
 
     wait for 30 ns;
 
diff --git a/src/add_vhdltbc/ii/ii-256/tb/top_tb.vhd b/src/add_vhdltbc/ii/ii-256/tb/top_tb.vhd
index d1eb732..3918ebc 100644
--- a/src/add_vhdltbc/ii/ii-256/tb/top_tb.vhd
+++ b/src/add_vhdltbc/ii/ii-256/tb/top_tb.vhd
@@ -151,11 +151,11 @@ begin
     end procedure check;
 
   begin
-    data_vect    <= (X"0F0E0D0C0B0A09080706050403020100",X"0F0E0D0C0B0A09080706050403020100");
-    key_vect     <= (X"1F1E1D1C1B1A191817161514131211100F0E0D0C0B0A09080706050403020100",X"1F1E1D1C1B1A191817161514131211100F0E0D0C0B0A09080706050403020100");
-    tweak_vect   <= (X"0F0E0D0C0B0A09080706050403020100",X"0F0E0D0C0B0A09080706050403020100");
+    data_vect    <= (X"F0E0D0C0B0A090807060504030201000",X"F0E0D0C0B0A090807060504030201000");
+    key_vect     <= (X"F1E1D1C1B1A191817161514131211101F0E0D0C0B0A090807060504030201000",X"F1E1D1C1B1A191817161514131211101F0E0D0C0B0A090807060504030201000");
+    tweak_vect   <= (X"F0E0D0C0B0A090807060504030201000",X"F0E0D0C0B0A090807060504030201000");
     decrypt_vect <= ('0','1');
-    res_vect     <= (X"7E719B056FC9E0E4C1DB9F2F04C2BD0A",X"7E719B056FC9E0E4C1DB9F2F04C2BD0A");
+    res_vect     <= (X"E717B950F69C0E4E1CBDF9F2402CDBA0",X"E717B950F69C0E4E1CBDF9F2402CDBA0");
 
     wait for 30 ns;
 
diff --git a/src/add_vhdltbc/ii/roundexe_liliput.vhd b/src/add_vhdltbc/ii/roundexe_liliput.vhd
index f04509f..437e831 100644
--- a/src/add_vhdltbc/ii/roundexe_liliput.vhd
+++ b/src/add_vhdltbc/ii/roundexe_liliput.vhd
@@ -71,8 +71,10 @@ begin
 
 	convertion_ligne : for i in 0 to 3 generate
 		convertion_colonne : for j in 0 to 3 generate
-		 data_i_s(i)(j) <= data_i((7+(8*(4*i+j)))downto((8*(4*i+j))));
-		 data_o(7+(8*(4*i+j)) downto (8*(4*i+j))) <= state_o_s(i)(j) when data_out_valid_s = '1' else X"00";
+			data_i_s(i)(j)(7 downto 4)                       <= data_i((3+(8*(4*i+j)))downto((8*(4*i+j))));
+			data_i_s(i)(j)(3 downto 0)                       <= data_i((7+(8*(4*i+j)))downto(4+(8*(4*i+j))));
+			data_o(7+(8*(4*i+j)) downto 4+(8*(4*i+j)))       <= state_o_s(i)(j)(3 downto 0) when data_out_valid_s = '1' else X"0";
+			data_o(3+(8*(4*i+j)) downto (8*(4*i+j)))         <= state_o_s(i)(j)(7 downto 4)  when data_out_valid_s = '1' else X"0";
 		end generate;
 	end generate;
 
@@ -100,7 +102,8 @@ begin
 	--formatting tweak_key in type_tweak_key_array
 	convertion_ligne_key : for i in 0 to LANE_NB-1 generate
 		convertion_colonne_key : for j in 0 to 7 generate
-			tk_s(i)(j) <= tweak_key_i(((64*i)+(8*j)+7)downto((64*i)+(8*j)));
+			tk_s(i)(j)(7 downto 4) <= tweak_key_i(((64*i)+(8*j)+3)downto((64*i)+(8*j)));
+			tk_s(i)(j)(3 downto 0) <= tweak_key_i(((64*i)+(8*j)+7)downto((64*i)+(8*j)+4));
 		end generate;
 	end generate;