From 5689a35ba9a6821601ec71792a19bc6034be2dad Mon Sep 17 00:00:00 2001 From: Kévin Le Gouguec Date: Wed, 20 Feb 2019 17:10:27 +0100 Subject: Renommage des variables des vecteurs-colonnes du tweakey schedule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On utilise des minuscules dans la spécification. --- src/add_tweakeysequences/tweakey.c | 110 ++++++++++++++++++------------------- src/add_tweakeyunrolled/tweakey.c | 110 ++++++++++++++++++------------------- src/ref/tweakey.c | 78 +++++++++++++------------- 3 files changed, 149 insertions(+), 149 deletions(-) diff --git a/src/add_tweakeysequences/tweakey.c b/src/add_tweakeysequences/tweakey.c index 9d9e4da..fa77e36 100644 --- a/src/add_tweakeysequences/tweakey.c +++ b/src/add_tweakeysequences/tweakey.c @@ -140,79 +140,79 @@ static const uint8_t M_4[256] = { }; -static void _multiply_M(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]) +static void _multiply_M(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]) { - Y[7] = X[6]; - Y[6] = X[5]; - Y[5] = X[5]<<3 ^ X[4]; - Y[4] = X[4]>>3 ^ X[3]; - Y[3] = X[2]; - Y[2] = X[6]<<2 ^ X[1]; - Y[1] = X[0]; - Y[0] = X[7]; + y[7] = x[6]; + y[6] = x[5]; + y[5] = x[5]<<3 ^ x[4]; + y[4] = x[4]>>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]) +static void _multiply_M2(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]) { - Y[7] = X[5]; - Y[6] = X[5]<<3 ^ X[4]; - Y[5] = X[5]<<6 ^ M_1[X[4]] ^ X[3]; - Y[4] = X[4]>>6 ^ X[3]>>3 ^ X[2]; - Y[3] = X[6]<<2 ^ X[1]; - Y[2] = X[5]<<2 ^ X[0]; - Y[1] = X[7]; - Y[0] = X[6]; + y[7] = x[5]; + y[6] = x[5]<<3 ^ x[4]; + y[5] = x[5]<<6 ^ M_1[x[4]] ^ x[3]; + y[4] = x[4]>>6 ^ x[3]>>3 ^ x[2]; + y[3] = x[6]<<2 ^ x[1]; + y[2] = x[5]<<2 ^ x[0]; + y[1] = x[7]; + y[0] = x[6]; } -static void _multiply_M3(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]) +static void _multiply_M3(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]) { - Y[7] = X[5]<<3 ^ X[4]; - Y[6] = X[5]<<6 ^ M_1[X[4]] ^ X[3]; - Y[5] = M_2[X[4]] ^ M_1[X[3]] ^ X[2]; - Y[4] = X[6]<<2 ^ X[3]>>6 ^ X[2]>>3 ^ X[1]; - Y[3] = X[5]<<2 ^ X[0]; - Y[2] = X[7] ^ X[5]<<5 ^ X[4]<<2; - Y[1] = X[6]; - Y[0] = X[5]; + y[7] = x[5]<<3 ^ x[4]; + y[6] = x[5]<<6 ^ M_1[x[4]] ^ x[3]; + y[5] = M_2[x[4]] ^ M_1[x[3]] ^ x[2]; + y[4] = x[6]<<2 ^ x[3]>>6 ^ x[2]>>3 ^ x[1]; + y[3] = x[5]<<2 ^ x[0]; + y[2] = x[7] ^ x[5]<<5 ^ x[4]<<2; + y[1] = x[6]; + y[0] = x[5]; } -static void _multiply_MR(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]) +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]; + 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]) +static void _multiply_MR2(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]) { - Y[0] = X[2]; - Y[1] = X[3] ^ X[4]>>3; - Y[2] = X[4] ^ X[5]>>3 ^ M_3[X[6]]; - Y[3] = X[5] ^ X[6]<<3; - Y[4] = X[3]<<2 ^ X[6] ^ X[7]<<3; - Y[5] = X[4]<<2 ^ X[7]; - Y[6] = X[0]; - Y[7] = X[1]; + y[0] = x[2]; + y[1] = x[3] ^ x[4]>>3; + y[2] = x[4] ^ x[5]>>3 ^ M_3[x[6]]; + y[3] = x[5] ^ x[6]<<3; + y[4] = x[3]<<2 ^ x[6] ^ x[7]<<3; + y[5] = x[4]<<2 ^ x[7]; + y[6] = x[0]; + y[7] = x[1]; } -static void _multiply_MR3(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]) +static void _multiply_MR3(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]) { - Y[0] = X[3] ^ X[4]>>3; - Y[1] = X[4] ^ X[5]>>3 ^ M_3[X[6]]; - Y[2] = M_4[X[3]] ^ X[5] ^ M_1[X[6]] ^ M_3[X[7]]; - Y[3] = X[3]<<2 ^ X[6] ^ X[7]<<3; - Y[4] = X[0]<<3 ^ X[4]<<2 ^ X[7]; - Y[5] = X[0] ^ X[5]<<2 ^ X[6]<<5; - Y[6] = X[1]; - Y[7] = X[2]; + y[0] = x[3] ^ x[4]>>3; + y[1] = x[4] ^ x[5]>>3 ^ M_3[x[6]]; + y[2] = M_4[x[3]] ^ x[5] ^ M_1[x[6]] ^ M_3[x[7]]; + y[3] = x[3]<<2 ^ x[6] ^ x[7]<<3; + y[4] = x[0]<<3 ^ x[4]<<2 ^ x[7]; + y[5] = x[0] ^ x[5]<<2 ^ x[6]<<5; + y[6] = x[1]; + y[7] = x[2]; } -typedef void (*matrix_multiplication)(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]); +typedef void (*matrix_multiplication)(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]); static const matrix_multiplication ALPHAS[6] = { _multiply_M, diff --git a/src/add_tweakeyunrolled/tweakey.c b/src/add_tweakeyunrolled/tweakey.c index 45d938f..348de51 100644 --- a/src/add_tweakeyunrolled/tweakey.c +++ b/src/add_tweakeyunrolled/tweakey.c @@ -82,79 +82,79 @@ static uint8_t _M4(uint8_t x) return (uint8_t)(x<<2) >> 3; } -static void _multiply_M(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]) +static void _multiply_M(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]) { - Y[7] = X[6]; - Y[6] = X[5]; - Y[5] = X[5]<<3 ^ X[4]; - Y[4] = X[4]>>3 ^ X[3]; - Y[3] = X[2]; - Y[2] = X[6]<<2 ^ X[1]; - Y[1] = X[0]; - Y[0] = X[7]; + y[7] = x[6]; + y[6] = x[5]; + y[5] = x[5]<<3 ^ x[4]; + y[4] = x[4]>>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]) +static void _multiply_M2(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]) { - Y[7] = X[5]; - Y[6] = X[5]<<3 ^ X[4]; - Y[5] = X[5]<<6 ^ _M1(X[4]) ^ X[3]; - Y[4] = X[4]>>6 ^ X[3]>>3 ^ X[2]; - Y[3] = X[6]<<2 ^ X[1]; - Y[2] = X[5]<<2 ^ X[0]; - Y[1] = X[7]; - Y[0] = X[6]; + y[7] = x[5]; + y[6] = x[5]<<3 ^ x[4]; + y[5] = x[5]<<6 ^ _M1(x[4]) ^ x[3]; + y[4] = x[4]>>6 ^ x[3]>>3 ^ x[2]; + y[3] = x[6]<<2 ^ x[1]; + y[2] = x[5]<<2 ^ x[0]; + y[1] = x[7]; + y[0] = x[6]; } -static void _multiply_M3(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]) +static void _multiply_M3(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]) { - Y[7] = X[5]<<3 ^ X[4]; - Y[6] = X[5]<<6 ^ _M1(X[4]) ^ X[3]; - Y[5] = _M2(X[4]) ^ _M1(X[3]) ^ X[2]; - Y[4] = X[6]<<2 ^ X[3]>>6 ^ X[2]>>3 ^ X[1]; - Y[3] = X[5]<<2 ^ X[0]; - Y[2] = X[7] ^ X[5]<<5 ^ X[4]<<2; - Y[1] = X[6]; - Y[0] = X[5]; + y[7] = x[5]<<3 ^ x[4]; + y[6] = x[5]<<6 ^ _M1(x[4]) ^ x[3]; + y[5] = _M2(x[4]) ^ _M1(x[3]) ^ x[2]; + y[4] = x[6]<<2 ^ x[3]>>6 ^ x[2]>>3 ^ x[1]; + y[3] = x[5]<<2 ^ x[0]; + y[2] = x[7] ^ x[5]<<5 ^ x[4]<<2; + y[1] = x[6]; + y[0] = x[5]; } -static void _multiply_MR(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]) +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]; + 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]) +static void _multiply_MR2(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]) { - Y[0] = X[2]; - Y[1] = X[3] ^ X[4]>>3; - Y[2] = X[4] ^ X[5]>>3 ^ _M3(X[6]); - Y[3] = X[5] ^ X[6]<<3; - Y[4] = X[3]<<2 ^ X[6] ^ X[7]<<3; - Y[5] = X[4]<<2 ^ X[7]; - Y[6] = X[0]; - Y[7] = X[1]; + y[0] = x[2]; + y[1] = x[3] ^ x[4]>>3; + y[2] = x[4] ^ x[5]>>3 ^ _M3(x[6]); + y[3] = x[5] ^ x[6]<<3; + y[4] = x[3]<<2 ^ x[6] ^ x[7]<<3; + y[5] = x[4]<<2 ^ x[7]; + y[6] = x[0]; + y[7] = x[1]; } -static void _multiply_MR3(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]) +static void _multiply_MR3(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]) { - Y[0] = X[3] ^ X[4]>>3; - Y[1] = X[4] ^ X[5]>>3 ^ _M3(X[6]); - Y[2] = _M4(X[3]) ^ X[5] ^ _M1(X[6]) ^ _M3(X[7]); - Y[3] = X[3]<<2 ^ X[6] ^ X[7]<<3; - Y[4] = X[0]<<3 ^ X[4]<<2 ^ X[7]; - Y[5] = X[0] ^ X[5]<<2 ^ X[6]<<5; - Y[6] = X[1]; - Y[7] = X[2]; + y[0] = x[3] ^ x[4]>>3; + y[1] = x[4] ^ x[5]>>3 ^ _M3(x[6]); + y[2] = _M4(x[3]) ^ x[5] ^ _M1(x[6]) ^ _M3(x[7]); + y[3] = x[3]<<2 ^ x[6] ^ x[7]<<3; + y[4] = x[0]<<3 ^ x[4]<<2 ^ x[7]; + y[5] = x[0] ^ x[5]<<2 ^ x[6]<<5; + y[6] = x[1]; + y[7] = x[2]; } -typedef void (*matrix_multiplication)(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]); +typedef void (*matrix_multiplication)(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]); static const matrix_multiplication ALPHAS[6] = { _multiply_M, diff --git a/src/ref/tweakey.c b/src/ref/tweakey.c index 7019037..b1f349e 100644 --- a/src/ref/tweakey.c +++ b/src/ref/tweakey.c @@ -62,63 +62,63 @@ void tweakey_state_extract( } -static void _multiply_M(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES]) +static void _multiply_M(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]) { - Y[7] = X[6]; - Y[6] = X[5]; - Y[5] = X[5]<<3 ^ X[4]; - Y[4] = X[4]>>3 ^ X[3]; - Y[3] = X[2]; - Y[2] = X[6]<<2 ^ X[1]; - Y[1] = X[0]; - Y[0] = X[7]; + y[7] = x[6]; + y[6] = x[5]; + y[5] = x[5]<<3 ^ x[4]; + y[4] = x[4]>>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]) +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); + 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]) +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); + 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]) +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]; + 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]) +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); + 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]) +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); + 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]); +typedef void (*matrix_multiplication)(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]); static const matrix_multiplication ALPHAS[6] = { _multiply_M, -- cgit v1.2.3