From a5cd17702c6a8178c228f10372637fa376d018c8 Mon Sep 17 00:00:00 2001
From: Kévin Le Gouguec <kevin.legouguec@airbus.com>
Date: Tue, 5 Feb 2019 08:00:53 +0100
Subject: Changement de l'implémentation de référence
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/add_tabulatedtweakey/tweakey.c | 220 -------------------------------------
 1 file changed, 220 deletions(-)
 delete mode 100644 src/add_tabulatedtweakey/tweakey.c

(limited to 'src/add_tabulatedtweakey/tweakey.c')

diff --git a/src/add_tabulatedtweakey/tweakey.c b/src/add_tabulatedtweakey/tweakey.c
deleted file mode 100644
index 776352f..0000000
--- a/src/add_tabulatedtweakey/tweakey.c
+++ /dev/null
@@ -1,220 +0,0 @@
-#include <stdint.h>
-#include <string.h>
-
-#include "parameters.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);
-    }
-}
-- 
cgit v1.2.3