diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/add_threshold/implem.mk | 5 | ||||
| l--------- | src/add_threshold/multiplications.h | 1 | ||||
| -rw-r--r-- | src/add_threshold/tweakey.c | 88 |
3 files changed, 5 insertions, 89 deletions
diff --git a/src/add_threshold/implem.mk b/src/add_threshold/implem.mk index ecf136a..7e3ac8e 100644 --- a/src/add_threshold/implem.mk +++ b/src/add_threshold/implem.mk @@ -32,8 +32,9 @@ $(results_dir)/src/lilliput-i.o $(results_dir)/src/lilliput-ii.o: \ $(src_dir)/lilliput-ae.h $(src_dir)/cipher.h $(src_dir)/constants.h \ $(variant_dir)/parameters.h -$(results_dir)/src/tweakey.o: $(src_dir)/tweakey.h \ -$(src_dir)/constants.h $(src_dir)/random.h $(variant_dir)/parameters.h +$(results_dir)/src/tweakey.o: $(src_dir)/tweakey.h \ +$(src_dir)/constants.h $(src_dir)/multiplications.h \ +$(src_dir)/random.h $(variant_dir)/parameters.h $(results_dir)/test/test-tbc-encrypt.o $(results_dir)/test/test-tbc-decrypt.o $(results_dir)/test/traces-tbc.o: \ $(src_dir)/cipher.h diff --git a/src/add_threshold/multiplications.h b/src/add_threshold/multiplications.h new file mode 120000 index 0000000..df7f6a6 --- /dev/null +++ b/src/add_threshold/multiplications.h @@ -0,0 +1 @@ +../ref/multiplications.h
\ No newline at end of file diff --git a/src/add_threshold/tweakey.c b/src/add_threshold/tweakey.c index e228a69..888e893 100644 --- a/src/add_threshold/tweakey.c +++ b/src/add_threshold/tweakey.c @@ -24,12 +24,11 @@ tweakey schedule, where the tweak and the key are split into two shares. #include <string.h> #include "constants.h" +#include "multiplications.h" #include "random.h" #include "tweakey.h" -#define LANE_BITS 64 -#define LANE_BYTES (LANE_BITS/8) #define LANES_NB (TWEAKEY_BYTES/LANE_BYTES) @@ -88,91 +87,6 @@ void tweakey_state_extract( } -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]; -} - -static void _multiply_M2(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]) -{ - uint8_t x_M_5 = x[5]<<3 ^ x[4]; - uint8_t x_M_4 = x[4]>>3 ^ x[3]; - - y[7] = x[5]; - y[6] = x_M_5; - y[5] = x_M_5<<3 ^ x_M_4; - y[4] = x_M_4>>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 x_M_5 = x[5]<<3 ^ x[4]; - uint8_t x_M_4 = x[4]>>3 ^ x[3]; - uint8_t x_M2_5 = x_M_5<<3 ^ x_M_4; - uint8_t x_M2_4 = x_M_4>>3 ^ x[2]; - - y[7] = x_M_5; - y[6] = x_M2_5; - y[5] = x_M2_5<<3 ^ x_M2_4; - y[4] = x_M2_4>>3 ^ x[6]<<2 ^ x[1]; - y[3] = x[5]<<2 ^ x[0]; - y[2] = x_M_5<<2 ^ x[7]; - y[1] = x[6]; - y[0] = x[5]; -} - -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 x_MR_4 = x[5] ^ x[6]<<3; - - y[0] = x[2]; - y[1] = x[3] ^ x[4]>>3; - y[2] = x[4] ^ x_MR_4>>3; - y[3] = x_MR_4; - 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 x_MR_4 = x[5] ^ x[6]<<3; - uint8_t x_MR2_4 = x[3]<<2 ^ x[6] ^ x[7]<<3; - - y[0] = x[3] ^ x[4]>>3; - y[1] = x[4] ^ x_MR_4>>3; - y[2] = x_MR_4 ^ x_MR2_4>>3; - y[3] = x_MR2_4; - y[4] = x[0]<<3 ^ x[4]<<2 ^ x[7]; - y[5] = x_MR_4<<2 ^ x[0]; - y[6] = x[1]; - y[7] = x[2]; -} - typedef void (*matrix_multiplication)(const uint8_t x[LANE_BYTES], uint8_t y[LANE_BYTES]); static const matrix_multiplication ALPHAS[6] = { |