commit 4dcf6e9afb6e30a94f1f88102975627cf7edbc84 parent 265340a0542c1f9d46621258989a8c18249a028f Author: Kévin Le Gouguec <kevin.legouguec@airbus.com> Date: Mon, 17 Dec 2018 15:26:12 +0100 Organisation des différentes implémentations Au passage, officialisation de la version "i applications successives de M pour calculer Mⁱ" du key schedule. Diffstat:
19 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/ae-common.h b/src/add_tabulatedtweakey/ae-common.h diff --git a/src/cipher.c b/src/add_tabulatedtweakey/cipher.c diff --git a/src/cipher.h b/src/add_tabulatedtweakey/cipher.h diff --git a/src/lilliput-ae-i.c b/src/add_tabulatedtweakey/lilliput-ae-i.c diff --git a/src/lilliput-ae-ii.c b/src/add_tabulatedtweakey/lilliput-ae-ii.c diff --git a/src/lilliput-ae.h b/src/add_tabulatedtweakey/lilliput-ae.h diff --git a/src/parameters.h b/src/add_tabulatedtweakey/parameters.h diff --git a/src/tweakey.c b/src/add_tabulatedtweakey/tweakey.c diff --git a/src/tweakey.h b/src/add_tabulatedtweakey/tweakey.h diff --git a/src/ae-common.h b/src/ref/ae-common.h diff --git a/src/cipher.c b/src/ref/cipher.c diff --git a/src/cipher.h b/src/ref/cipher.h diff --git a/src/lilliput-ae-i.c b/src/ref/lilliput-ae-i.c diff --git a/src/lilliput-ae-ii.c b/src/ref/lilliput-ae-ii.c diff --git a/src/lilliput-ae.h b/src/ref/lilliput-ae.h diff --git a/src/parameters.h b/src/ref/parameters.h diff --git a/src/tweakey-unrolled-multiplications.c b/src/ref/tweakey.c diff --git a/src/tweakey.h b/src/ref/tweakey.h diff --git a/test/common.mk b/test/common.mk @@ -1,4 +1,4 @@ -# use "make VERBOSE=1" to have full commands printed out. +# Use "make VERBOSE=1" to have full commands printed out. VERBOSE = 0 ifeq ($(VERBOSE),1) Q = @@ -7,6 +7,10 @@ Q = @ endif +# Use "make IMPLEMENTATION=..." to compile against other versions. +IMPLEMENTATION = ref + + tests = $(basename $(wildcard test-*.c)) traces = $(basename $(wildcard traces-*.c)) @@ -14,8 +18,8 @@ traces = $(basename $(wildcard traces-*.c)) test_dir = $(dir $(lastword $(MAKEFILE_LIST))) root_dir = $(test_dir).. results_dir = $(root_dir)/results/$(mode)-$(keylen) -src_dir = $(root_dir)/src -variant_dir = $(src_dir)/$(mode)-$(keylen) +src_dir = $(root_dir)/src/$(IMPLEMENTATION) +variant_dir = $(root_dir)/src/$(mode)-$(keylen) nist_flags = -std=c99 -Wall -Wextra -Wshadow -fsanitize=address,undefined -O2