diff options
| -rwxr-xr-x | nist/make-package.sh | 2 | ||||
| l--------- | src/add_tweakeyunrolled/cipher.c (renamed from src/add_tweakeyloop/cipher.c) | 0 | ||||
| l--------- | src/add_tweakeyunrolled/cipher.h (renamed from src/add_tweakeyloop/cipher.h) | 0 | ||||
| l--------- | src/add_tweakeyunrolled/constants.h (renamed from src/add_tweakeyloop/constants.h) | 0 | ||||
| l--------- | src/add_tweakeyunrolled/lilliput-ae-i.c (renamed from src/add_tweakeyloop/lilliput-ae-i.c) | 0 | ||||
| l--------- | src/add_tweakeyunrolled/lilliput-ae-ii.c (renamed from src/add_tweakeyloop/lilliput-ae-ii.c) | 0 | ||||
| l--------- | src/add_tweakeyunrolled/lilliput-ae-utils.h (renamed from src/add_tweakeyloop/lilliput-ae-utils.h) | 0 | ||||
| l--------- | src/add_tweakeyunrolled/lilliput-ae.h (renamed from src/add_tweakeyloop/lilliput-ae.h) | 0 | ||||
| -rw-r--r-- | src/add_tweakeyunrolled/tweakey.c (renamed from src/add_tweakeyloop/tweakey.c) | 70 | ||||
| l--------- | src/add_tweakeyunrolled/tweakey.h (renamed from src/add_tweakeyloop/tweakey.h) | 0 | ||||
| -rw-r--r-- | src/ref/tweakey.c | 70 | ||||
| -rw-r--r-- | traces/traces-tbc.patch | 2 |
12 files changed, 72 insertions, 72 deletions
diff --git a/nist/make-package.sh b/nist/make-package.sh index 3a90dce..dd50f54 100755 --- a/nist/make-package.sh +++ b/nist/make-package.sh @@ -52,7 +52,7 @@ add-variant () implementations=( ref - add_tweakeyloop + add_tweakeyunrolled add_tweakeysequences ) diff --git a/src/add_tweakeyloop/cipher.c b/src/add_tweakeyunrolled/cipher.c index a2ac6a3..a2ac6a3 120000 --- a/src/add_tweakeyloop/cipher.c +++ b/src/add_tweakeyunrolled/cipher.c diff --git a/src/add_tweakeyloop/cipher.h b/src/add_tweakeyunrolled/cipher.h index eab258b..eab258b 120000 --- a/src/add_tweakeyloop/cipher.h +++ b/src/add_tweakeyunrolled/cipher.h diff --git a/src/add_tweakeyloop/constants.h b/src/add_tweakeyunrolled/constants.h index 67df0f3..67df0f3 120000 --- a/src/add_tweakeyloop/constants.h +++ b/src/add_tweakeyunrolled/constants.h diff --git a/src/add_tweakeyloop/lilliput-ae-i.c b/src/add_tweakeyunrolled/lilliput-ae-i.c index 2ed1026..2ed1026 120000 --- a/src/add_tweakeyloop/lilliput-ae-i.c +++ b/src/add_tweakeyunrolled/lilliput-ae-i.c diff --git a/src/add_tweakeyloop/lilliput-ae-ii.c b/src/add_tweakeyunrolled/lilliput-ae-ii.c index af141f8..af141f8 120000 --- a/src/add_tweakeyloop/lilliput-ae-ii.c +++ b/src/add_tweakeyunrolled/lilliput-ae-ii.c diff --git a/src/add_tweakeyloop/lilliput-ae-utils.h b/src/add_tweakeyunrolled/lilliput-ae-utils.h index b46625b..b46625b 120000 --- a/src/add_tweakeyloop/lilliput-ae-utils.h +++ b/src/add_tweakeyunrolled/lilliput-ae-utils.h diff --git a/src/add_tweakeyloop/lilliput-ae.h b/src/add_tweakeyunrolled/lilliput-ae.h index 66c8314..66c8314 120000 --- a/src/add_tweakeyloop/lilliput-ae.h +++ b/src/add_tweakeyunrolled/lilliput-ae.h diff --git a/src/add_tweakeyloop/tweakey.c b/src/add_tweakeyunrolled/tweakey.c index 7019037..45d938f 100644 --- a/src/add_tweakeyloop/tweakey.c +++ b/src/add_tweakeyunrolled/tweakey.c @@ -14,7 +14,7 @@ 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. +by functions expressing the exponentiated matrices with shifts and XORs. */ #include <stdint.h> @@ -62,6 +62,26 @@ void tweakey_state_extract( } +static uint8_t _M1(uint8_t x) +{ + return x<<3 ^ x>>3; +} + +static uint8_t _M2(uint8_t x) +{ + return x<<6 ^ (x>>3)<<3 ^ x>>6; +} + +static uint8_t _M3(uint8_t x) +{ + return (uint8_t)(x<<3) >> 3; +} + +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]) { Y[7] = X[6]; @@ -76,18 +96,26 @@ static void _multiply_M(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); + 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]) { - 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); + 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]) @@ -104,18 +132,26 @@ static void _multiply_MR(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); + 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]) { - 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); + 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]); diff --git a/src/add_tweakeyloop/tweakey.h b/src/add_tweakeyunrolled/tweakey.h index 7f2415f..7f2415f 120000 --- a/src/add_tweakeyloop/tweakey.h +++ b/src/add_tweakeyunrolled/tweakey.h diff --git a/src/ref/tweakey.c b/src/ref/tweakey.c index 319ca49..7019037 100644 --- a/src/ref/tweakey.c +++ b/src/ref/tweakey.c @@ -14,7 +14,7 @@ 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 functions expressing the exponentiated matrices with shifts and XORs. +by applying functions for M and M_R n times. */ #include <stdint.h> @@ -62,26 +62,6 @@ void tweakey_state_extract( } -static uint8_t _M1(uint8_t x) -{ - return x<<3 ^ x>>3; -} - -static uint8_t _M2(uint8_t x) -{ - return x<<6 ^ (x & 0xf8) ^ x>>6; -} - -static uint8_t _M3(uint8_t x) -{ - return (uint8_t)(x<<3) >> 3; -} - -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]) { Y[7] = X[6]; @@ -96,26 +76,18 @@ static void _multiply_M(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]; + 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]) { - 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]; + 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]) @@ -132,26 +104,18 @@ static void _multiply_MR(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]; + 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]) { - 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]; + 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]); diff --git a/traces/traces-tbc.patch b/traces/traces-tbc.patch index ca776a1..fca6da1 100644 --- a/traces/traces-tbc.patch +++ b/traces/traces-tbc.patch @@ -121,7 +121,7 @@ index 39e5980..4cdcf2a 100644 --- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/tweakey.c +++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/tweakey.c @@ -17,6 +17,8 @@ where multiplications by matrices M and M_R to the power n is performed by - functions expressing the exponentiated matrices with shifts and XORs. + by applying functions for M and M_R n times. */ +#include "debug.h" |