From bfafd1b3323ac543cae2d34f43e02b8b4373c36f Mon Sep 17 00:00:00 2001 From: Kévin Le Gouguec Date: Tue, 5 Feb 2019 09:00:43 +0100 Subject: Renommage de ae-common.h en lilliput-ae-utils.h --- README.md | 2 +- nist/make-package.sh | 3 +- src/add_tweakeyloop/ae-common.h | 1 - src/add_tweakeyloop/lilliput-ae-utils.h | 1 + src/add_tweakeysequences/ae-common.h | 1 - src/add_tweakeysequences/lilliput-ae-utils.h | 1 + src/ref/ae-common.h | 127 --------------------------- src/ref/lilliput-ae-i.c | 2 +- src/ref/lilliput-ae-ii.c | 2 +- src/ref/lilliput-ae-utils.h | 127 +++++++++++++++++++++++++++ test/check-implementation.sh | 3 +- traces/traces-ae.patch | 10 +-- 12 files changed, 139 insertions(+), 141 deletions(-) delete mode 120000 src/add_tweakeyloop/ae-common.h create mode 120000 src/add_tweakeyloop/lilliput-ae-utils.h delete mode 120000 src/add_tweakeysequences/ae-common.h create mode 120000 src/add_tweakeysequences/lilliput-ae-utils.h delete mode 100644 src/ref/ae-common.h create mode 100644 src/ref/lilliput-ae-utils.h diff --git a/README.md b/README.md index 864b8ba..92e90ef 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Each implementation folder contains: - `lilliput-ae.h`: main API - `lilliput-ae-i.c`: implementation of Lilliput-Ⅰ (ΘCB3-based) - `lilliput-ae-ii.c`: implementation of Lilliput-Ⅱ (SCT-2-based) -- `ae-common.h`: internal helper functions used by both AE schemes +- `lilliput-ae-utils.h`: helper functions used by both AE schemes - `tweakey.*`: implementation of Lilliput-TBC's tweakey schedule - `cipher.*`: implementation of the tweakable block-cipher Lilliput-TBC diff --git a/nist/make-package.sh b/nist/make-package.sh index 33abeac..3a90dce 100755 --- a/nist/make-package.sh +++ b/nist/make-package.sh @@ -44,10 +44,9 @@ add-variant () mkdir -p ${dest} source_files=( - ae-common.h cipher.{c,h} constants.h - lilliput-ae{.h,-${mode}.c} + lilliput-ae{.h,-utils.h,-${mode}.c} tweakey.{c,h} ) diff --git a/src/add_tweakeyloop/ae-common.h b/src/add_tweakeyloop/ae-common.h deleted file mode 120000 index 73641f5..0000000 --- a/src/add_tweakeyloop/ae-common.h +++ /dev/null @@ -1 +0,0 @@ -../ref/ae-common.h \ No newline at end of file diff --git a/src/add_tweakeyloop/lilliput-ae-utils.h b/src/add_tweakeyloop/lilliput-ae-utils.h new file mode 120000 index 0000000..b46625b --- /dev/null +++ b/src/add_tweakeyloop/lilliput-ae-utils.h @@ -0,0 +1 @@ +../ref/lilliput-ae-utils.h \ No newline at end of file diff --git a/src/add_tweakeysequences/ae-common.h b/src/add_tweakeysequences/ae-common.h deleted file mode 120000 index 73641f5..0000000 --- a/src/add_tweakeysequences/ae-common.h +++ /dev/null @@ -1 +0,0 @@ -../ref/ae-common.h \ No newline at end of file diff --git a/src/add_tweakeysequences/lilliput-ae-utils.h b/src/add_tweakeysequences/lilliput-ae-utils.h new file mode 120000 index 0000000..b46625b --- /dev/null +++ b/src/add_tweakeysequences/lilliput-ae-utils.h @@ -0,0 +1 @@ +../ref/lilliput-ae-utils.h \ No newline at end of file diff --git a/src/ref/ae-common.h b/src/ref/ae-common.h deleted file mode 100644 index 6648280..0000000 --- a/src/ref/ae-common.h +++ /dev/null @@ -1,127 +0,0 @@ -#ifndef AE_COMMON_H -#define AE_COMMON_H - -#include -#include -#include - -#include "cipher.h" -#include "constants.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 "ae-common.h" +#include "lilliput-ae-utils.h" #include "cipher.h" #include "lilliput-ae.h" diff --git a/src/ref/lilliput-ae-ii.c b/src/ref/lilliput-ae-ii.c index 26885e5..6da73ac 100644 --- a/src/ref/lilliput-ae-ii.c +++ b/src/ref/lilliput-ae-ii.c @@ -2,7 +2,7 @@ #include #include -#include "ae-common.h" +#include "lilliput-ae-utils.h" #include "cipher.h" #include "lilliput-ae.h" diff --git a/src/ref/lilliput-ae-utils.h b/src/ref/lilliput-ae-utils.h new file mode 100644 index 0000000..617954b --- /dev/null +++ b/src/ref/lilliput-ae-utils.h @@ -0,0 +1,127 @@ +#ifndef LILLIPUT_AE_UTILS_H +#define LILLIPUT_AE_UTILS_H + +#include +#include +#include + +#include "cipher.h" +#include "constants.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