From b64afaa513d66390005ea515ecd2393cb7e19c4f Mon Sep 17 00:00:00 2001
From: Kévin Le Gouguec <kevin.legouguec@airbus.com>
Date: Mon, 1 Jul 2019 17:25:15 +0200
Subject: Mise à jour de l'implémentation felicsref
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/add_felicsref/tweakey.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/add_felicsref')

diff --git a/src/add_felicsref/tweakey.c b/src/add_felicsref/tweakey.c
index 18a7792..47badde 100644
--- a/src/add_felicsref/tweakey.c
+++ b/src/add_felicsref/tweakey.c
@@ -81,11 +81,10 @@ static void _multiply(uint8_t TKj[LANE_BYTES], matrix_multiplication alpha)
 
 void tweakey_state_update(uint8_t TK[TWEAKEY_BYTES])
 {
-    /* Skip lane 0, as it is multiplied by the identity matrix. */
-
-    _multiply(TK + 1*LANE_BYTES, _multiply_M);
-    _multiply(TK + 2*LANE_BYTES, _multiply_M2);
-    _multiply(TK + 3*LANE_BYTES, _multiply_M3);
+    _multiply(TK + 0*LANE_BYTES, _multiply_M);
+    _multiply(TK + 1*LANE_BYTES, _multiply_M2);
+    _multiply(TK + 2*LANE_BYTES, _multiply_M3);
+    _multiply(TK + 3*LANE_BYTES, _multiply_M4);
 
 #if LANES_NB >= 5
     _multiply(TK + 4*LANE_BYTES, _multiply_MR);
-- 
cgit v1.2.3


From 5fdd2fd67a68d43830300c3ddf4440478ff73cfd Mon Sep 17 00:00:00 2001
From: Kévin Le Gouguec <kevin.legouguec@airbus.com>
Date: Fri, 5 Jul 2019 09:48:32 +0200
Subject: Utilisation de "size_t" pour l'indexation d'un tableau
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cf. db83bae, surtout par souci d'homogénéité.
---
 CHANGELOG.txt              | 6 +++---
 src/add_felicsref/cipher.c | 4 ++--
 src/ref/cipher.c           | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/add_felicsref')

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index cc38a27..eb074ad 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -34,6 +34,9 @@ These modifications are structural and/or stylistic and do not change the algori
 - Extract tweakey multiplications into their own header file, so that other implementations can make more targeted changes.
   (constants.h, multiplications.h, tweakey.c)
 
+- Use size_t to iterate on arrays in lilliput_tbc_encrypt() and lilliput_tbc_decrypt().
+  (cipher.c)
+
 add_threshold
 -------------
 
@@ -45,9 +48,6 @@ See reference implementation.
 
 See reference implementation. Further cleanups:
 
-- Use size_t to iterate on arrays in lilliput_tbc_encrypt() and lilliput_tbc_decrypt().
-  (cipher.c)
-
 - Add constant macros KEY_LANES_NB and TWEAK_LANES_NB to make tweakey schedule code more legible.
   (tweakey.c)
 
diff --git a/src/add_felicsref/cipher.c b/src/add_felicsref/cipher.c
index 7de0a08..59bc5d8 100644
--- a/src/add_felicsref/cipher.c
+++ b/src/add_felicsref/cipher.c
@@ -150,7 +150,7 @@ void lilliput_tbc_encrypt(
     uint8_t RTK[ROUND_TWEAKEY_BYTES];
     tweakey_state_init(TK, key, tweak);
 
-    for (unsigned i=0; i<ROUNDS-1; i++)
+    for (size_t i=0; i<ROUNDS-1; i++)
     {
         tweakey_state_extract(TK, i, RTK);
         _one_round_egfn(ciphertext, RTK, PERMUTATION_ENCRYPTION);
@@ -174,7 +174,7 @@ void lilliput_tbc_decrypt(
     uint8_t RTK[ROUNDS][ROUND_TWEAKEY_BYTES];
     _compute_round_tweakeys(key, tweak, RTK);
 
-    for (uint8_t i=0; i<ROUNDS-1; i++)
+    for (size_t i=0; i<ROUNDS-1; i++)
     {
         _one_round_egfn(X, RTK[ROUNDS-1-i], PERMUTATION_DECRYPTION);
     }
diff --git a/src/ref/cipher.c b/src/ref/cipher.c
index 8ebbbc3..07405e1 100644
--- a/src/ref/cipher.c
+++ b/src/ref/cipher.c
@@ -148,7 +148,7 @@ void lilliput_tbc_encrypt(
     uint8_t RTK[ROUNDS][ROUND_TWEAKEY_BYTES];
     _compute_round_tweakeys(key, tweak, RTK);
 
-    for (uint8_t i=0; i<ROUNDS-1; i++)
+    for (size_t i=0; i<ROUNDS-1; i++)
     {
         _one_round_egfn(X, RTK[i], PERMUTATION_ENCRYPTION);
     }
@@ -171,7 +171,7 @@ void lilliput_tbc_decrypt(
     uint8_t RTK[ROUNDS][ROUND_TWEAKEY_BYTES];
     _compute_round_tweakeys(key, tweak, RTK);
 
-    for (uint8_t i=0; i<ROUNDS-1; i++)
+    for (size_t i=0; i<ROUNDS-1; i++)
     {
         _one_round_egfn(X, RTK[ROUNDS-1-i], PERMUTATION_DECRYPTION);
     }
-- 
cgit v1.2.3