diff options
| author | Kévin Le Gouguec <kevin.legouguec@airbus.com> | 2019-03-12 10:42:10 +0100 |
|---|---|---|
| committer | Kévin Le Gouguec <kevin.legouguec@airbus.com> | 2019-03-12 17:36:12 +0100 |
| commit | 4582b5447826886a4ce7f5cd095daed2513d352d (patch) | |
| tree | 63350600963ad9e40508a4477f614cc53b703504 /test | |
| parent | 988fa098a026d57da624bf97b05167ae329b9f62 (diff) | |
| download | lilliput-ae-implem-4582b5447826886a4ce7f5cd095daed2513d352d.tar.xz | |
Ajout de l'implémentation à seuil d'ordre 1
Modifications nécessaires dans l'infra :
- retrait conditionnel de test-tweakey, vu que l'API n'est pas la même
pour l'implémentation à seuil,
- retrait conditionnel de l'avertissement "-Wparentheses", plus
agaçant qu'autre chose sur les calculs booléens de cipher.c, e.g.
y_hi&3 ^ (y_hi&8)>>1
où la priorité est intuitive (shifts avant AND avant XOR). C'est
dommage de perdre les avertissements sur if (a&b == c), mais tant
pis… On va compter sur La Suite De Test®©™ pour nous couvrir.
Co-authored-by: Alexandre Adomnicai <a.adomnicai@trusted-objects.com>
Co-authored-by: leo <leo.reynaud17@gmail.com>
Diffstat (limited to 'test')
| -rwxr-xr-x | test/check-implementation.sh | 2 | ||||
| -rw-r--r-- | test/common.mk | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/test/check-implementation.sh b/test/check-implementation.sh index 4113637..0750d1b 100755 --- a/test/check-implementation.sh +++ b/test/check-implementation.sh @@ -46,7 +46,7 @@ run-genkat () local nist_flags=(-std=c99 -Wall -Wextra -Wshadow -fsanitize=address,undefined -O2) - gcc ${nist_flags[@]} -Werror -I${genkat_dir} ${genkat_dir}/*.c -o ${genkat} + gcc ${nist_flags[@]} -I${genkat_dir} ${genkat_dir}/*.c -o ${genkat} ${genkat} mv LWC_AEAD_KAT*.txt ${vectors_dir}/${mode}-${keylen} diff --git a/test/common.mk b/test/common.mk index 677dcbe..c978c2d 100644 --- a/test/common.mk +++ b/test/common.mk @@ -11,9 +11,16 @@ endif IMPLEMENTATION = ref +ifeq "$(IMPLEMENTATION)" "add_threshold" +# Filter out tests on tweakey schedule, as the thresholded API differs. +tests = $(filter-out test-tweakey,$(basename $(wildcard test-*.c))) +# Don't trigger warnings for "a&b ^ c". +CFLAGS += -Wno-parentheses +else tests = $(basename $(wildcard test-*.c)) -traces = $(basename $(wildcard traces-*.c)) +endif +traces = $(basename $(wildcard traces-*.c)) test_dir = $(dir $(lastword $(MAKEFILE_LIST))) root_dir = $(test_dir).. |