summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
l---------src/add_tweakeyloop/cipher.c (renamed from src/add_tweakeysequences/cipher.c)0
l---------src/add_tweakeyloop/cipher.h (renamed from src/add_tweakeysequences/cipher.h)0
l---------src/add_tweakeyloop/constants.h (renamed from src/add_tweakeysequences/constants.h)0
l---------src/add_tweakeyloop/lilliput-ae-utils.h (renamed from src/add_tweakeysequences/lilliput-ae-utils.h)0
l---------src/add_tweakeyloop/lilliput-ae.h (renamed from src/add_tweakeysequences/lilliput-ae.h)0
l---------src/add_tweakeyloop/lilliput-i.c (renamed from src/add_tweakeysequences/lilliput-i.c)0
l---------src/add_tweakeyloop/lilliput-ii.c (renamed from src/add_tweakeysequences/lilliput-ii.c)0
-rw-r--r--src/add_tweakeyloop/tweakey.c (renamed from src/add_tweakeyunrolled/tweakey.c)63
l---------src/add_tweakeyloop/tweakey.h (renamed from src/add_tweakeysequences/tweakey.h)0
-rw-r--r--src/add_tweakeysequences/tweakey.c240
l---------src/add_tweakeyunrolled/cipher.c1
l---------src/add_tweakeyunrolled/cipher.h1
l---------src/add_tweakeyunrolled/constants.h1
l---------src/add_tweakeyunrolled/lilliput-ae-utils.h1
l---------src/add_tweakeyunrolled/lilliput-ae.h1
l---------src/add_tweakeyunrolled/lilliput-i.c1
l---------src/add_tweakeyunrolled/lilliput-ii.c1
l---------src/add_tweakeyunrolled/tweakey.h1
-rw-r--r--src/ref/tweakey.c63
19 files changed, 63 insertions, 311 deletions
diff --git a/src/add_tweakeysequences/cipher.c b/src/add_tweakeyloop/cipher.c
index a2ac6a3..a2ac6a3 120000
--- a/src/add_tweakeysequences/cipher.c
+++ b/src/add_tweakeyloop/cipher.c
diff --git a/src/add_tweakeysequences/cipher.h b/src/add_tweakeyloop/cipher.h
index eab258b..eab258b 120000
--- a/src/add_tweakeysequences/cipher.h
+++ b/src/add_tweakeyloop/cipher.h
diff --git a/src/add_tweakeysequences/constants.h b/src/add_tweakeyloop/constants.h
index 67df0f3..67df0f3 120000
--- a/src/add_tweakeysequences/constants.h
+++ b/src/add_tweakeyloop/constants.h
diff --git a/src/add_tweakeysequences/lilliput-ae-utils.h b/src/add_tweakeyloop/lilliput-ae-utils.h
index b46625b..b46625b 120000
--- a/src/add_tweakeysequences/lilliput-ae-utils.h
+++ b/src/add_tweakeyloop/lilliput-ae-utils.h
diff --git a/src/add_tweakeysequences/lilliput-ae.h b/src/add_tweakeyloop/lilliput-ae.h
index 66c8314..66c8314 120000
--- a/src/add_tweakeysequences/lilliput-ae.h
+++ b/src/add_tweakeyloop/lilliput-ae.h
diff --git a/src/add_tweakeysequences/lilliput-i.c b/src/add_tweakeyloop/lilliput-i.c
index 46688d4..46688d4 120000
--- a/src/add_tweakeysequences/lilliput-i.c
+++ b/src/add_tweakeyloop/lilliput-i.c
diff --git a/src/add_tweakeysequences/lilliput-ii.c b/src/add_tweakeyloop/lilliput-ii.c
index 09abf10..09abf10 120000
--- a/src/add_tweakeysequences/lilliput-ii.c
+++ b/src/add_tweakeyloop/lilliput-ii.c
diff --git a/src/add_tweakeyunrolled/tweakey.c b/src/add_tweakeyloop/tweakey.c
index b2822b0..b1f349e 100644
--- a/src/add_tweakeyunrolled/tweakey.c
+++ b/src/add_tweakeyloop/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>
@@ -76,34 +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])
{
- 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];
+ 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 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];
+ 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])
@@ -120,31 +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])
{
- 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];
+ 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 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];
+ 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/src/add_tweakeysequences/tweakey.h b/src/add_tweakeyloop/tweakey.h
index 7f2415f..7f2415f 120000
--- a/src/add_tweakeysequences/tweakey.h
+++ b/src/add_tweakeyloop/tweakey.h
diff --git a/src/add_tweakeysequences/tweakey.c b/src/add_tweakeysequences/tweakey.c
deleted file mode 100644
index fa77e36..0000000
--- a/src/add_tweakeysequences/tweakey.c
+++ /dev/null
@@ -1,240 +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 functions expressing the exponentiated matrices with shifts and XORs,
-with 8×8 matrices M_1, M_2, M_3 and M_4 pre-computed as lookup tables.
-*/
-
-#include <stdint.h>
-#include <string.h>
-
-#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<LANES_NB; j++)
- {
- const uint8_t *TKj = TK + j*LANE_BYTES;
-
- for (size_t k=0; k<LANE_BYTES; k++)
- {
- round_tweakey[k] ^= TKj[k];
- }
- }
-
- round_tweakey[0] ^= round_constant;
-}
-
-
-static const uint8_t M_1[256] = {
- 0x00, 0x08, 0x10, 0x18, 0x20, 0x28, 0x30, 0x38, 0x41, 0x49, 0x51, 0x59, 0x61, 0x69, 0x71, 0x79,
- 0x82, 0x8A, 0x92, 0x9A, 0xA2, 0xAA, 0xB2, 0xBA, 0xC3, 0xCB, 0xD3, 0xDB, 0xE3, 0xEB, 0xF3, 0xFB,
- 0x04, 0x0C, 0x14, 0x1C, 0x24, 0x2C, 0x34, 0x3C, 0x45, 0x4D, 0x55, 0x5D, 0x65, 0x6D, 0x75, 0x7D,
- 0x86, 0x8E, 0x96, 0x9E, 0xA6, 0xAE, 0xB6, 0xBE, 0xC7, 0xCF, 0xD7, 0xDF, 0xE7, 0xEF, 0xF7, 0xFF,
- 0x08, 0x00, 0x18, 0x10, 0x28, 0x20, 0x38, 0x30, 0x49, 0x41, 0x59, 0x51, 0x69, 0x61, 0x79, 0x71,
- 0x8A, 0x82, 0x9A, 0x92, 0xAA, 0xA2, 0xBA, 0xB2, 0xCB, 0xC3, 0xDB, 0xD3, 0xEB, 0xE3, 0xFB, 0xF3,
- 0x0C, 0x04, 0x1C, 0x14, 0x2C, 0x24, 0x3C, 0x34, 0x4D, 0x45, 0x5D, 0x55, 0x6D, 0x65, 0x7D, 0x75,
- 0x8E, 0x86, 0x9E, 0x96, 0xAE, 0xA6, 0xBE, 0xB6, 0xCF, 0xC7, 0xDF, 0xD7, 0xEF, 0xE7, 0xFF, 0xF7,
- 0x10, 0x18, 0x00, 0x08, 0x30, 0x38, 0x20, 0x28, 0x51, 0x59, 0x41, 0x49, 0x71, 0x79, 0x61, 0x69,
- 0x92, 0x9A, 0x82, 0x8A, 0xB2, 0xBA, 0xA2, 0xAA, 0xD3, 0xDB, 0xC3, 0xCB, 0xF3, 0xFB, 0xE3, 0xEB,
- 0x14, 0x1C, 0x04, 0x0C, 0x34, 0x3C, 0x24, 0x2C, 0x55, 0x5D, 0x45, 0x4D, 0x75, 0x7D, 0x65, 0x6D,
- 0x96, 0x9E, 0x86, 0x8E, 0xB6, 0xBE, 0xA6, 0xAE, 0xD7, 0xDF, 0xC7, 0xCF, 0xF7, 0xFF, 0xE7, 0xEF,
- 0x18, 0x10, 0x08, 0x00, 0x38, 0x30, 0x28, 0x20, 0x59, 0x51, 0x49, 0x41, 0x79, 0x71, 0x69, 0x61,
- 0x9A, 0x92, 0x8A, 0x82, 0xBA, 0xB2, 0xAA, 0xA2, 0xDB, 0xD3, 0xCB, 0xC3, 0xFB, 0xF3, 0xEB, 0xE3,
- 0x1C, 0x14, 0x0C, 0x04, 0x3C, 0x34, 0x2C, 0x24, 0x5D, 0x55, 0x4D, 0x45, 0x7D, 0x75, 0x6D, 0x65,
- 0x9E, 0x96, 0x8E, 0x86, 0xBE, 0xB6, 0xAE, 0xA6, 0xDF, 0xD7, 0xCF, 0xC7, 0xFF, 0xF7, 0xEF, 0xE7
-};
-
-static const uint8_t M_2[256] = {
- 0x00, 0x40, 0x80, 0xC0, 0x00, 0x40, 0x80, 0xC0, 0x08, 0x48, 0x88, 0xC8, 0x08, 0x48, 0x88, 0xC8,
- 0x10, 0x50, 0x90, 0xD0, 0x10, 0x50, 0x90, 0xD0, 0x18, 0x58, 0x98, 0xD8, 0x18, 0x58, 0x98, 0xD8,
- 0x20, 0x60, 0xA0, 0xE0, 0x20, 0x60, 0xA0, 0xE0, 0x28, 0x68, 0xA8, 0xE8, 0x28, 0x68, 0xA8, 0xE8,
- 0x30, 0x70, 0xB0, 0xF0, 0x30, 0x70, 0xB0, 0xF0, 0x38, 0x78, 0xB8, 0xF8, 0x38, 0x78, 0xB8, 0xF8,
- 0x41, 0x01, 0xC1, 0x81, 0x41, 0x01, 0xC1, 0x81, 0x49, 0x09, 0xC9, 0x89, 0x49, 0x09, 0xC9, 0x89,
- 0x51, 0x11, 0xD1, 0x91, 0x51, 0x11, 0xD1, 0x91, 0x59, 0x19, 0xD9, 0x99, 0x59, 0x19, 0xD9, 0x99,
- 0x61, 0x21, 0xE1, 0xA1, 0x61, 0x21, 0xE1, 0xA1, 0x69, 0x29, 0xE9, 0xA9, 0x69, 0x29, 0xE9, 0xA9,
- 0x71, 0x31, 0xF1, 0xB1, 0x71, 0x31, 0xF1, 0xB1, 0x79, 0x39, 0xF9, 0xB9, 0x79, 0x39, 0xF9, 0xB9,
- 0x82, 0xC2, 0x02, 0x42, 0x82, 0xC2, 0x02, 0x42, 0x8A, 0xCA, 0x0A, 0x4A, 0x8A, 0xCA, 0x0A, 0x4A,
- 0x92, 0xD2, 0x12, 0x52, 0x92, 0xD2, 0x12, 0x52, 0x9A, 0xDA, 0x1A, 0x5A, 0x9A, 0xDA, 0x1A, 0x5A,
- 0xA2, 0xE2, 0x22, 0x62, 0xA2, 0xE2, 0x22, 0x62, 0xAA, 0xEA, 0x2A, 0x6A, 0xAA, 0xEA, 0x2A, 0x6A,
- 0xB2, 0xF2, 0x32, 0x72, 0xB2, 0xF2, 0x32, 0x72, 0xBA, 0xFA, 0x3A, 0x7A, 0xBA, 0xFA, 0x3A, 0x7A,
- 0xC3, 0x83, 0x43, 0x03, 0xC3, 0x83, 0x43, 0x03, 0xCB, 0x8B, 0x4B, 0x0B, 0xCB, 0x8B, 0x4B, 0x0B,
- 0xD3, 0x93, 0x53, 0x13, 0xD3, 0x93, 0x53, 0x13, 0xDB, 0x9B, 0x5B, 0x1B, 0xDB, 0x9B, 0x5B, 0x1B,
- 0xE3, 0xA3, 0x63, 0x23, 0xE3, 0xA3, 0x63, 0x23, 0xEB, 0xAB, 0x6B, 0x2B, 0xEB, 0xAB, 0x6B, 0x2B,
- 0xF3, 0xB3, 0x73, 0x33, 0xF3, 0xB3, 0x73, 0x33, 0xFB, 0xBB, 0x7B, 0x3B, 0xFB, 0xBB, 0x7B, 0x3B
-};
-
-static const uint8_t M_3[256] = {
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
- 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
- 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
- 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
- 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
- 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
- 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
- 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
- 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F
-};
-
-static const uint8_t M_4[256] = {
- 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07,
- 0x08, 0x08, 0x09, 0x09, 0x0A, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0D, 0x0D, 0x0E, 0x0E, 0x0F, 0x0F,
- 0x10, 0x10, 0x11, 0x11, 0x12, 0x12, 0x13, 0x13, 0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17,
- 0x18, 0x18, 0x19, 0x19, 0x1A, 0x1A, 0x1B, 0x1B, 0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F,
- 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07,
- 0x08, 0x08, 0x09, 0x09, 0x0A, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0D, 0x0D, 0x0E, 0x0E, 0x0F, 0x0F,
- 0x10, 0x10, 0x11, 0x11, 0x12, 0x12, 0x13, 0x13, 0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17,
- 0x18, 0x18, 0x19, 0x19, 0x1A, 0x1A, 0x1B, 0x1B, 0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F,
- 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07,
- 0x08, 0x08, 0x09, 0x09, 0x0A, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0D, 0x0D, 0x0E, 0x0E, 0x0F, 0x0F,
- 0x10, 0x10, 0x11, 0x11, 0x12, 0x12, 0x13, 0x13, 0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17,
- 0x18, 0x18, 0x19, 0x19, 0x1A, 0x1A, 0x1B, 0x1B, 0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F,
- 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07,
- 0x08, 0x08, 0x09, 0x09, 0x0A, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0D, 0x0D, 0x0E, 0x0E, 0x0F, 0x0F,
- 0x10, 0x10, 0x11, 0x11, 0x12, 0x12, 0x13, 0x13, 0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17,
- 0x18, 0x18, 0x19, 0x19, 0x1A, 0x1A, 0x1B, 0x1B, 0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F
-};
-
-
-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])
-{
- 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])
-{
- 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])
-{
- 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])
-{
- 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])
-{
- 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]);
-
-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<LANES_NB; j++)
- {
- uint8_t *TKj = TK + j*LANE_BYTES;
-
- uint8_t TKj_old[LANE_BYTES];
- memcpy(TKj_old, TKj, LANE_BYTES);
-
- ALPHAS[j-1](TKj_old, TKj);
- }
-}
diff --git a/src/add_tweakeyunrolled/cipher.c b/src/add_tweakeyunrolled/cipher.c
deleted file mode 120000
index a2ac6a3..0000000
--- a/src/add_tweakeyunrolled/cipher.c
+++ /dev/null
@@ -1 +0,0 @@
-../ref/cipher.c \ No newline at end of file
diff --git a/src/add_tweakeyunrolled/cipher.h b/src/add_tweakeyunrolled/cipher.h
deleted file mode 120000
index eab258b..0000000
--- a/src/add_tweakeyunrolled/cipher.h
+++ /dev/null
@@ -1 +0,0 @@
-../ref/cipher.h \ No newline at end of file
diff --git a/src/add_tweakeyunrolled/constants.h b/src/add_tweakeyunrolled/constants.h
deleted file mode 120000
index 67df0f3..0000000
--- a/src/add_tweakeyunrolled/constants.h
+++ /dev/null
@@ -1 +0,0 @@
-../ref/constants.h \ No newline at end of file
diff --git a/src/add_tweakeyunrolled/lilliput-ae-utils.h b/src/add_tweakeyunrolled/lilliput-ae-utils.h
deleted file mode 120000
index b46625b..0000000
--- a/src/add_tweakeyunrolled/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_tweakeyunrolled/lilliput-ae.h b/src/add_tweakeyunrolled/lilliput-ae.h
deleted file mode 120000
index 66c8314..0000000
--- a/src/add_tweakeyunrolled/lilliput-ae.h
+++ /dev/null
@@ -1 +0,0 @@
-../ref/lilliput-ae.h \ No newline at end of file
diff --git a/src/add_tweakeyunrolled/lilliput-i.c b/src/add_tweakeyunrolled/lilliput-i.c
deleted file mode 120000
index 46688d4..0000000
--- a/src/add_tweakeyunrolled/lilliput-i.c
+++ /dev/null
@@ -1 +0,0 @@
-../ref/lilliput-i.c \ No newline at end of file
diff --git a/src/add_tweakeyunrolled/lilliput-ii.c b/src/add_tweakeyunrolled/lilliput-ii.c
deleted file mode 120000
index 09abf10..0000000
--- a/src/add_tweakeyunrolled/lilliput-ii.c
+++ /dev/null
@@ -1 +0,0 @@
-../ref/lilliput-ii.c \ No newline at end of file
diff --git a/src/add_tweakeyunrolled/tweakey.h b/src/add_tweakeyunrolled/tweakey.h
deleted file mode 120000
index 7f2415f..0000000
--- a/src/add_tweakeyunrolled/tweakey.h
+++ /dev/null
@@ -1 +0,0 @@
-../ref/tweakey.h \ No newline at end of file
diff --git a/src/ref/tweakey.c b/src/ref/tweakey.c
index b1f349e..b2822b0 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 applying functions for M and M_R n times.
+by functions expressing the exponentiated matrices with shifts and XORs.
*/
#include <stdint.h>
@@ -76,18 +76,34 @@ 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);
+ 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 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 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])
@@ -104,18 +120,31 @@ 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);
+ 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 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 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]);
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-06 16:04:49 +0000