Remplacement de la version vhdltbc par la version optimisée et corrigée

10 files changed, 842 insertions, 0 deletions

diff --git a/src/add_vhdltbc/ii/chiffrement.vhd b/src/add_vhdltbc/ii/chiffrement.vhd
new file mode 100644
index 0000000..c3ef015
--- /dev/null
+++ b/src/add_vhdltbc/ii/chiffrement.vhd
@@ -0,0 +1,113 @@
+-- Implementation of the Lilliput-TBC tweakable block cipher by the
+-- Lilliput-AE team, hereby denoted as "the implementer".
+--
+-- For more information, feedback or questions, refer to our website:
+-- https://paclido.fr/lilliput-ae
+--
+-- To the extent possible under law, the implementer has waived all copyright
+-- and related or neighboring rights to the source code in this file.
+-- http://creativecommons.org/publicdomain/zero/1.0/
+
+library IEEE;
+library work;
+use IEEE.numeric_std.ALL;
+use IEEE.STD_LOGIC_1164.ALL;
+use work.crypt_pack.ALL;
+
+
+entity chiffrement is port (
+		chiffrement_i : in  type_state;
+		permutation_i : in  std_logic;
+		round_key_i   : in  type_key;
+		chiffrement_o : out type_state
+	);
+
+end chiffrement;
+
+architecture chiffrement_arch of chiffrement is
+
+	signal non_linear_s  : type_half_state;
+	signal non_linear_s1 : type_half_state;
+	signal linear_s      : type_half_state;
+	signal linear_tmp_s  : type_half_state;
+	signal linear        : bit8;
+
+	component sbox
+		port (
+			sbox_i : in  bit8;
+			sbox_o : out bit8
+		);
+	end component;
+
+
+begin
+
+	non_linear_s(0)(0) <= chiffrement_i(1)(3) xor round_key_i(1)(3);
+	non_linear_s(0)(1) <= chiffrement_i(1)(2) xor round_key_i(1)(2);
+	non_linear_s(0)(2) <= chiffrement_i(1)(1) xor round_key_i(1)(1);
+	non_linear_s(0)(3) <= chiffrement_i(1)(0) xor round_key_i(1)(0);
+	non_linear_s(1)(0) <= chiffrement_i(0)(3) xor round_key_i(0)(3);
+	non_linear_s(1)(1) <= chiffrement_i(0)(2) xor round_key_i(0)(2);
+	non_linear_s(1)(2) <= chiffrement_i(0)(1) xor round_key_i(0)(1);
+	non_linear_s(1)(3) <= chiffrement_i(0)(0) xor round_key_i(0)(0);
+
+
+	boucle_ligne : for i in 0 to 1 generate
+		boucle_colonne : for j in 0 to 3 generate
+				sboxx : sbox port map(
+					sbox_i => non_linear_s(i)(j),
+					sbox_o => non_linear_s1(i)(j)
+				);
+		end generate;
+	end generate;
+
+	linear_tmp_s(0)(0) <= chiffrement_i(2)(0);
+	linear_tmp_s(0)(1) <= chiffrement_i(2)(1) xor chiffrement_i(1)(3);
+	linear_tmp_s(0)(2) <= chiffrement_i(2)(2) xor chiffrement_i(1)(3);
+	linear_tmp_s(0)(3) <= chiffrement_i(2)(3) xor chiffrement_i(1)(3);
+	linear_tmp_s(1)(0) <= chiffrement_i(3)(0) xor chiffrement_i(1)(3);
+	linear_tmp_s(1)(1) <= chiffrement_i(3)(1) xor chiffrement_i(1)(3);
+	linear_tmp_s(1)(2) <= chiffrement_i(3)(2) xor chiffrement_i(1)(3);
+	linear_tmp_s(1)(3) <= chiffrement_i(3)(3) xor chiffrement_i(1)(0) xor chiffrement_i(1)(1) xor chiffrement_i(1)(2);
+	linear             <= chiffrement_i(0)(3) xor chiffrement_i(0)(1) xor chiffrement_i(0)(2) xor chiffrement_i(1)(3);
+
+	linear_s(0)(0) <= non_linear_s1(0)(0) xor linear_tmp_s(0)(0);
+	linear_s(0)(1) <= non_linear_s1(0)(1) xor linear_tmp_s(0)(1);
+	linear_s(0)(2) <= non_linear_s1(0)(2) xor linear_tmp_s(0)(2);
+	linear_s(0)(3) <= non_linear_s1(0)(3) xor linear_tmp_s(0)(3);
+	linear_s(1)(0) <= non_linear_s1(1)(0) xor linear_tmp_s(1)(0);
+	linear_s(1)(1) <= non_linear_s1(1)(1) xor linear_tmp_s(1)(1);
+	linear_s(1)(2) <= non_linear_s1(1)(2) xor linear_tmp_s(1)(2);
+	linear_s(1)(3) <= non_linear_s1(1)(3) xor linear xor linear_tmp_s(1)(3);
+
+
+	chiffrement_o(0)(0) <= linear_s(1)(2)      when permutation_i='1' else chiffrement_i(0)(0);
+	chiffrement_o(0)(1) <= linear_s(0)(3)      when permutation_i='1' else chiffrement_i(0)(1);
+	chiffrement_o(0)(2) <= linear_s(1)(0)      when permutation_i='1' else chiffrement_i(0)(2);
+	chiffrement_o(0)(3) <= linear_s(0)(2)      when permutation_i='1' else chiffrement_i(0)(3);
+	chiffrement_o(1)(0) <= linear_s(0)(0)      when permutation_i='1' else chiffrement_i(1)(0);
+	chiffrement_o(1)(1) <= linear_s(0)(1)      when permutation_i='1' else chiffrement_i(1)(1);
+	chiffrement_o(1)(2) <= linear_s(1)(1)      when permutation_i='1' else chiffrement_i(1)(2);
+	chiffrement_o(1)(3) <= linear_s(1)(3)      when permutation_i='1' else chiffrement_i(1)(3);
+	chiffrement_o(2)(0) <= chiffrement_i(0)(3) when permutation_i='1' else linear_s(0)(0);
+	chiffrement_o(2)(1) <= chiffrement_i(0)(1) when permutation_i='1' else linear_s(0)(1);
+	chiffrement_o(2)(2) <= chiffrement_i(1)(0) when permutation_i='1' else linear_s(0)(2);
+	chiffrement_o(2)(3) <= chiffrement_i(1)(1) when permutation_i='1' else linear_s(0)(3);
+	chiffrement_o(3)(0) <= chiffrement_i(1)(2) when permutation_i='1' else linear_s(1)(0);
+	chiffrement_o(3)(1) <= chiffrement_i(0)(0) when permutation_i='1' else linear_s(1)(1);
+	chiffrement_o(3)(2) <= chiffrement_i(0)(2) when permutation_i='1' else linear_s(1)(2);
+	chiffrement_o(3)(3) <= chiffrement_i(1)(3) when permutation_i='1' else linear_s(1)(3);
+
+end chiffrement_arch;
+
+configuration chiffrement_conf of chiffrement is
+	for chiffrement_arch
+		for boucle_ligne
+			for boucle_colonne
+				for all : sbox
+					use entity work.sbox( sbox_arch );
+				end for;
+			end for;
+		end for;
+	end for;
+end configuration chiffrement_conf ;
diff --git a/src/add_vhdltbc/ii/ii-128/const_pack.vhd b/src/add_vhdltbc/ii/ii-128/const_pack.vhd
new file mode 100644
index 0000000..27d4397
--- /dev/null
+++ b/src/add_vhdltbc/ii/ii-128/const_pack.vhd
@@ -0,0 +1,41 @@
+-- Implementation of the Lilliput-TBC tweakable block cipher by the
+-- Lilliput-AE team, hereby denoted as "the implementer".
+--
+-- For more information, feedback or questions, refer to our website:
+-- https://paclido.fr/lilliput-ae
+--
+-- To the extent possible under law, the implementer has waived all copyright
+-- and related or neighboring rights to the source code in this file.
+-- http://creativecommons.org/publicdomain/zero/1.0/library IEEE;
+
+library IEEE;
+library work;
+use IEEE.STD_LOGIC_1164.ALL;
+
+package const_pack is
+	--Lilliput constants
+	constant NONCE_LEN : integer := 120;
+	constant TAG_LEN   : integer := 128;
+	constant DATA_LEN  : integer := 128;
+
+	--Lilliput parameters
+	constant ROUND_NB  : integer := 32;
+	constant TWEAK_LEN : integer := 128;
+	constant KEY_LEN   : integer := 128;
+
+	-- lenght of inputs
+	constant DATA_IN_LEN  : integer := 32;
+	constant KEY_IN_LEN   : integer := 32;
+	constant TWEAK_IN_LEN : integer := 32;
+	constant DATA_OUT_LEN : integer := 32;
+	constant sw           : integer := 32;
+	constant W            : integer := 32;
+
+
+	-- Segment Type Encoding
+	constant TYPE_AD    : std_logic_vector(3 downto 0) := "0001";
+	constant TYPE_MES   : std_logic_vector(3 downto 0) := "0100";
+	constant TYPE_CT    : std_logic_vector(3 downto 0) := "1001";
+	constant TYPE_TAG   : std_logic_vector(3 downto 0) := "1000";
+	constant TYPE_NONCE : std_logic_vector(3 downto 0) := "1100";
+end const_pack;
diff --git a/src/add_vhdltbc/ii/ii-128/tb/top_tb.vhd b/src/add_vhdltbc/ii/ii-128/tb/top_tb.vhd
new file mode 100644
index 0000000..05c1173
--- /dev/null
+++ b/src/add_vhdltbc/ii/ii-128/tb/top_tb.vhd
@@ -0,0 +1,80 @@
+-- Implementation of the Lilliput-TBC tweakable block cipher by the
+-- Lilliput-AE team, hereby denoted as "the implementer".
+--
+-- For more information, feedback or questions, refer to our website:
+-- https://paclido.fr/lilliput-ae
+--
+-- To the extent possible under law, the implementer has waived all copyright
+-- and related or neighboring rights to the source code in this file.
+-- http://creativecommons.org/publicdomain/zero/1.0/
+
+library IEEE;
+library work;
+use IEEE.numeric_std.all;
+use IEEE.std_logic_1164.all;
+use work.crypt_pack.all;
+
+
+entity top_tb is
+end top_tb;
+
+architecture top_tb_arch of top_tb is
+
+  component top is port (
+      start_i        : in  std_logic;
+      clock_i        : in  std_logic;
+      reset_i        : in  std_logic;
+      data_i         : in  bit_data;
+      key_i          : in  bit_key;
+      data_o         : out bit_data;
+      tweak_i        : in  bit_tweak;
+      decrypt_i      : in  std_logic;
+      liliput_on_out : out std_logic;
+      valid_o        : out std_logic
+    );
+  end component;
+
+  signal start_i_s, clock_i_s, reset_i_s : std_logic := '0';
+  signal data_i_s                        : bit_data;
+  signal key_i_s                         : bit_key;
+  signal tweak_i_s                       : bit_tweak;
+  signal data_o_s                        : bit_data;
+  signal liliput_on_o_s                  : std_logic;
+  signal decrypt_s                       : std_logic;
+  signal valid_s                         : std_logic;
+begin
+  DUT : top
+    port map(
+      start_i        => start_i_s,
+      clock_i        => clock_i_s,
+      reset_i        => reset_i_s,
+      data_i         => data_i_s,
+      key_i          => key_i_s,
+      tweak_i        => tweak_i_s,
+      data_o         => data_o_s,
+      decrypt_i      => decrypt_s,
+      liliput_on_out => liliput_on_o_s,
+      valid_o        => valid_s
+    );
+
+  clock_i_s <= not(clock_i_s) after 100 ns;
+  reset_i_s <= '0' , '1' after 50 ns;
+
+  -----------------KEY128 TWEAK128 IN32----------
+  decrypt_s <= '0';
+  start_i_s <= '0','1' after 50 ns, '0' after 800 ns; --mettre start_i a 0 des lors que le chiffrement commence
+  data_i_s  <= X"000102030405060708090A0B0C0D0E0F";
+  key_i_s   <= X"000102030405060708090A0B0C0D0E0F";
+  tweak_i_s <= X"000102030405060708090A0B0C0D0E0F";
+  ----------RESULT X"0E00DD58BA4110FCA88DA6EDCA38D95D";
+
+end top_tb_arch;
+
+configuration top_tb_conf of top_tb is
+  for top_tb_arch
+    for DUT : top
+      use entity work.top(top_arch);
+    --use configuration lib_sources.roundexe_arch;
+    end for;
+  end for;
+end configuration top_tb_conf;
diff --git a/src/add_vhdltbc/ii/ii-192/const_pack.vhd b/src/add_vhdltbc/ii/ii-192/const_pack.vhd
new file mode 100644
index 0000000..a79d9b0
--- /dev/null
+++ b/src/add_vhdltbc/ii/ii-192/const_pack.vhd
@@ -0,0 +1,41 @@
+-- Implementation of the Lilliput-TBC tweakable block cipher by the
+-- Lilliput-AE team, hereby denoted as "the implementer".
+--
+-- For more information, feedback or questions, refer to our website:
+-- https://paclido.fr/lilliput-ae
+--
+-- To the extent possible under law, the implementer has waived all copyright
+-- and related or neighboring rights to the source code in this file.
+-- http://creativecommons.org/publicdomain/zero/1.0/library IEEE;
+
+library IEEE;
+library work;
+use IEEE.STD_LOGIC_1164.ALL;
+
+package const_pack is
+	--Lilliput constants
+	constant NONCE_LEN : integer := 120;
+	constant TAG_LEN   : integer := 128;
+	constant DATA_LEN  : integer := 128;
+
+	--Lilliput parameters
+	constant ROUND_NB  : integer := 36;
+	constant TWEAK_LEN : integer := 128;
+	constant KEY_LEN   : integer := 192;
+
+	-- lenght of inputs
+	constant DATA_IN_LEN  : integer := 32;
+	constant KEY_IN_LEN   : integer := 32;
+	constant TWEAK_IN_LEN : integer := 32;
+	constant DATA_OUT_LEN : integer := 32;
+	constant sw           : integer := 32;
+	constant W            : integer := 32;
+
+
+	-- Segment Type Encoding
+	constant TYPE_AD    : std_logic_vector(3 downto 0) := "0001";
+	constant TYPE_MES   : std_logic_vector(3 downto 0) := "0100";
+	constant TYPE_CT    : std_logic_vector(3 downto 0) := "1001";
+	constant TYPE_TAG   : std_logic_vector(3 downto 0) := "1000";
+	constant TYPE_NONCE : std_logic_vector(3 downto 0) := "1100";
+end const_pack;
diff --git a/src/add_vhdltbc/ii/ii-192/tb/top_tb.vhd b/src/add_vhdltbc/ii/ii-192/tb/top_tb.vhd
new file mode 100644
index 0000000..51b4a67
--- /dev/null
+++ b/src/add_vhdltbc/ii/ii-192/tb/top_tb.vhd
@@ -0,0 +1,80 @@
+-- Implementation of the Lilliput-TBC tweakable block cipher by the
+-- Lilliput-AE team, hereby denoted as "the implementer".
+--
+-- For more information, feedback or questions, refer to our website:
+-- https://paclido.fr/lilliput-ae
+--
+-- To the extent possible under law, the implementer has waived all copyright
+-- and related or neighboring rights to the source code in this file.
+-- http://creativecommons.org/publicdomain/zero/1.0/
+
+library IEEE;
+library work;
+use IEEE.numeric_std.all;
+use IEEE.std_logic_1164.all;
+use work.crypt_pack.all;
+
+
+entity top_tb is
+end top_tb;
+
+architecture top_tb_arch of top_tb is
+
+  component top is port (
+      start_i        : in  std_logic;
+      clock_i        : in  std_logic;
+      reset_i        : in  std_logic;
+      data_i         : in  bit_data;
+      key_i          : in  bit_key;
+      data_o         : out bit_data;
+      tweak_i        : in  bit_tweak;
+      decrypt_i      : in  std_logic;
+      liliput_on_out : out std_logic;
+      valid_o        : out std_logic
+    );
+  end component;
+
+  signal start_i_s, clock_i_s, reset_i_s : std_logic := '0';
+  signal data_i_s                        : bit_data;
+  signal key_i_s                         : bit_key;
+  signal tweak_i_s                       : bit_tweak;
+  signal data_o_s                        : bit_data;
+  signal liliput_on_o_s                  : std_logic;
+  signal decrypt_s                       : std_logic;
+  signal valid_s                         : std_logic;
+begin
+  DUT : top
+    port map(
+      start_i        => start_i_s,
+      clock_i        => clock_i_s,
+      reset_i        => reset_i_s,
+      data_i         => data_i_s,
+      key_i          => key_i_s,
+      tweak_i        => tweak_i_s,
+      data_o         => data_o_s,
+      decrypt_i      => decrypt_s,
+      liliput_on_out => liliput_on_o_s,
+      valid_o        => valid_s
+    );
+
+  clock_i_s <= not(clock_i_s) after 100 ns;
+  reset_i_s <= '0' , '1' after 50 ns;
+
+  -----------------KEY192 TWEAK128 IN32----------
+  decrypt_s <= '0';
+  start_i_s <= '0','1' after 50 ns, '0' after 1200 ns; --mettre start_i a 0 des lors que le chiffrement commence
+  data_i_s  <= X"000102030405060708090A0B0C0D0E0F";
+  key_i_s   <= X"000102030405060708090A0B0C0D0E0F1011121314151617";
+  tweak_i_s <= X"000102030405060708090A0B0C0D0E0F";
+  ----------RESULT X"3B87B86C8A12B38497C3F848D83F2049";
+
+end top_tb_arch;
+
+configuration top_tb_conf of top_tb is
+  for top_tb_arch
+    for DUT : top
+      use entity work.top(top_arch);
+    --use configuration lib_sources.roundexe_arch;
+    end for;
+  end for;
+end configuration top_tb_conf;
diff --git a/src/add_vhdltbc/ii/ii-256/const_pack.vhd b/src/add_vhdltbc/ii/ii-256/const_pack.vhd
new file mode 100644
index 0000000..684579c
--- /dev/null
+++ b/src/add_vhdltbc/ii/ii-256/const_pack.vhd
@@ -0,0 +1,41 @@
+-- Implementation of the Lilliput-TBC tweakable block cipher by the
+-- Lilliput-AE team, hereby denoted as "the implementer".
+--
+-- For more information, feedback or questions, refer to our website:
+-- https://paclido.fr/lilliput-ae
+--
+-- To the extent possible under law, the implementer has waived all copyright
+-- and related or neighboring rights to the source code in this file.
+-- http://creativecommons.org/publicdomain/zero/1.0/library IEEE;
+
+library IEEE;
+library work;
+use IEEE.STD_LOGIC_1164.ALL;
+
+package const_pack is
+	--Lilliput constants
+	constant NONCE_LEN : integer := 120;
+	constant TAG_LEN   : integer := 128;
+	constant DATA_LEN  : integer := 128;
+
+	--Lilliput parameters
+	constant ROUND_NB  : integer := 42;
+	constant TWEAK_LEN : integer := 128;
+	constant KEY_LEN   : integer := 256;
+
+	-- lenght of inputs
+	constant DATA_IN_LEN  : integer := 32;
+	constant KEY_IN_LEN   : integer := 32;
+	constant TWEAK_IN_LEN : integer := 32;
+	constant DATA_OUT_LEN : integer := 32;
+	constant sw           : integer := 32;
+	constant W            : integer := 32;
+
+
+	-- Segment Type Encoding
+	constant TYPE_AD    : std_logic_vector(3 downto 0) := "0001";
+	constant TYPE_MES   : std_logic_vector(3 downto 0) := "0100";
+	constant TYPE_CT    : std_logic_vector(3 downto 0) := "1001";
+	constant TYPE_TAG   : std_logic_vector(3 downto 0) := "1000";
+	constant TYPE_NONCE : std_logic_vector(3 downto 0) := "1100";
+end const_pack;
diff --git a/src/add_vhdltbc/ii/ii-256/tb/top_tb.vhd b/src/add_vhdltbc/ii/ii-256/tb/top_tb.vhd
new file mode 100644
index 0000000..02e523e
--- /dev/null
+++ b/src/add_vhdltbc/ii/ii-256/tb/top_tb.vhd
@@ -0,0 +1,81 @@
+-- Implementation of the Lilliput-TBC tweakable block cipher by the
+-- Lilliput-AE team, hereby denoted as "the implementer".
+--
+-- For more information, feedback or questions, refer to our website:
+-- https://paclido.fr/lilliput-ae
+--
+-- To the extent possible under law, the implementer has waived all copyright
+-- and related or neighboring rights to the source code in this file.
+-- http://creativecommons.org/publicdomain/zero/1.0/
+
+library IEEE;
+library work;
+use IEEE.numeric_std.all;
+use IEEE.std_logic_1164.all;
+use work.crypt_pack.all;
+
+
+entity top_tb is
+end top_tb;
+
+architecture top_tb_arch of top_tb is
+
+  component top is port (
+      start_i        : in  std_logic;
+      clock_i        : in  std_logic;
+      reset_i        : in  std_logic;
+      data_i         : in  bit_data;
+      key_i          : in  bit_key;
+      data_o         : out bit_data;
+      tweak_i        : in  bit_tweak;
+      decrypt_i      : in  std_logic;
+      liliput_on_out : out std_logic;
+      valid_o        : out std_logic
+    );
+  end component;
+
+  signal start_i_s, clock_i_s, reset_i_s : std_logic := '0';
+  signal data_i_s                        : bit_data;
+  signal key_i_s                         : bit_key;
+  signal tweak_i_s                       : bit_tweak;
+  signal data_o_s                        : bit_data;
+  signal liliput_on_o_s                  : std_logic;
+  signal decrypt_s                       : std_logic;
+  signal valid_s                         : std_logic;
+begin
+  DUT : top
+    port map(
+      start_i        => start_i_s,
+      clock_i        => clock_i_s,
+      reset_i        => reset_i_s,
+      data_i         => data_i_s,
+      key_i          => key_i_s,
+      tweak_i        => tweak_i_s,
+      data_o         => data_o_s,
+      decrypt_i      => decrypt_s,
+      liliput_on_out => liliput_on_o_s,
+      valid_o        => valid_s
+    );
+
+  clock_i_s <= not(clock_i_s) after 100 ns;
+  reset_i_s <= '0' , '1' after 50 ns;
+
+  -----------------KEY256 TWEAK128 IN32----------
+  decrypt_s <= '0';
+  start_i_s <= '0','1' after 50 ns, '0' after 1600 ns; --mettre start_i a 0 des lors que le chiffrement commence
+  data_i_s  <= X"000102030405060708090A0B0C0D0E0F";
+  key_i_s   <= X"000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F";
+  tweak_i_s <= X"000102030405060708090A0B0C0D0E0F";
+  ----------RESULT X"0ABDC2042F9FDBC1E4E0C96F059B717E";
+
+
+end top_tb_arch;
+
+configuration top_tb_conf of top_tb is
+  for top_tb_arch
+    for DUT : top
+      use entity work.top(top_arch);
+    --use configuration lib_sources.roundexe_arch;
+    end for;
+  end for;
+end configuration top_tb_conf;
diff --git a/src/add_vhdltbc/ii/key_schedule.vhd b/src/add_vhdltbc/ii/key_schedule.vhd
new file mode 100644
index 0000000..f683d52
--- /dev/null
+++ b/src/add_vhdltbc/ii/key_schedule.vhd
@@ -0,0 +1,96 @@
+-- Implementation of the Lilliput-TBC tweakable block cipher by the
+-- Lilliput-AE team, hereby denoted as "the implementer".
+--
+-- For more information, feedback or questions, refer to our website:
+-- https://paclido.fr/lilliput-ae
+--
+-- To the extent possible under law, the implementer has waived all copyright
+-- and related or neighboring rights to the source code in this file.
+-- http://creativecommons.org/publicdomain/zero/1.0/
+
+library IEEE;
+library work;
+use IEEE.numeric_std.ALL;
+use IEEE.STD_LOGIC_1164.ALL;
+use work.crypt_pack.ALL;
+
+
+entity key_schedule_liliput is
+	port (
+		key_i        : in  type_tweak_key_array;
+		round_number : in  std_logic_vector(7 downto 0);
+		key_o        : out type_tweak_key_array;
+		round_key_o  : out type_key
+	);
+end key_schedule_liliput;
+
+architecture key_schedule_liliput_arch of key_schedule_liliput is
+
+	component multiplications
+		port(
+			mularray_i : in  type_tweak_key_array;
+			mularray_o : out type_tweak_key_array
+		);
+	end component;
+
+
+	signal key_s       : type_tweak_key_array;
+	signal round_key_s : type_key;
+
+begin
+
+	multiplications_t : multiplications
+		port map (
+			mularray_i => key_i,
+			mularray_o => key_s
+		);
+
+	key_o <= key_s;
+
+	if_lane4 : if LANE_NB=4 generate
+		col2 : for j in 0 to 3 generate
+			round_key_s(0)(j) <= key_i(0)(j) xor key_i(1)(j) xor key_i(2)(j) xor key_i(3)(j) ;
+			round_key_s(1)(j) <= key_i(0)(j+4) xor key_i(1)(j+4) xor key_i(2)(j+4) xor key_i(3)(j+4);
+		end generate;
+	end generate;
+
+	if_lane5 : if LANE_NB=5 generate
+		col2 : for j in 0 to 3 generate
+			round_key_s(0)(j) <= key_i(0)(j) xor key_i(1)(j) xor key_i(2)(j) xor key_i(3)(j) xor key_i(4)(j) ;
+			round_key_s(1)(j) <= key_i(0)(j+4) xor key_i(1)(j+4) xor key_i(2)(j+4) xor key_i(3)(j+4) xor key_i(4)(j+4);
+		end generate;
+	end generate;
+
+	if_lane6 : if LANE_NB=6 generate
+		col2 : for j in 0 to 3 generate
+			round_key_s(0)(j) <= key_i(0)(j) xor key_i(1)(j) xor key_i(2)(j) xor key_i(3)(j) xor key_i(4)(j) xor key_i(5)(j) ;
+			round_key_s(1)(j) <= key_i(0)(j+4) xor key_i(1)(j+4) xor key_i(2)(j+4) xor key_i(3)(j+4) xor key_i(4)(j+4) xor key_i(5)(j+4);
+		end generate;
+	end generate;
+
+	if_lane7 : if LANE_NB=7 generate
+		col2 : for j in 0 to 3 generate
+			round_key_s(0)(j) <= key_i(0)(j) xor key_i(1)(j) xor key_i(2)(j) xor key_i(3)(j) xor key_i(4)(j) xor key_i(5)(j) xor key_i(6)(j) ;
+			round_key_s(1)(j) <= key_i(0)(j+4) xor key_i(1)(j+4) xor key_i(2)(j+4) xor key_i(3)(j+4) xor key_i(4)(j+4) xor key_i(5)(j+4) xor key_i(6)(j+4);
+		end generate;
+	end generate;
+
+
+	round_key_o(0)(0) <= round_key_s(0)(0) xor round_number;
+	round_key_o(0)(1) <= round_key_s(0)(1);
+	round_key_o(0)(2) <= round_key_s(0)(2);
+	round_key_o(0)(3) <= round_key_s(0)(3);
+	round_key_o(1)    <= round_key_s(1);
+
+
+
+end key_schedule_liliput_arch;
+
+
+configuration key_schedule_liliput_conf of key_schedule_liliput is
+	for key_schedule_liliput_arch
+		for multiplications_t : multiplications
+			use entity work.multiplications(Behavioral);
+		end for;
+	end for;
+end configuration key_schedule_liliput_conf ;
diff --git a/src/add_vhdltbc/ii/machine_etat_chiffrement.vhd b/src/add_vhdltbc/ii/machine_etat_chiffrement.vhd
new file mode 100644
index 0000000..9da6816
--- /dev/null
+++ b/src/add_vhdltbc/ii/machine_etat_chiffrement.vhd
@@ -0,0 +1,130 @@
+-- Implementation of the Lilliput-TBC tweakable block cipher by the
+-- Lilliput-AE team, hereby denoted as "the implementer".
+--
+-- For more information, feedback or questions, refer to our website:
+-- https://paclido.fr/lilliput-ae
+--
+-- To the extent possible under law, the implementer has waived all copyright
+-- and related or neighboring rights to the source code in this file.
+-- http://creativecommons.org/publicdomain/zero/1.0/
+
+library IEEE;
+library work;
+use IEEE.numeric_std.all;
+use IEEE.std_logic_1164.all;
+use work.crypt_pack.all;
+
+entity fsm_chiffrement is
+	port (
+		start_i           : in  std_logic;
+		clock_i           : in  std_logic;
+		reset_i           : in  std_logic;
+		decrypt_i         : in  std_logic;
+		compteur_o        : out std_logic_vector(7 downto 0);
+		liliput_on_out    : out std_logic;
+		invert_o          : out std_logic;
+		data_out_valid_o  : out std_logic;
+		permutation_o     : out std_logic;
+		mux_keyschdule_o  : out std_logic;
+		mux_chiffrement_o : out std_logic
+	);
+end fsm_chiffrement;
+
+architecture fsm_chiffrement_arch of fsm_chiffrement is
+
+	type state is (etat_initial,initroundkey, firstround, loopround, lastround);
+
+	signal present, futur : state;
+	signal compteur       : integer range 0 to ROUND;
+
+begin
+
+	invert_o   <= '0';
+	compteur_o <= std_logic_vector(to_unsigned(compteur,8));
+
+	process_0 : process(clock_i,reset_i,compteur)
+	begin
+		if reset_i = '0' then
+			compteur <= 0;
+			present  <= etat_initial;
+		elsif clock_i'event and clock_i='1' then
+			present <= futur;
+			if (present = initroundkey or present = firstround or present =loopround) then
+				compteur <= compteur+1;
+			else
+				compteur <= 0;
+			end if;
+		end if;
+	end process process_0;
+
+
+	process_1 : process(present, start_i, compteur)
+	begin
+		case present is
+			when etat_initial =>
+				if start_i = '1' then
+					futur <= initroundkey;
+				else
+					futur <= present;
+				end if;
+
+			when initroundkey =>
+				futur <= firstround;
+
+			when firstround =>
+				futur <= loopround;
+
+			when loopround =>
+				if compteur = ROUND-1 then
+					futur <= lastround;
+				else
+					futur <= present;
+				end if;
+
+			when lastround =>
+				futur <= etat_initial;
+
+		end case;
+	end process process_1;
+
+	process_2 : process(present)
+	begin
+		case present is
+			when etat_initial =>
+				liliput_on_out    <= '0';
+				data_out_valid_o  <= '0';
+				permutation_o     <= '0';
+				mux_keyschdule_o  <= '1';
+				mux_chiffrement_o <= '1';
+
+			when initroundkey =>
+				liliput_on_out    <= '0';
+				data_out_valid_o  <= '0';
+				permutation_o     <= '0';
+				mux_keyschdule_o  <= '1';
+				mux_chiffrement_o <= '1';
+
+			when firstround =>
+				liliput_on_out    <= '1';
+				data_out_valid_o  <= '0';
+				permutation_o     <= '1';
+				mux_keyschdule_o  <= '0';
+				mux_chiffrement_o <= '0';
+
+			when loopround =>
+				liliput_on_out    <= '1';
+				data_out_valid_o  <= '0';
+				permutation_o     <= '1';
+				mux_keyschdule_o  <= '0';
+				mux_chiffrement_o <= '0';
+
+			when lastround =>
+				liliput_on_out    <= '1';
+				data_out_valid_o  <= '1';
+				permutation_o     <= '0';
+				mux_keyschdule_o  <= '0';
+				mux_chiffrement_o <= '0';
+		end case;
+	end process process_2;
+
+end architecture fsm_chiffrement_arch;
\ No newline at end of file
diff --git a/src/add_vhdltbc/ii/roundexe_liliput.vhd b/src/add_vhdltbc/ii/roundexe_liliput.vhd
new file mode 100644
index 0000000..d407f6a
--- /dev/null
+++ b/src/add_vhdltbc/ii/roundexe_liliput.vhd
@@ -0,0 +1,139 @@
+-- Implementation of the Lilliput-TBC tweakable block cipher by the
+-- Lilliput-AE team, hereby denoted as "the implementer".
+--
+-- For more information, feedback or questions, refer to our website:
+-- https://paclido.fr/lilliput-ae
+--
+-- To the extent possible under law, the implementer has waived all copyright
+-- and related or neighboring rights to the source code in this file.
+-- http://creativecommons.org/publicdomain/zero/1.0/
+
+library IEEE;
+library work;
+use IEEE.numeric_std.ALL;
+use IEEE.STD_LOGIC_1164.ALL;
+use work.crypt_pack.ALL;
+
+entity roundexe_liliput is
+	port (
+		clock_i           : in  std_logic;
+		reset_i           : in  std_logic;
+		data_i            : in  bit_data; --donnée d'entrée lors du premier Round
+		keyb_i            : in  bit_key;
+		tweak_i           : in  bit_tweak;
+		invert_i          : in  std_logic;
+		round_number_i    : in  std_logic_vector(7 downto 0);
+		permut_valid_i    : in  std_logic; --permet de savoir si on fait la permutation à la fin 
+		mux_keyschdule_i  : in  std_logic;
+		mux_chiffrement_i : in  std_logic;
+		data_out_valid_i  : in  std_logic;
+		data_out_valid_o  : out std_logic;
+		decrypt_i         : in  std_logic;
+		data_o            : out bit_data
+	);
+end roundexe_liliput;
+
+architecture roundexe_liliput_arch of roundexe_liliput is
+
+	component chiffrement
+		port(
+			chiffrement_i : in  type_state;
+			permutation_i : in  std_logic;
+			round_key_i   : in  type_key;
+			chiffrement_o : out type_state
+		);
+	end component;
+
+	component key_schedule_liliput
+		port (
+			key_i        : in  type_tweak_key_array;
+			round_number : in  std_logic_vector(7 downto 0);
+			key_o        : out type_tweak_key_array;
+			round_key_o  : out type_key
+		);
+	end component;
+
+
+	signal data_i_s          : type_state;
+	signal chiffrement_o_s   : type_state;
+	signal mux_1_s           : type_state;
+	signal mux_2_s           : type_tweak_key_array;
+	signal state_o_s         : type_state;
+	signal state_tk_o_s      : type_tweak_key_array;
+	signal round_key_o_s     : type_key;
+	signal state_round_key_s : type_key;
+	signal tweak_key_i       : bit_tweak_key := (others => '0');
+	signal tk_s              : type_tweak_key_array;
+	signal tk_o_s            : type_tweak_key_array;
+	signal data_out_valid_s  : std_logic;
+
+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(127-8*(j+(4*i))downto 120-8*(j+(4*i)));
+			data_o(127-8*(j+(4*i))downto 120-8*(j+(4*i))) <= state_o_s(i)(j) when data_out_valid_s = '1' else X"00";
+		end generate;
+	end generate;
+
+	data_out_valid_o <= data_out_valid_s;
+
+		reg_roundkey : process(reset_i, clock_i)
+	begin
+		if(reset_i = '0') then
+			state_round_key_s <= (others => (others => (others => '0')));
+			state_tk_o_s      <= (others => (others => (others => '0')));
+			state_o_s         <= (others => (others => (others => '0')));
+			data_out_valid_s  <= '0';
+
+		elsif(clock_i'event and clock_i = '1') then
+			state_round_key_s <= round_key_o_s;
+			state_tk_o_s      <= tk_o_s;
+			state_o_s         <= mux_1_s;
+			data_out_valid_s  <= data_out_valid_i;
+		end if;
+	end process reg_roundkey;
+
+	--Tweak_key concatenation
+	tweak_key_i (TWEAK_KEY_LEN downto 0) <= tweak_i & keyb_i;
+
+	--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( (TWEAK_KEY_LEN)-8*(8*i+j)downto TWEAK_KEY_LEN-7-8*(8*i+j));
+		end generate;
+	end generate;
+
+	--Avantage on n'utilise le même mux donc pas de changement dans la machine d'état
+	mux_1_s <= data_i_s when mux_chiffrement_i = '1' else
+		chiffrement_o_s;
+
+	mux_2_s <= tk_s when mux_keyschdule_i = '1' else
+		state_tk_o_s;
+
+		key_schedule_t : key_schedule_liliput port map(
+			key_i        => mux_2_s,
+			round_number => round_number_i,
+			key_o        => tk_o_s,
+			round_key_o  => round_key_o_s
+		);
+
+		chiffrement_t : chiffrement port map(
+			chiffrement_i => state_o_s,
+			permutation_i => permut_valid_i,
+			round_key_i   => state_round_key_s,
+			chiffrement_o => chiffrement_o_s
+		);
+
+end roundexe_liliput_arch;
+
+configuration roundexe_liliput_conf of roundexe_liliput is
+	for roundexe_liliput_arch
+		for key_schedule_t : key_schedule_liliput
+			use entity work.key_schedule_liliput(key_schedule_liliputr_arch);
+		end for;
+		for chiffrement_t : chiffrement
+			use entity work.chiffrement(chiffrement_arch);
+		end for;
+	end for;
+end configuration roundexe_liliput_conf;
\ No newline at end of file