From a5cd17702c6a8178c228f10372637fa376d018c8 Mon Sep 17 00:00:00 2001 From: Kévin Le Gouguec 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 --- nist/make-package.sh | 3 +- src/add_developedtweakey/ae-common.h | 127 ----------------- src/add_developedtweakey/cipher.c | 175 ------------------------ src/add_developedtweakey/cipher.h | 23 ---- src/add_developedtweakey/lilliput-ae-i.c | 195 -------------------------- src/add_developedtweakey/lilliput-ae-ii.c | 160 ---------------------- src/add_developedtweakey/lilliput-ae.h | 34 ----- src/add_developedtweakey/parameters.h | 20 --- src/add_developedtweakey/tweakey.c | 163 ---------------------- src/add_developedtweakey/tweakey.h | 23 ---- src/add_tabulatedtweakey/ae-common.h | 127 ----------------- src/add_tabulatedtweakey/cipher.c | 175 ------------------------ src/add_tabulatedtweakey/cipher.h | 23 ---- src/add_tabulatedtweakey/lilliput-ae-i.c | 195 -------------------------- src/add_tabulatedtweakey/lilliput-ae-ii.c | 160 ---------------------- src/add_tabulatedtweakey/lilliput-ae.h | 34 ----- src/add_tabulatedtweakey/parameters.h | 20 --- src/add_tabulatedtweakey/tweakey.c | 220 ------------------------------ src/add_tabulatedtweakey/tweakey.h | 23 ---- src/add_tweakeyloop/ae-common.h | 127 +++++++++++++++++ src/add_tweakeyloop/cipher.c | 175 ++++++++++++++++++++++++ src/add_tweakeyloop/cipher.h | 23 ++++ src/add_tweakeyloop/lilliput-ae-i.c | 195 ++++++++++++++++++++++++++ src/add_tweakeyloop/lilliput-ae-ii.c | 160 ++++++++++++++++++++++ src/add_tweakeyloop/lilliput-ae.h | 34 +++++ src/add_tweakeyloop/parameters.h | 20 +++ src/add_tweakeyloop/tweakey.c | 127 +++++++++++++++++ src/add_tweakeyloop/tweakey.h | 23 ++++ src/add_tweakeysequences/ae-common.h | 127 +++++++++++++++++ src/add_tweakeysequences/cipher.c | 175 ++++++++++++++++++++++++ src/add_tweakeysequences/cipher.h | 23 ++++ src/add_tweakeysequences/lilliput-ae-i.c | 195 ++++++++++++++++++++++++++ src/add_tweakeysequences/lilliput-ae-ii.c | 160 ++++++++++++++++++++++ src/add_tweakeysequences/lilliput-ae.h | 34 +++++ src/add_tweakeysequences/parameters.h | 20 +++ src/add_tweakeysequences/tweakey.c | 220 ++++++++++++++++++++++++++++++ src/add_tweakeysequences/tweakey.h | 23 ++++ src/ref/tweakey.c | 68 ++++++--- 38 files changed, 1915 insertions(+), 1914 deletions(-) delete mode 100644 src/add_developedtweakey/ae-common.h delete mode 100644 src/add_developedtweakey/cipher.c delete mode 100644 src/add_developedtweakey/cipher.h delete mode 100644 src/add_developedtweakey/lilliput-ae-i.c delete mode 100644 src/add_developedtweakey/lilliput-ae-ii.c delete mode 100644 src/add_developedtweakey/lilliput-ae.h delete mode 100644 src/add_developedtweakey/parameters.h delete mode 100644 src/add_developedtweakey/tweakey.c delete mode 100644 src/add_developedtweakey/tweakey.h delete mode 100644 src/add_tabulatedtweakey/ae-common.h delete mode 100644 src/add_tabulatedtweakey/cipher.c delete mode 100644 src/add_tabulatedtweakey/cipher.h delete mode 100644 src/add_tabulatedtweakey/lilliput-ae-i.c delete mode 100644 src/add_tabulatedtweakey/lilliput-ae-ii.c delete mode 100644 src/add_tabulatedtweakey/lilliput-ae.h delete mode 100644 src/add_tabulatedtweakey/parameters.h delete mode 100644 src/add_tabulatedtweakey/tweakey.c delete mode 100644 src/add_tabulatedtweakey/tweakey.h create mode 100644 src/add_tweakeyloop/ae-common.h create mode 100644 src/add_tweakeyloop/cipher.c create mode 100644 src/add_tweakeyloop/cipher.h create mode 100644 src/add_tweakeyloop/lilliput-ae-i.c create mode 100644 src/add_tweakeyloop/lilliput-ae-ii.c create mode 100644 src/add_tweakeyloop/lilliput-ae.h create mode 100644 src/add_tweakeyloop/parameters.h create mode 100644 src/add_tweakeyloop/tweakey.c create mode 100644 src/add_tweakeyloop/tweakey.h create mode 100644 src/add_tweakeysequences/ae-common.h create mode 100644 src/add_tweakeysequences/cipher.c create mode 100644 src/add_tweakeysequences/cipher.h create mode 100644 src/add_tweakeysequences/lilliput-ae-i.c create mode 100644 src/add_tweakeysequences/lilliput-ae-ii.c create mode 100644 src/add_tweakeysequences/lilliput-ae.h create mode 100644 src/add_tweakeysequences/parameters.h create mode 100644 src/add_tweakeysequences/tweakey.c create mode 100644 src/add_tweakeysequences/tweakey.h diff --git a/nist/make-package.sh b/nist/make-package.sh index 455dcde..6fa7e7c 100755 --- a/nist/make-package.sh +++ b/nist/make-package.sh @@ -53,7 +53,8 @@ add-variant () implementations=( ref - add_tabulatedtweakey + add_tweakeyloop + add_tweakeysequences ) for implem in ${implementations[@]} diff --git a/src/add_developedtweakey/ae-common.h b/src/add_developedtweakey/ae-common.h deleted file mode 100644 index 561854e..0000000 --- a/src/add_developedtweakey/ae-common.h +++ /dev/null @@ -1,127 +0,0 @@ -#ifndef AE_COMMON_H -#define AE_COMMON_H - -#include -#include -#include - -#include "cipher.h" -#include "parameters.h" - - -static inline uint8_t upper_nibble(uint8_t i) -{ - return i >> 4; -} - -static inline uint8_t lower_nibble(uint8_t i) -{ - return i & 0x0f; -} - -static inline void encrypt(const uint8_t K[KEY_BYTES], - const uint8_t T[TWEAK_BYTES], - const uint8_t M[BLOCK_BYTES], - uint8_t C[BLOCK_BYTES]) -{ - lilliput_tbc_encrypt(K, T, M, C); -} - -static inline void decrypt(const uint8_t K[KEY_BYTES], - const uint8_t T[TWEAK_BYTES], - const uint8_t C[BLOCK_BYTES], - uint8_t M[BLOCK_BYTES]) -{ - lilliput_tbc_decrypt(K, T, C, M); -} - -static inline void xor_into(uint8_t dest[BLOCK_BYTES], const uint8_t src[BLOCK_BYTES]) -{ - for (size_t i=0; i 1) - { - memset(padded, 0, pad_len-1); - } -} - -static inline void fill_index_tweak( - uint8_t prefix, - uint64_t block_index, - uint8_t tweak[TWEAK_BYTES] -) -{ - /* The t-bit tweak is filled as follows: - * - * - bits [ 1, t-4]: block index - * [ 1, 64]: actual 64-bit block index - * [ 65, t-4]: 0-padding - * - bits [t-3, t]: constant 4-bit prefix - */ - - for (size_t i=0; i> 8*i & 0xff; - } - - /* Assume padding bytes have already been memset to 0. */ - - tweak[TWEAK_BYTES-1] |= prefix << 4; -} - -static void process_associated_data( - const uint8_t key[KEY_BYTES], - size_t A_len, - const uint8_t A[A_len], - uint8_t Auth[BLOCK_BYTES] -) -{ - uint8_t Ek_Ai[BLOCK_BYTES]; - uint8_t tweak[TWEAK_BYTES]; - - memset(tweak, 0, TWEAK_BYTES); - memset(Auth, 0, BLOCK_BYTES); - - size_t l_a = A_len / BLOCK_BYTES; - size_t rest = A_len % BLOCK_BYTES; - - for (size_t i=0; i -#include - -#include "cipher.h" -#include "parameters.h" -#include "tweakey.h" - - -enum permutation -{ - PERMUTATION_ENCRYPTION = 0, /* PI(i) */ - PERMUTATION_DECRYPTION = 1, /* PI^-1(i) */ - PERMUTATION_NONE -}; - -typedef enum permutation permutation; - -static const uint8_t PERMUTATIONS[2][BLOCK_BYTES] = { - [PERMUTATION_ENCRYPTION] = { 13, 9, 14, 8, 10, 11, 12, 15, 4, 5, 3, 1, 2, 6, 0, 7 }, - [PERMUTATION_DECRYPTION] = { 14, 11, 12, 10, 8, 9, 13, 15, 3, 1, 4, 5, 6, 0, 2, 7 } -}; - -static const uint8_t S[256] = { - 0x20, 0x00, 0xB2, 0x85, 0x3B, 0x35, 0xA6, 0xA4, 0x30, 0xE4, 0x6A, 0x2C, 0xFF, 0x59, 0xE2, 0x0E, - 0xF8, 0x1E, 0x7A, 0x80, 0x15, 0xBD, 0x3E, 0xB1, 0xE8, 0xF3, 0xA2, 0xC2, 0xDA, 0x51, 0x2A, 0x10, - 0x21, 0x01, 0x23, 0x78, 0x5C, 0x24, 0x27, 0xB5, 0x37, 0xC7, 0x2B, 0x1F, 0xAE, 0x0A, 0x77, 0x5F, - 0x6F, 0x09, 0x9D, 0x81, 0x04, 0x5A, 0x29, 0xDC, 0x39, 0x9C, 0x05, 0x57, 0x97, 0x74, 0x79, 0x17, - 0x44, 0xC6, 0xE6, 0xE9, 0xDD, 0x41, 0xF2, 0x8A, 0x54, 0xCA, 0x6E, 0x4A, 0xE1, 0xAD, 0xB6, 0x88, - 0x1C, 0x98, 0x7E, 0xCE, 0x63, 0x49, 0x3A, 0x5D, 0x0C, 0xEF, 0xF6, 0x34, 0x56, 0x25, 0x2E, 0xD6, - 0x67, 0x75, 0x55, 0x76, 0xB8, 0xD2, 0x61, 0xD9, 0x71, 0x8B, 0xCD, 0x0B, 0x72, 0x6C, 0x31, 0x4B, - 0x69, 0xFD, 0x7B, 0x6D, 0x60, 0x3C, 0x2F, 0x62, 0x3F, 0x22, 0x73, 0x13, 0xC9, 0x82, 0x7F, 0x53, - 0x32, 0x12, 0xA0, 0x7C, 0x02, 0x87, 0x84, 0x86, 0x93, 0x4E, 0x68, 0x46, 0x8D, 0xC3, 0xDB, 0xEC, - 0x9B, 0xB7, 0x89, 0x92, 0xA7, 0xBE, 0x3D, 0xD8, 0xEA, 0x50, 0x91, 0xF1, 0x33, 0x38, 0xE0, 0xA9, - 0xA3, 0x83, 0xA1, 0x1B, 0xCF, 0x06, 0x95, 0x07, 0x9E, 0xED, 0xB9, 0xF5, 0x4C, 0xC0, 0xF4, 0x2D, - 0x16, 0xFA, 0xB4, 0x03, 0x26, 0xB3, 0x90, 0x4F, 0xAB, 0x65, 0xFC, 0xFE, 0x14, 0xF7, 0xE3, 0x94, - 0xEE, 0xAC, 0x8C, 0x1A, 0xDE, 0xCB, 0x28, 0x40, 0x7D, 0xC8, 0xC4, 0x48, 0x6B, 0xDF, 0xA5, 0x52, - 0xE5, 0xFB, 0xD7, 0x64, 0xF9, 0xF0, 0xD3, 0x5E, 0x66, 0x96, 0x8F, 0x1D, 0x45, 0x36, 0xCC, 0xC5, - 0x4D, 0x9F, 0xBF, 0x0F, 0xD1, 0x08, 0xEB, 0x43, 0x42, 0x19, 0xE7, 0x99, 0xA8, 0x8E, 0x58, 0xC1, - 0x9A, 0xD4, 0x18, 0x47, 0xAA, 0xAF, 0xBC, 0x5B, 0xD5, 0x11, 0xD0, 0xB0, 0x70, 0xBB, 0x0D, 0xBA -}; - - -static void _state_init(uint8_t X[BLOCK_BYTES], const uint8_t message[BLOCK_BYTES]) -{ - memcpy(X, message, BLOCK_BYTES); -} - - -static void _compute_round_tweakeys( - const uint8_t key[KEY_BYTES], - const uint8_t tweak[TWEAK_BYTES], - uint8_t RTK[ROUNDS][ROUND_TWEAKEY_BYTES] -) -{ - uint8_t TK[TWEAKEY_BYTES]; - tweakey_state_init(TK, key, tweak); - tweakey_state_extract(TK, 0, RTK[0]); - - for (uint8_t i=1; i - -#include "parameters.h" - - -void lilliput_tbc_encrypt( - const uint8_t key[KEY_BYTES], - const uint8_t tweak[TWEAK_BYTES], - const uint8_t message[BLOCK_BYTES], - uint8_t ciphertext[BLOCK_BYTES] -); - -void lilliput_tbc_decrypt( - const uint8_t key[KEY_BYTES], - const uint8_t tweak[TWEAK_BYTES], - const uint8_t ciphertext[BLOCK_BYTES], - uint8_t message[BLOCK_BYTES] -); - -#endif /* CIPHER_H */ diff --git a/src/add_developedtweakey/lilliput-ae-i.c b/src/add_developedtweakey/lilliput-ae-i.c deleted file mode 100644 index b1758c9..0000000 --- a/src/add_developedtweakey/lilliput-ae-i.c +++ /dev/null @@ -1,195 +0,0 @@ -#include -#include -#include - -#include "ae-common.h" -#include "cipher.h" -#include "lilliput-ae.h" - - -static const uint8_t _0n[BLOCK_BYTES] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -}; - - -static void _fill_msg_tweak( - uint8_t prefix, - const uint8_t N[NONCE_BYTES], - uint64_t block_nb, - uint8_t tweak[TWEAK_BYTES] -) -{ - /* The 192-bit tweak is filled as follows: - * - * - bits 1- 68: block number - * 1- 64: actual 64-bit block number - * 64- 68: 0-padding - * - bits 67-188: nonce - * - bits 189-192: constant 4-bit prefix - */ - - for (size_t i=0; i> 8*i; - - tweak[i] = b; - } - - tweak[sizeof(block_nb)] = lower_nibble(N[0]) << 4; - - for (size_t i=1; i -#include -#include - -#include "ae-common.h" -#include "cipher.h" -#include "lilliput-ae.h" - - -static void _init_msg_tweak(const uint8_t tag[TAG_BYTES], uint8_t tweak[TWEAK_BYTES]) -{ - /* The t-bit tweak is filled as follows: - * - * - bits [ 1, t-1]: tag + block index - * [ 1, 64]: tag[ 1.. 64] XOR block index - * [ 65, t-1]: tag[65..t-1] - * - bit t: 1 - */ - - memcpy(tweak+sizeof(uint64_t), tag+sizeof(uint64_t), TAG_BYTES-sizeof(uint64_t)); - tweak[TWEAK_BYTES-1] |= 0x80; -} - -static void _fill_msg_tweak(const uint8_t tag[TAG_BYTES], uint64_t block_index, uint8_t tweak[TWEAK_BYTES]) -{ - /* Assume bits 65 to t-1 are set. */ - for (size_t i=0; i> i*8 & 0xff; - tweak[i] = tag[i] ^ index_i; - } -} - -static void _fill_tag_tweak(const uint8_t N[NONCE_BYTES], uint8_t tweak[TWEAK_BYTES]) -{ - /* The t-bit tweak is filled as follows: - * - * - bits [ 1, t-7]: N - * - bits [t-7, t]: 0001||0^4 - */ - - memcpy(tweak, N, TWEAK_BYTES-1); - tweak[TWEAK_BYTES-1] = 0x10; -} - -static void _generate_tag( - const uint8_t key[KEY_BYTES], - size_t M_len, - const uint8_t M[M_len], - const uint8_t N[NONCE_BYTES], - const uint8_t Auth[BLOCK_BYTES], - uint8_t tag[TAG_BYTES] -) -{ - uint8_t Ek_Mj[BLOCK_BYTES]; - uint8_t tag_tmp[TAG_BYTES]; - uint8_t tweak[TWEAK_BYTES]; - - memset(tweak, 0, TWEAK_BYTES); - memcpy(tag_tmp, Auth, TAG_BYTES); - - size_t l = M_len / BLOCK_BYTES; - size_t rest = M_len % BLOCK_BYTES; - - for (size_t j=0; j -#include -#include - -#include "parameters.h" - - -void lilliput_ae_encrypt( - size_t message_len, - const uint8_t message[message_len], - size_t auth_data_len, - const uint8_t auth_data[auth_data_len], - const uint8_t key[KEY_BYTES], - const uint8_t nonce[NONCE_BYTES], - uint8_t ciphertext[message_len], - uint8_t tag[TAG_BYTES] -); - -bool lilliput_ae_decrypt( - size_t ciphertext_len, - const uint8_t ciphertext[ciphertext_len], - size_t auth_data_len, - const uint8_t auth_data[auth_data_len], - const uint8_t key[KEY_BYTES], - const uint8_t nonce[NONCE_BYTES], - const uint8_t tag[TAG_BYTES], - uint8_t message[ciphertext_len] -); - - -#endif /* LILLIPUT_AE_H */ diff --git a/src/add_developedtweakey/parameters.h b/src/add_developedtweakey/parameters.h deleted file mode 100644 index 681a152..0000000 --- a/src/add_developedtweakey/parameters.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef PARAMETERS_H -#define PARAMETERS_H - -#include "_parameters.h" - -#define TWEAKEY_LENGTH_BITS (TWEAK_LENGTH_BITS+KEY_LENGTH_BITS) -#define ROUND_TWEAKEY_LENGTH_BITS 64 -#define BLOCK_LENGTH_BITS 128 -#define NONCE_LENGTH_BITS 120 -#define TAG_LENGTH_BITS 128 - -#define TWEAK_BYTES (TWEAK_LENGTH_BITS/8) -#define KEY_BYTES (KEY_LENGTH_BITS/8) -#define TWEAKEY_BYTES (TWEAKEY_LENGTH_BITS/8) -#define ROUND_TWEAKEY_BYTES (ROUND_TWEAKEY_LENGTH_BITS/8) -#define BLOCK_BYTES (BLOCK_LENGTH_BITS/8) -#define NONCE_BYTES (NONCE_LENGTH_BITS/8) -#define TAG_BYTES (TAG_LENGTH_BITS/8) - -#endif /* PARAMETERS_H */ diff --git a/src/add_developedtweakey/tweakey.c b/src/add_developedtweakey/tweakey.c deleted file mode 100644 index 0588c1b..0000000 --- a/src/add_developedtweakey/tweakey.c +++ /dev/null @@ -1,163 +0,0 @@ -#include -#include - -#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>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]; - 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 ^ _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]) -{ - 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]) -{ - 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 ^ _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]) -{ - 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]); - -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 - -#include "parameters.h" - - -void tweakey_state_init( - uint8_t TK[TWEAKEY_BYTES], - const uint8_t key[KEY_BYTES], - const uint8_t tweak[TWEAK_BYTES] -); - -void tweakey_state_extract( - const uint8_t TK[TWEAKEY_BYTES], - uint8_t round_constant, - uint8_t round_tweakey[ROUND_TWEAKEY_BYTES] /* output */ -); - -void tweakey_state_update(uint8_t TK[TWEAKEY_BYTES]); - -#endif /* TWEAKEY_H */ diff --git a/src/add_tabulatedtweakey/ae-common.h b/src/add_tabulatedtweakey/ae-common.h deleted file mode 100644 index 561854e..0000000 --- a/src/add_tabulatedtweakey/ae-common.h +++ /dev/null @@ -1,127 +0,0 @@ -#ifndef AE_COMMON_H -#define AE_COMMON_H - -#include -#include -#include - -#include "cipher.h" -#include "parameters.h" - - -static inline uint8_t upper_nibble(uint8_t i) -{ - return i >> 4; -} - -static inline uint8_t lower_nibble(uint8_t i) -{ - return i & 0x0f; -} - -static inline void encrypt(const uint8_t K[KEY_BYTES], - const uint8_t T[TWEAK_BYTES], - const uint8_t M[BLOCK_BYTES], - uint8_t C[BLOCK_BYTES]) -{ - lilliput_tbc_encrypt(K, T, M, C); -} - -static inline void decrypt(const uint8_t K[KEY_BYTES], - const uint8_t T[TWEAK_BYTES], - const uint8_t C[BLOCK_BYTES], - uint8_t M[BLOCK_BYTES]) -{ - lilliput_tbc_decrypt(K, T, C, M); -} - -static inline void xor_into(uint8_t dest[BLOCK_BYTES], const uint8_t src[BLOCK_BYTES]) -{ - for (size_t i=0; i 1) - { - memset(padded, 0, pad_len-1); - } -} - -static inline void fill_index_tweak( - uint8_t prefix, - uint64_t block_index, - uint8_t tweak[TWEAK_BYTES] -) -{ - /* The t-bit tweak is filled as follows: - * - * - bits [ 1, t-4]: block index - * [ 1, 64]: actual 64-bit block index - * [ 65, t-4]: 0-padding - * - bits [t-3, t]: constant 4-bit prefix - */ - - for (size_t i=0; i> 8*i & 0xff; - } - - /* Assume padding bytes have already been memset to 0. */ - - tweak[TWEAK_BYTES-1] |= prefix << 4; -} - -static void process_associated_data( - const uint8_t key[KEY_BYTES], - size_t A_len, - const uint8_t A[A_len], - uint8_t Auth[BLOCK_BYTES] -) -{ - uint8_t Ek_Ai[BLOCK_BYTES]; - uint8_t tweak[TWEAK_BYTES]; - - memset(tweak, 0, TWEAK_BYTES); - memset(Auth, 0, BLOCK_BYTES); - - size_t l_a = A_len / BLOCK_BYTES; - size_t rest = A_len % BLOCK_BYTES; - - for (size_t i=0; i -#include - -#include "cipher.h" -#include "parameters.h" -#include "tweakey.h" - - -enum permutation -{ - PERMUTATION_ENCRYPTION = 0, /* PI(i) */ - PERMUTATION_DECRYPTION = 1, /* PI^-1(i) */ - PERMUTATION_NONE -}; - -typedef enum permutation permutation; - -static const uint8_t PERMUTATIONS[2][BLOCK_BYTES] = { - [PERMUTATION_ENCRYPTION] = { 13, 9, 14, 8, 10, 11, 12, 15, 4, 5, 3, 1, 2, 6, 0, 7 }, - [PERMUTATION_DECRYPTION] = { 14, 11, 12, 10, 8, 9, 13, 15, 3, 1, 4, 5, 6, 0, 2, 7 } -}; - -static const uint8_t S[256] = { - 0x20, 0x00, 0xB2, 0x85, 0x3B, 0x35, 0xA6, 0xA4, 0x30, 0xE4, 0x6A, 0x2C, 0xFF, 0x59, 0xE2, 0x0E, - 0xF8, 0x1E, 0x7A, 0x80, 0x15, 0xBD, 0x3E, 0xB1, 0xE8, 0xF3, 0xA2, 0xC2, 0xDA, 0x51, 0x2A, 0x10, - 0x21, 0x01, 0x23, 0x78, 0x5C, 0x24, 0x27, 0xB5, 0x37, 0xC7, 0x2B, 0x1F, 0xAE, 0x0A, 0x77, 0x5F, - 0x6F, 0x09, 0x9D, 0x81, 0x04, 0x5A, 0x29, 0xDC, 0x39, 0x9C, 0x05, 0x57, 0x97, 0x74, 0x79, 0x17, - 0x44, 0xC6, 0xE6, 0xE9, 0xDD, 0x41, 0xF2, 0x8A, 0x54, 0xCA, 0x6E, 0x4A, 0xE1, 0xAD, 0xB6, 0x88, - 0x1C, 0x98, 0x7E, 0xCE, 0x63, 0x49, 0x3A, 0x5D, 0x0C, 0xEF, 0xF6, 0x34, 0x56, 0x25, 0x2E, 0xD6, - 0x67, 0x75, 0x55, 0x76, 0xB8, 0xD2, 0x61, 0xD9, 0x71, 0x8B, 0xCD, 0x0B, 0x72, 0x6C, 0x31, 0x4B, - 0x69, 0xFD, 0x7B, 0x6D, 0x60, 0x3C, 0x2F, 0x62, 0x3F, 0x22, 0x73, 0x13, 0xC9, 0x82, 0x7F, 0x53, - 0x32, 0x12, 0xA0, 0x7C, 0x02, 0x87, 0x84, 0x86, 0x93, 0x4E, 0x68, 0x46, 0x8D, 0xC3, 0xDB, 0xEC, - 0x9B, 0xB7, 0x89, 0x92, 0xA7, 0xBE, 0x3D, 0xD8, 0xEA, 0x50, 0x91, 0xF1, 0x33, 0x38, 0xE0, 0xA9, - 0xA3, 0x83, 0xA1, 0x1B, 0xCF, 0x06, 0x95, 0x07, 0x9E, 0xED, 0xB9, 0xF5, 0x4C, 0xC0, 0xF4, 0x2D, - 0x16, 0xFA, 0xB4, 0x03, 0x26, 0xB3, 0x90, 0x4F, 0xAB, 0x65, 0xFC, 0xFE, 0x14, 0xF7, 0xE3, 0x94, - 0xEE, 0xAC, 0x8C, 0x1A, 0xDE, 0xCB, 0x28, 0x40, 0x7D, 0xC8, 0xC4, 0x48, 0x6B, 0xDF, 0xA5, 0x52, - 0xE5, 0xFB, 0xD7, 0x64, 0xF9, 0xF0, 0xD3, 0x5E, 0x66, 0x96, 0x8F, 0x1D, 0x45, 0x36, 0xCC, 0xC5, - 0x4D, 0x9F, 0xBF, 0x0F, 0xD1, 0x08, 0xEB, 0x43, 0x42, 0x19, 0xE7, 0x99, 0xA8, 0x8E, 0x58, 0xC1, - 0x9A, 0xD4, 0x18, 0x47, 0xAA, 0xAF, 0xBC, 0x5B, 0xD5, 0x11, 0xD0, 0xB0, 0x70, 0xBB, 0x0D, 0xBA -}; - - -static void _state_init(uint8_t X[BLOCK_BYTES], const uint8_t message[BLOCK_BYTES]) -{ - memcpy(X, message, BLOCK_BYTES); -} - - -static void _compute_round_tweakeys( - const uint8_t key[KEY_BYTES], - const uint8_t tweak[TWEAK_BYTES], - uint8_t RTK[ROUNDS][ROUND_TWEAKEY_BYTES] -) -{ - uint8_t TK[TWEAKEY_BYTES]; - tweakey_state_init(TK, key, tweak); - tweakey_state_extract(TK, 0, RTK[0]); - - for (uint8_t i=1; i - -#include "parameters.h" - - -void lilliput_tbc_encrypt( - const uint8_t key[KEY_BYTES], - const uint8_t tweak[TWEAK_BYTES], - const uint8_t message[BLOCK_BYTES], - uint8_t ciphertext[BLOCK_BYTES] -); - -void lilliput_tbc_decrypt( - const uint8_t key[KEY_BYTES], - const uint8_t tweak[TWEAK_BYTES], - const uint8_t ciphertext[BLOCK_BYTES], - uint8_t message[BLOCK_BYTES] -); - -#endif /* CIPHER_H */ diff --git a/src/add_tabulatedtweakey/lilliput-ae-i.c b/src/add_tabulatedtweakey/lilliput-ae-i.c deleted file mode 100644 index b1758c9..0000000 --- a/src/add_tabulatedtweakey/lilliput-ae-i.c +++ /dev/null @@ -1,195 +0,0 @@ -#include -#include -#include - -#include "ae-common.h" -#include "cipher.h" -#include "lilliput-ae.h" - - -static const uint8_t _0n[BLOCK_BYTES] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -}; - - -static void _fill_msg_tweak( - uint8_t prefix, - const uint8_t N[NONCE_BYTES], - uint64_t block_nb, - uint8_t tweak[TWEAK_BYTES] -) -{ - /* The 192-bit tweak is filled as follows: - * - * - bits 1- 68: block number - * 1- 64: actual 64-bit block number - * 64- 68: 0-padding - * - bits 67-188: nonce - * - bits 189-192: constant 4-bit prefix - */ - - for (size_t i=0; i> 8*i; - - tweak[i] = b; - } - - tweak[sizeof(block_nb)] = lower_nibble(N[0]) << 4; - - for (size_t i=1; i -#include -#include - -#include "ae-common.h" -#include "cipher.h" -#include "lilliput-ae.h" - - -static void _init_msg_tweak(const uint8_t tag[TAG_BYTES], uint8_t tweak[TWEAK_BYTES]) -{ - /* The t-bit tweak is filled as follows: - * - * - bits [ 1, t-1]: tag + block index - * [ 1, 64]: tag[ 1.. 64] XOR block index - * [ 65, t-1]: tag[65..t-1] - * - bit t: 1 - */ - - memcpy(tweak+sizeof(uint64_t), tag+sizeof(uint64_t), TAG_BYTES-sizeof(uint64_t)); - tweak[TWEAK_BYTES-1] |= 0x80; -} - -static void _fill_msg_tweak(const uint8_t tag[TAG_BYTES], uint64_t block_index, uint8_t tweak[TWEAK_BYTES]) -{ - /* Assume bits 65 to t-1 are set. */ - for (size_t i=0; i> i*8 & 0xff; - tweak[i] = tag[i] ^ index_i; - } -} - -static void _fill_tag_tweak(const uint8_t N[NONCE_BYTES], uint8_t tweak[TWEAK_BYTES]) -{ - /* The t-bit tweak is filled as follows: - * - * - bits [ 1, t-7]: N - * - bits [t-7, t]: 0001||0^4 - */ - - memcpy(tweak, N, TWEAK_BYTES-1); - tweak[TWEAK_BYTES-1] = 0x10; -} - -static void _generate_tag( - const uint8_t key[KEY_BYTES], - size_t M_len, - const uint8_t M[M_len], - const uint8_t N[NONCE_BYTES], - const uint8_t Auth[BLOCK_BYTES], - uint8_t tag[TAG_BYTES] -) -{ - uint8_t Ek_Mj[BLOCK_BYTES]; - uint8_t tag_tmp[TAG_BYTES]; - uint8_t tweak[TWEAK_BYTES]; - - memset(tweak, 0, TWEAK_BYTES); - memcpy(tag_tmp, Auth, TAG_BYTES); - - size_t l = M_len / BLOCK_BYTES; - size_t rest = M_len % BLOCK_BYTES; - - for (size_t j=0; j -#include -#include - -#include "parameters.h" - - -void lilliput_ae_encrypt( - size_t message_len, - const uint8_t message[message_len], - size_t auth_data_len, - const uint8_t auth_data[auth_data_len], - const uint8_t key[KEY_BYTES], - const uint8_t nonce[NONCE_BYTES], - uint8_t ciphertext[message_len], - uint8_t tag[TAG_BYTES] -); - -bool lilliput_ae_decrypt( - size_t ciphertext_len, - const uint8_t ciphertext[ciphertext_len], - size_t auth_data_len, - const uint8_t auth_data[auth_data_len], - const uint8_t key[KEY_BYTES], - const uint8_t nonce[NONCE_BYTES], - const uint8_t tag[TAG_BYTES], - uint8_t message[ciphertext_len] -); - - -#endif /* LILLIPUT_AE_H */ diff --git a/src/add_tabulatedtweakey/parameters.h b/src/add_tabulatedtweakey/parameters.h deleted file mode 100644 index 681a152..0000000 --- a/src/add_tabulatedtweakey/parameters.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef PARAMETERS_H -#define PARAMETERS_H - -#include "_parameters.h" - -#define TWEAKEY_LENGTH_BITS (TWEAK_LENGTH_BITS+KEY_LENGTH_BITS) -#define ROUND_TWEAKEY_LENGTH_BITS 64 -#define BLOCK_LENGTH_BITS 128 -#define NONCE_LENGTH_BITS 120 -#define TAG_LENGTH_BITS 128 - -#define TWEAK_BYTES (TWEAK_LENGTH_BITS/8) -#define KEY_BYTES (KEY_LENGTH_BITS/8) -#define TWEAKEY_BYTES (TWEAKEY_LENGTH_BITS/8) -#define ROUND_TWEAKEY_BYTES (ROUND_TWEAKEY_LENGTH_BITS/8) -#define BLOCK_BYTES (BLOCK_LENGTH_BITS/8) -#define NONCE_BYTES (NONCE_LENGTH_BITS/8) -#define TAG_BYTES (TAG_LENGTH_BITS/8) - -#endif /* PARAMETERS_H */ 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 -#include - -#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>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 - -#include "parameters.h" - - -void tweakey_state_init( - uint8_t TK[TWEAKEY_BYTES], - const uint8_t key[KEY_BYTES], - const uint8_t tweak[TWEAK_BYTES] -); - -void tweakey_state_extract( - const uint8_t TK[TWEAKEY_BYTES], - uint8_t round_constant, - uint8_t round_tweakey[ROUND_TWEAKEY_BYTES] /* output */ -); - -void tweakey_state_update(uint8_t TK[TWEAKEY_BYTES]); - -#endif /* TWEAKEY_H */ diff --git a/src/add_tweakeyloop/ae-common.h b/src/add_tweakeyloop/ae-common.h new file mode 100644 index 0000000..561854e --- /dev/null +++ b/src/add_tweakeyloop/ae-common.h @@ -0,0 +1,127 @@ +#ifndef AE_COMMON_H +#define AE_COMMON_H + +#include +#include +#include + +#include "cipher.h" +#include "parameters.h" + + +static inline uint8_t upper_nibble(uint8_t i) +{ + return i >> 4; +} + +static inline uint8_t lower_nibble(uint8_t i) +{ + return i & 0x0f; +} + +static inline void encrypt(const uint8_t K[KEY_BYTES], + const uint8_t T[TWEAK_BYTES], + const uint8_t M[BLOCK_BYTES], + uint8_t C[BLOCK_BYTES]) +{ + lilliput_tbc_encrypt(K, T, M, C); +} + +static inline void decrypt(const uint8_t K[KEY_BYTES], + const uint8_t T[TWEAK_BYTES], + const uint8_t C[BLOCK_BYTES], + uint8_t M[BLOCK_BYTES]) +{ + lilliput_tbc_decrypt(K, T, C, M); +} + +static inline void xor_into(uint8_t dest[BLOCK_BYTES], const uint8_t src[BLOCK_BYTES]) +{ + for (size_t i=0; i 1) + { + memset(padded, 0, pad_len-1); + } +} + +static inline void fill_index_tweak( + uint8_t prefix, + uint64_t block_index, + uint8_t tweak[TWEAK_BYTES] +) +{ + /* The t-bit tweak is filled as follows: + * + * - bits [ 1, t-4]: block index + * [ 1, 64]: actual 64-bit block index + * [ 65, t-4]: 0-padding + * - bits [t-3, t]: constant 4-bit prefix + */ + + for (size_t i=0; i> 8*i & 0xff; + } + + /* Assume padding bytes have already been memset to 0. */ + + tweak[TWEAK_BYTES-1] |= prefix << 4; +} + +static void process_associated_data( + const uint8_t key[KEY_BYTES], + size_t A_len, + const uint8_t A[A_len], + uint8_t Auth[BLOCK_BYTES] +) +{ + uint8_t Ek_Ai[BLOCK_BYTES]; + uint8_t tweak[TWEAK_BYTES]; + + memset(tweak, 0, TWEAK_BYTES); + memset(Auth, 0, BLOCK_BYTES); + + size_t l_a = A_len / BLOCK_BYTES; + size_t rest = A_len % BLOCK_BYTES; + + for (size_t i=0; i +#include + +#include "cipher.h" +#include "parameters.h" +#include "tweakey.h" + + +enum permutation +{ + PERMUTATION_ENCRYPTION = 0, /* PI(i) */ + PERMUTATION_DECRYPTION = 1, /* PI^-1(i) */ + PERMUTATION_NONE +}; + +typedef enum permutation permutation; + +static const uint8_t PERMUTATIONS[2][BLOCK_BYTES] = { + [PERMUTATION_ENCRYPTION] = { 13, 9, 14, 8, 10, 11, 12, 15, 4, 5, 3, 1, 2, 6, 0, 7 }, + [PERMUTATION_DECRYPTION] = { 14, 11, 12, 10, 8, 9, 13, 15, 3, 1, 4, 5, 6, 0, 2, 7 } +}; + +static const uint8_t S[256] = { + 0x20, 0x00, 0xB2, 0x85, 0x3B, 0x35, 0xA6, 0xA4, 0x30, 0xE4, 0x6A, 0x2C, 0xFF, 0x59, 0xE2, 0x0E, + 0xF8, 0x1E, 0x7A, 0x80, 0x15, 0xBD, 0x3E, 0xB1, 0xE8, 0xF3, 0xA2, 0xC2, 0xDA, 0x51, 0x2A, 0x10, + 0x21, 0x01, 0x23, 0x78, 0x5C, 0x24, 0x27, 0xB5, 0x37, 0xC7, 0x2B, 0x1F, 0xAE, 0x0A, 0x77, 0x5F, + 0x6F, 0x09, 0x9D, 0x81, 0x04, 0x5A, 0x29, 0xDC, 0x39, 0x9C, 0x05, 0x57, 0x97, 0x74, 0x79, 0x17, + 0x44, 0xC6, 0xE6, 0xE9, 0xDD, 0x41, 0xF2, 0x8A, 0x54, 0xCA, 0x6E, 0x4A, 0xE1, 0xAD, 0xB6, 0x88, + 0x1C, 0x98, 0x7E, 0xCE, 0x63, 0x49, 0x3A, 0x5D, 0x0C, 0xEF, 0xF6, 0x34, 0x56, 0x25, 0x2E, 0xD6, + 0x67, 0x75, 0x55, 0x76, 0xB8, 0xD2, 0x61, 0xD9, 0x71, 0x8B, 0xCD, 0x0B, 0x72, 0x6C, 0x31, 0x4B, + 0x69, 0xFD, 0x7B, 0x6D, 0x60, 0x3C, 0x2F, 0x62, 0x3F, 0x22, 0x73, 0x13, 0xC9, 0x82, 0x7F, 0x53, + 0x32, 0x12, 0xA0, 0x7C, 0x02, 0x87, 0x84, 0x86, 0x93, 0x4E, 0x68, 0x46, 0x8D, 0xC3, 0xDB, 0xEC, + 0x9B, 0xB7, 0x89, 0x92, 0xA7, 0xBE, 0x3D, 0xD8, 0xEA, 0x50, 0x91, 0xF1, 0x33, 0x38, 0xE0, 0xA9, + 0xA3, 0x83, 0xA1, 0x1B, 0xCF, 0x06, 0x95, 0x07, 0x9E, 0xED, 0xB9, 0xF5, 0x4C, 0xC0, 0xF4, 0x2D, + 0x16, 0xFA, 0xB4, 0x03, 0x26, 0xB3, 0x90, 0x4F, 0xAB, 0x65, 0xFC, 0xFE, 0x14, 0xF7, 0xE3, 0x94, + 0xEE, 0xAC, 0x8C, 0x1A, 0xDE, 0xCB, 0x28, 0x40, 0x7D, 0xC8, 0xC4, 0x48, 0x6B, 0xDF, 0xA5, 0x52, + 0xE5, 0xFB, 0xD7, 0x64, 0xF9, 0xF0, 0xD3, 0x5E, 0x66, 0x96, 0x8F, 0x1D, 0x45, 0x36, 0xCC, 0xC5, + 0x4D, 0x9F, 0xBF, 0x0F, 0xD1, 0x08, 0xEB, 0x43, 0x42, 0x19, 0xE7, 0x99, 0xA8, 0x8E, 0x58, 0xC1, + 0x9A, 0xD4, 0x18, 0x47, 0xAA, 0xAF, 0xBC, 0x5B, 0xD5, 0x11, 0xD0, 0xB0, 0x70, 0xBB, 0x0D, 0xBA +}; + + +static void _state_init(uint8_t X[BLOCK_BYTES], const uint8_t message[BLOCK_BYTES]) +{ + memcpy(X, message, BLOCK_BYTES); +} + + +static void _compute_round_tweakeys( + const uint8_t key[KEY_BYTES], + const uint8_t tweak[TWEAK_BYTES], + uint8_t RTK[ROUNDS][ROUND_TWEAKEY_BYTES] +) +{ + uint8_t TK[TWEAKEY_BYTES]; + tweakey_state_init(TK, key, tweak); + tweakey_state_extract(TK, 0, RTK[0]); + + for (uint8_t i=1; i + +#include "parameters.h" + + +void lilliput_tbc_encrypt( + const uint8_t key[KEY_BYTES], + const uint8_t tweak[TWEAK_BYTES], + const uint8_t message[BLOCK_BYTES], + uint8_t ciphertext[BLOCK_BYTES] +); + +void lilliput_tbc_decrypt( + const uint8_t key[KEY_BYTES], + const uint8_t tweak[TWEAK_BYTES], + const uint8_t ciphertext[BLOCK_BYTES], + uint8_t message[BLOCK_BYTES] +); + +#endif /* CIPHER_H */ diff --git a/src/add_tweakeyloop/lilliput-ae-i.c b/src/add_tweakeyloop/lilliput-ae-i.c new file mode 100644 index 0000000..b1758c9 --- /dev/null +++ b/src/add_tweakeyloop/lilliput-ae-i.c @@ -0,0 +1,195 @@ +#include +#include +#include + +#include "ae-common.h" +#include "cipher.h" +#include "lilliput-ae.h" + + +static const uint8_t _0n[BLOCK_BYTES] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + + +static void _fill_msg_tweak( + uint8_t prefix, + const uint8_t N[NONCE_BYTES], + uint64_t block_nb, + uint8_t tweak[TWEAK_BYTES] +) +{ + /* The 192-bit tweak is filled as follows: + * + * - bits 1- 68: block number + * 1- 64: actual 64-bit block number + * 64- 68: 0-padding + * - bits 67-188: nonce + * - bits 189-192: constant 4-bit prefix + */ + + for (size_t i=0; i> 8*i; + + tweak[i] = b; + } + + tweak[sizeof(block_nb)] = lower_nibble(N[0]) << 4; + + for (size_t i=1; i +#include +#include + +#include "ae-common.h" +#include "cipher.h" +#include "lilliput-ae.h" + + +static void _init_msg_tweak(const uint8_t tag[TAG_BYTES], uint8_t tweak[TWEAK_BYTES]) +{ + /* The t-bit tweak is filled as follows: + * + * - bits [ 1, t-1]: tag + block index + * [ 1, 64]: tag[ 1.. 64] XOR block index + * [ 65, t-1]: tag[65..t-1] + * - bit t: 1 + */ + + memcpy(tweak+sizeof(uint64_t), tag+sizeof(uint64_t), TAG_BYTES-sizeof(uint64_t)); + tweak[TWEAK_BYTES-1] |= 0x80; +} + +static void _fill_msg_tweak(const uint8_t tag[TAG_BYTES], uint64_t block_index, uint8_t tweak[TWEAK_BYTES]) +{ + /* Assume bits 65 to t-1 are set. */ + for (size_t i=0; i> i*8 & 0xff; + tweak[i] = tag[i] ^ index_i; + } +} + +static void _fill_tag_tweak(const uint8_t N[NONCE_BYTES], uint8_t tweak[TWEAK_BYTES]) +{ + /* The t-bit tweak is filled as follows: + * + * - bits [ 1, t-7]: N + * - bits [t-7, t]: 0001||0^4 + */ + + memcpy(tweak, N, TWEAK_BYTES-1); + tweak[TWEAK_BYTES-1] = 0x10; +} + +static void _generate_tag( + const uint8_t key[KEY_BYTES], + size_t M_len, + const uint8_t M[M_len], + const uint8_t N[NONCE_BYTES], + const uint8_t Auth[BLOCK_BYTES], + uint8_t tag[TAG_BYTES] +) +{ + uint8_t Ek_Mj[BLOCK_BYTES]; + uint8_t tag_tmp[TAG_BYTES]; + uint8_t tweak[TWEAK_BYTES]; + + memset(tweak, 0, TWEAK_BYTES); + memcpy(tag_tmp, Auth, TAG_BYTES); + + size_t l = M_len / BLOCK_BYTES; + size_t rest = M_len % BLOCK_BYTES; + + for (size_t j=0; j +#include +#include + +#include "parameters.h" + + +void lilliput_ae_encrypt( + size_t message_len, + const uint8_t message[message_len], + size_t auth_data_len, + const uint8_t auth_data[auth_data_len], + const uint8_t key[KEY_BYTES], + const uint8_t nonce[NONCE_BYTES], + uint8_t ciphertext[message_len], + uint8_t tag[TAG_BYTES] +); + +bool lilliput_ae_decrypt( + size_t ciphertext_len, + const uint8_t ciphertext[ciphertext_len], + size_t auth_data_len, + const uint8_t auth_data[auth_data_len], + const uint8_t key[KEY_BYTES], + const uint8_t nonce[NONCE_BYTES], + const uint8_t tag[TAG_BYTES], + uint8_t message[ciphertext_len] +); + + +#endif /* LILLIPUT_AE_H */ diff --git a/src/add_tweakeyloop/parameters.h b/src/add_tweakeyloop/parameters.h new file mode 100644 index 0000000..681a152 --- /dev/null +++ b/src/add_tweakeyloop/parameters.h @@ -0,0 +1,20 @@ +#ifndef PARAMETERS_H +#define PARAMETERS_H + +#include "_parameters.h" + +#define TWEAKEY_LENGTH_BITS (TWEAK_LENGTH_BITS+KEY_LENGTH_BITS) +#define ROUND_TWEAKEY_LENGTH_BITS 64 +#define BLOCK_LENGTH_BITS 128 +#define NONCE_LENGTH_BITS 120 +#define TAG_LENGTH_BITS 128 + +#define TWEAK_BYTES (TWEAK_LENGTH_BITS/8) +#define KEY_BYTES (KEY_LENGTH_BITS/8) +#define TWEAKEY_BYTES (TWEAKEY_LENGTH_BITS/8) +#define ROUND_TWEAKEY_BYTES (ROUND_TWEAKEY_LENGTH_BITS/8) +#define BLOCK_BYTES (BLOCK_LENGTH_BITS/8) +#define NONCE_BYTES (NONCE_LENGTH_BITS/8) +#define TAG_BYTES (TAG_LENGTH_BITS/8) + +#endif /* PARAMETERS_H */ diff --git a/src/add_tweakeyloop/tweakey.c b/src/add_tweakeyloop/tweakey.c new file mode 100644 index 0000000..54b3036 --- /dev/null +++ b/src/add_tweakeyloop/tweakey.c @@ -0,0 +1,127 @@ +#include +#include + +#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>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 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 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]) +{ + 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 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 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]); + +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 + +#include "parameters.h" + + +void tweakey_state_init( + uint8_t TK[TWEAKEY_BYTES], + const uint8_t key[KEY_BYTES], + const uint8_t tweak[TWEAK_BYTES] +); + +void tweakey_state_extract( + const uint8_t TK[TWEAKEY_BYTES], + uint8_t round_constant, + uint8_t round_tweakey[ROUND_TWEAKEY_BYTES] /* output */ +); + +void tweakey_state_update(uint8_t TK[TWEAKEY_BYTES]); + +#endif /* TWEAKEY_H */ diff --git a/src/add_tweakeysequences/ae-common.h b/src/add_tweakeysequences/ae-common.h new file mode 100644 index 0000000..561854e --- /dev/null +++ b/src/add_tweakeysequences/ae-common.h @@ -0,0 +1,127 @@ +#ifndef AE_COMMON_H +#define AE_COMMON_H + +#include +#include +#include + +#include "cipher.h" +#include "parameters.h" + + +static inline uint8_t upper_nibble(uint8_t i) +{ + return i >> 4; +} + +static inline uint8_t lower_nibble(uint8_t i) +{ + return i & 0x0f; +} + +static inline void encrypt(const uint8_t K[KEY_BYTES], + const uint8_t T[TWEAK_BYTES], + const uint8_t M[BLOCK_BYTES], + uint8_t C[BLOCK_BYTES]) +{ + lilliput_tbc_encrypt(K, T, M, C); +} + +static inline void decrypt(const uint8_t K[KEY_BYTES], + const uint8_t T[TWEAK_BYTES], + const uint8_t C[BLOCK_BYTES], + uint8_t M[BLOCK_BYTES]) +{ + lilliput_tbc_decrypt(K, T, C, M); +} + +static inline void xor_into(uint8_t dest[BLOCK_BYTES], const uint8_t src[BLOCK_BYTES]) +{ + for (size_t i=0; i 1) + { + memset(padded, 0, pad_len-1); + } +} + +static inline void fill_index_tweak( + uint8_t prefix, + uint64_t block_index, + uint8_t tweak[TWEAK_BYTES] +) +{ + /* The t-bit tweak is filled as follows: + * + * - bits [ 1, t-4]: block index + * [ 1, 64]: actual 64-bit block index + * [ 65, t-4]: 0-padding + * - bits [t-3, t]: constant 4-bit prefix + */ + + for (size_t i=0; i> 8*i & 0xff; + } + + /* Assume padding bytes have already been memset to 0. */ + + tweak[TWEAK_BYTES-1] |= prefix << 4; +} + +static void process_associated_data( + const uint8_t key[KEY_BYTES], + size_t A_len, + const uint8_t A[A_len], + uint8_t Auth[BLOCK_BYTES] +) +{ + uint8_t Ek_Ai[BLOCK_BYTES]; + uint8_t tweak[TWEAK_BYTES]; + + memset(tweak, 0, TWEAK_BYTES); + memset(Auth, 0, BLOCK_BYTES); + + size_t l_a = A_len / BLOCK_BYTES; + size_t rest = A_len % BLOCK_BYTES; + + for (size_t i=0; i +#include + +#include "cipher.h" +#include "parameters.h" +#include "tweakey.h" + + +enum permutation +{ + PERMUTATION_ENCRYPTION = 0, /* PI(i) */ + PERMUTATION_DECRYPTION = 1, /* PI^-1(i) */ + PERMUTATION_NONE +}; + +typedef enum permutation permutation; + +static const uint8_t PERMUTATIONS[2][BLOCK_BYTES] = { + [PERMUTATION_ENCRYPTION] = { 13, 9, 14, 8, 10, 11, 12, 15, 4, 5, 3, 1, 2, 6, 0, 7 }, + [PERMUTATION_DECRYPTION] = { 14, 11, 12, 10, 8, 9, 13, 15, 3, 1, 4, 5, 6, 0, 2, 7 } +}; + +static const uint8_t S[256] = { + 0x20, 0x00, 0xB2, 0x85, 0x3B, 0x35, 0xA6, 0xA4, 0x30, 0xE4, 0x6A, 0x2C, 0xFF, 0x59, 0xE2, 0x0E, + 0xF8, 0x1E, 0x7A, 0x80, 0x15, 0xBD, 0x3E, 0xB1, 0xE8, 0xF3, 0xA2, 0xC2, 0xDA, 0x51, 0x2A, 0x10, + 0x21, 0x01, 0x23, 0x78, 0x5C, 0x24, 0x27, 0xB5, 0x37, 0xC7, 0x2B, 0x1F, 0xAE, 0x0A, 0x77, 0x5F, + 0x6F, 0x09, 0x9D, 0x81, 0x04, 0x5A, 0x29, 0xDC, 0x39, 0x9C, 0x05, 0x57, 0x97, 0x74, 0x79, 0x17, + 0x44, 0xC6, 0xE6, 0xE9, 0xDD, 0x41, 0xF2, 0x8A, 0x54, 0xCA, 0x6E, 0x4A, 0xE1, 0xAD, 0xB6, 0x88, + 0x1C, 0x98, 0x7E, 0xCE, 0x63, 0x49, 0x3A, 0x5D, 0x0C, 0xEF, 0xF6, 0x34, 0x56, 0x25, 0x2E, 0xD6, + 0x67, 0x75, 0x55, 0x76, 0xB8, 0xD2, 0x61, 0xD9, 0x71, 0x8B, 0xCD, 0x0B, 0x72, 0x6C, 0x31, 0x4B, + 0x69, 0xFD, 0x7B, 0x6D, 0x60, 0x3C, 0x2F, 0x62, 0x3F, 0x22, 0x73, 0x13, 0xC9, 0x82, 0x7F, 0x53, + 0x32, 0x12, 0xA0, 0x7C, 0x02, 0x87, 0x84, 0x86, 0x93, 0x4E, 0x68, 0x46, 0x8D, 0xC3, 0xDB, 0xEC, + 0x9B, 0xB7, 0x89, 0x92, 0xA7, 0xBE, 0x3D, 0xD8, 0xEA, 0x50, 0x91, 0xF1, 0x33, 0x38, 0xE0, 0xA9, + 0xA3, 0x83, 0xA1, 0x1B, 0xCF, 0x06, 0x95, 0x07, 0x9E, 0xED, 0xB9, 0xF5, 0x4C, 0xC0, 0xF4, 0x2D, + 0x16, 0xFA, 0xB4, 0x03, 0x26, 0xB3, 0x90, 0x4F, 0xAB, 0x65, 0xFC, 0xFE, 0x14, 0xF7, 0xE3, 0x94, + 0xEE, 0xAC, 0x8C, 0x1A, 0xDE, 0xCB, 0x28, 0x40, 0x7D, 0xC8, 0xC4, 0x48, 0x6B, 0xDF, 0xA5, 0x52, + 0xE5, 0xFB, 0xD7, 0x64, 0xF9, 0xF0, 0xD3, 0x5E, 0x66, 0x96, 0x8F, 0x1D, 0x45, 0x36, 0xCC, 0xC5, + 0x4D, 0x9F, 0xBF, 0x0F, 0xD1, 0x08, 0xEB, 0x43, 0x42, 0x19, 0xE7, 0x99, 0xA8, 0x8E, 0x58, 0xC1, + 0x9A, 0xD4, 0x18, 0x47, 0xAA, 0xAF, 0xBC, 0x5B, 0xD5, 0x11, 0xD0, 0xB0, 0x70, 0xBB, 0x0D, 0xBA +}; + + +static void _state_init(uint8_t X[BLOCK_BYTES], const uint8_t message[BLOCK_BYTES]) +{ + memcpy(X, message, BLOCK_BYTES); +} + + +static void _compute_round_tweakeys( + const uint8_t key[KEY_BYTES], + const uint8_t tweak[TWEAK_BYTES], + uint8_t RTK[ROUNDS][ROUND_TWEAKEY_BYTES] +) +{ + uint8_t TK[TWEAKEY_BYTES]; + tweakey_state_init(TK, key, tweak); + tweakey_state_extract(TK, 0, RTK[0]); + + for (uint8_t i=1; i + +#include "parameters.h" + + +void lilliput_tbc_encrypt( + const uint8_t key[KEY_BYTES], + const uint8_t tweak[TWEAK_BYTES], + const uint8_t message[BLOCK_BYTES], + uint8_t ciphertext[BLOCK_BYTES] +); + +void lilliput_tbc_decrypt( + const uint8_t key[KEY_BYTES], + const uint8_t tweak[TWEAK_BYTES], + const uint8_t ciphertext[BLOCK_BYTES], + uint8_t message[BLOCK_BYTES] +); + +#endif /* CIPHER_H */ diff --git a/src/add_tweakeysequences/lilliput-ae-i.c b/src/add_tweakeysequences/lilliput-ae-i.c new file mode 100644 index 0000000..b1758c9 --- /dev/null +++ b/src/add_tweakeysequences/lilliput-ae-i.c @@ -0,0 +1,195 @@ +#include +#include +#include + +#include "ae-common.h" +#include "cipher.h" +#include "lilliput-ae.h" + + +static const uint8_t _0n[BLOCK_BYTES] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + + +static void _fill_msg_tweak( + uint8_t prefix, + const uint8_t N[NONCE_BYTES], + uint64_t block_nb, + uint8_t tweak[TWEAK_BYTES] +) +{ + /* The 192-bit tweak is filled as follows: + * + * - bits 1- 68: block number + * 1- 64: actual 64-bit block number + * 64- 68: 0-padding + * - bits 67-188: nonce + * - bits 189-192: constant 4-bit prefix + */ + + for (size_t i=0; i> 8*i; + + tweak[i] = b; + } + + tweak[sizeof(block_nb)] = lower_nibble(N[0]) << 4; + + for (size_t i=1; i +#include +#include + +#include "ae-common.h" +#include "cipher.h" +#include "lilliput-ae.h" + + +static void _init_msg_tweak(const uint8_t tag[TAG_BYTES], uint8_t tweak[TWEAK_BYTES]) +{ + /* The t-bit tweak is filled as follows: + * + * - bits [ 1, t-1]: tag + block index + * [ 1, 64]: tag[ 1.. 64] XOR block index + * [ 65, t-1]: tag[65..t-1] + * - bit t: 1 + */ + + memcpy(tweak+sizeof(uint64_t), tag+sizeof(uint64_t), TAG_BYTES-sizeof(uint64_t)); + tweak[TWEAK_BYTES-1] |= 0x80; +} + +static void _fill_msg_tweak(const uint8_t tag[TAG_BYTES], uint64_t block_index, uint8_t tweak[TWEAK_BYTES]) +{ + /* Assume bits 65 to t-1 are set. */ + for (size_t i=0; i> i*8 & 0xff; + tweak[i] = tag[i] ^ index_i; + } +} + +static void _fill_tag_tweak(const uint8_t N[NONCE_BYTES], uint8_t tweak[TWEAK_BYTES]) +{ + /* The t-bit tweak is filled as follows: + * + * - bits [ 1, t-7]: N + * - bits [t-7, t]: 0001||0^4 + */ + + memcpy(tweak, N, TWEAK_BYTES-1); + tweak[TWEAK_BYTES-1] = 0x10; +} + +static void _generate_tag( + const uint8_t key[KEY_BYTES], + size_t M_len, + const uint8_t M[M_len], + const uint8_t N[NONCE_BYTES], + const uint8_t Auth[BLOCK_BYTES], + uint8_t tag[TAG_BYTES] +) +{ + uint8_t Ek_Mj[BLOCK_BYTES]; + uint8_t tag_tmp[TAG_BYTES]; + uint8_t tweak[TWEAK_BYTES]; + + memset(tweak, 0, TWEAK_BYTES); + memcpy(tag_tmp, Auth, TAG_BYTES); + + size_t l = M_len / BLOCK_BYTES; + size_t rest = M_len % BLOCK_BYTES; + + for (size_t j=0; j +#include +#include + +#include "parameters.h" + + +void lilliput_ae_encrypt( + size_t message_len, + const uint8_t message[message_len], + size_t auth_data_len, + const uint8_t auth_data[auth_data_len], + const uint8_t key[KEY_BYTES], + const uint8_t nonce[NONCE_BYTES], + uint8_t ciphertext[message_len], + uint8_t tag[TAG_BYTES] +); + +bool lilliput_ae_decrypt( + size_t ciphertext_len, + const uint8_t ciphertext[ciphertext_len], + size_t auth_data_len, + const uint8_t auth_data[auth_data_len], + const uint8_t key[KEY_BYTES], + const uint8_t nonce[NONCE_BYTES], + const uint8_t tag[TAG_BYTES], + uint8_t message[ciphertext_len] +); + + +#endif /* LILLIPUT_AE_H */ diff --git a/src/add_tweakeysequences/parameters.h b/src/add_tweakeysequences/parameters.h new file mode 100644 index 0000000..681a152 --- /dev/null +++ b/src/add_tweakeysequences/parameters.h @@ -0,0 +1,20 @@ +#ifndef PARAMETERS_H +#define PARAMETERS_H + +#include "_parameters.h" + +#define TWEAKEY_LENGTH_BITS (TWEAK_LENGTH_BITS+KEY_LENGTH_BITS) +#define ROUND_TWEAKEY_LENGTH_BITS 64 +#define BLOCK_LENGTH_BITS 128 +#define NONCE_LENGTH_BITS 120 +#define TAG_LENGTH_BITS 128 + +#define TWEAK_BYTES (TWEAK_LENGTH_BITS/8) +#define KEY_BYTES (KEY_LENGTH_BITS/8) +#define TWEAKEY_BYTES (TWEAKEY_LENGTH_BITS/8) +#define ROUND_TWEAKEY_BYTES (ROUND_TWEAKEY_LENGTH_BITS/8) +#define BLOCK_BYTES (BLOCK_LENGTH_BITS/8) +#define NONCE_BYTES (NONCE_LENGTH_BITS/8) +#define TAG_BYTES (TAG_LENGTH_BITS/8) + +#endif /* PARAMETERS_H */ diff --git a/src/add_tweakeysequences/tweakey.c b/src/add_tweakeysequences/tweakey.c new file mode 100644 index 0000000..776352f --- /dev/null +++ b/src/add_tweakeysequences/tweakey.c @@ -0,0 +1,220 @@ +#include +#include + +#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>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 + +#include "parameters.h" + + +void tweakey_state_init( + uint8_t TK[TWEAKEY_BYTES], + const uint8_t key[KEY_BYTES], + const uint8_t tweak[TWEAK_BYTES] +); + +void tweakey_state_extract( + const uint8_t TK[TWEAKEY_BYTES], + uint8_t round_constant, + uint8_t round_tweakey[ROUND_TWEAKEY_BYTES] /* output */ +); + +void tweakey_state_update(uint8_t TK[TWEAKEY_BYTES]); + +#endif /* TWEAKEY_H */ diff --git a/src/ref/tweakey.c b/src/ref/tweakey.c index 54b3036..0588c1b 100644 --- a/src/ref/tweakey.c +++ b/src/ref/tweakey.c @@ -43,6 +43,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 & 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]; @@ -57,18 +77,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]) @@ -85,18 +113,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]); -- cgit v1.2.3