From 7d7b662a640c4eebe528914fecc794a3868a5952 Mon Sep 17 00:00:00 2001 From: Kévin Le Gouguec Date: Mon, 11 Feb 2019 10:56:59 +0100 Subject: Utilisation du tweakey schedule "itératif" comme référence MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Au final, il n'est pas moins performant que l'autre ; cf. issue #4. --- src/add_tweakeyloop/cipher.c | 1 - src/add_tweakeyloop/cipher.h | 1 - src/add_tweakeyloop/constants.h | 1 - src/add_tweakeyloop/lilliput-ae-i.c | 1 - src/add_tweakeyloop/lilliput-ae-ii.c | 1 - src/add_tweakeyloop/lilliput-ae-utils.h | 1 - src/add_tweakeyloop/lilliput-ae.h | 1 - src/add_tweakeyloop/tweakey.c | 146 -------------------------------- src/add_tweakeyloop/tweakey.h | 1 - 9 files changed, 154 deletions(-) delete mode 120000 src/add_tweakeyloop/cipher.c delete mode 120000 src/add_tweakeyloop/cipher.h delete mode 120000 src/add_tweakeyloop/constants.h delete mode 120000 src/add_tweakeyloop/lilliput-ae-i.c delete mode 120000 src/add_tweakeyloop/lilliput-ae-ii.c delete mode 120000 src/add_tweakeyloop/lilliput-ae-utils.h delete mode 120000 src/add_tweakeyloop/lilliput-ae.h delete mode 100644 src/add_tweakeyloop/tweakey.c delete mode 120000 src/add_tweakeyloop/tweakey.h (limited to 'src/add_tweakeyloop') diff --git a/src/add_tweakeyloop/cipher.c b/src/add_tweakeyloop/cipher.c deleted file mode 120000 index a2ac6a3..0000000 --- a/src/add_tweakeyloop/cipher.c +++ /dev/null @@ -1 +0,0 @@ -../ref/cipher.c \ No newline at end of file diff --git a/src/add_tweakeyloop/cipher.h b/src/add_tweakeyloop/cipher.h deleted file mode 120000 index eab258b..0000000 --- a/src/add_tweakeyloop/cipher.h +++ /dev/null @@ -1 +0,0 @@ -../ref/cipher.h \ No newline at end of file diff --git a/src/add_tweakeyloop/constants.h b/src/add_tweakeyloop/constants.h deleted file mode 120000 index 67df0f3..0000000 --- a/src/add_tweakeyloop/constants.h +++ /dev/null @@ -1 +0,0 @@ -../ref/constants.h \ No newline at end of file diff --git a/src/add_tweakeyloop/lilliput-ae-i.c b/src/add_tweakeyloop/lilliput-ae-i.c deleted file mode 120000 index 2ed1026..0000000 --- a/src/add_tweakeyloop/lilliput-ae-i.c +++ /dev/null @@ -1 +0,0 @@ -../ref/lilliput-ae-i.c \ No newline at end of file diff --git a/src/add_tweakeyloop/lilliput-ae-ii.c b/src/add_tweakeyloop/lilliput-ae-ii.c deleted file mode 120000 index af141f8..0000000 --- a/src/add_tweakeyloop/lilliput-ae-ii.c +++ /dev/null @@ -1 +0,0 @@ -../ref/lilliput-ae-ii.c \ No newline at end of file diff --git a/src/add_tweakeyloop/lilliput-ae-utils.h b/src/add_tweakeyloop/lilliput-ae-utils.h deleted file mode 120000 index b46625b..0000000 --- a/src/add_tweakeyloop/lilliput-ae-utils.h +++ /dev/null @@ -1 +0,0 @@ -../ref/lilliput-ae-utils.h \ No newline at end of file diff --git a/src/add_tweakeyloop/lilliput-ae.h b/src/add_tweakeyloop/lilliput-ae.h deleted file mode 120000 index 66c8314..0000000 --- a/src/add_tweakeyloop/lilliput-ae.h +++ /dev/null @@ -1 +0,0 @@ -../ref/lilliput-ae.h \ No newline at end of file diff --git a/src/add_tweakeyloop/tweakey.c b/src/add_tweakeyloop/tweakey.c deleted file mode 100644 index 7019037..0000000 --- a/src/add_tweakeyloop/tweakey.c +++ /dev/null @@ -1,146 +0,0 @@ -/* -Implementation of the Lilliput-AE tweakable block cipher. - -Author: Kévin Le Gouguec, 2019. - -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/ - ---- - -This file provides an implementation of Lilliput-TBC's tweakey schedule, -where multiplications by matrices M and M_R to the power n are performed -by applying functions for M and M_R n times. -*/ - -#include -#include - -#include "constants.h" -#include "tweakey.h" - - -#define LANE_BITS 64 -#define LANE_BYTES (LANE_BITS/8) -#define LANES_NB (TWEAKEY_BYTES/LANE_BYTES) - - -void tweakey_state_init( - uint8_t TK[TWEAKEY_BYTES], - const uint8_t key[KEY_BYTES], - const uint8_t tweak[TWEAK_BYTES] -) -{ - memcpy(TK, tweak, TWEAK_BYTES); - memcpy(TK+TWEAK_BYTES, key, KEY_BYTES); -} - - -void tweakey_state_extract( - const uint8_t TK[TWEAKEY_BYTES], - uint8_t round_constant, - uint8_t round_tweakey[ROUND_TWEAKEY_BYTES] -) -{ - memset(round_tweakey, 0, ROUND_TWEAKEY_BYTES); - - for (size_t j=0; j>3 ^ X[3]; - Y[3] = X[2]; - Y[2] = X[6]<<2 ^ X[1]; - Y[1] = X[0]; - Y[0] = X[7]; -} - -static void _multiply_M2(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]) -{ - uint8_t M_X[LANE_BYTES]; - _multiply_M(X, M_X); - _multiply_M(M_X, Y); -} - -static void _multiply_M3(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]) -{ - uint8_t M_X[LANE_BYTES]; - uint8_t M2_X[LANE_BYTES]; - _multiply_M(X, M_X); - _multiply_M(M_X, M2_X); - _multiply_M(M2_X, Y); -} - -static void _multiply_MR(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]) -{ - Y[0] = X[1]; - Y[1] = X[2]; - Y[2] = X[3] ^ X[4]>>3; - Y[3] = X[4]; - Y[4] = X[5] ^ X[6]<<3; - Y[5] = X[3]<<2 ^ X[6]; - Y[6] = X[7]; - Y[7] = X[0]; -} - -static void _multiply_MR2(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]) -{ - uint8_t MR_X[LANE_BYTES]; - _multiply_MR(X, MR_X); - _multiply_MR(MR_X, Y); -} - -static void _multiply_MR3(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]) -{ - uint8_t MR_X[LANE_BYTES]; - uint8_t MR2_X[LANE_BYTES]; - _multiply_MR(X, MR_X); - _multiply_MR(MR_X, MR2_X); - _multiply_MR(MR2_X, Y); -} - -typedef void (*matrix_multiplication)(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]); - -static const matrix_multiplication ALPHAS[6] = { - _multiply_M, - _multiply_M2, - _multiply_M3, - _multiply_MR, - _multiply_MR2, - _multiply_MR3 -}; - - -void tweakey_state_update(uint8_t TK[TWEAKEY_BYTES]) -{ - /* Skip lane 0, as it is multiplied by the identity matrix. */ - - for (size_t j=1; j