[WIP] Réorganisation des traces

20 files changed, 23 insertions, 38 deletions

diff --git a/test/common.mk b/test/common.mk
index 6ec544d..e855ad7 100644
--- a/test/common.mk
+++ b/test/common.mk
@@ -8,6 +8,7 @@ endif
 
 
 tests = $(basename $(wildcard test-*.c))
+traces = $(basename $(wildcard traces-*.c))
 
 
 test_dir = $(dir $(lastword $(MAKEFILE_LIST)))
@@ -22,7 +23,7 @@ CFLAGS += -I$(src_dir) -I$(variant_dir) $(nist_flags) -Werror
 LDFLAGS += $(nist_flags)
 
 
-.PHONY: clean test $(tests)
+.PHONY: clean test $(tests) traces $(traces)
 
 
 clean:
@@ -32,33 +33,41 @@ $(results_dir) $(results_dir)/src $(results_dir)/test:
 	@ mkdir -p $@
 
 test: $(tests)
+trace: $(traces)
 
 $(tests): test-%: $(results_dir)/test-%
 	@ echo "TEST $@"
 	$(Q) $<
 
+$(traces): traces-%: $(results_dir)/traces-%
+	@ echo "TRACES $@"
+	$(Q) $<
 
 $(results_dir)/test-%: $(results_dir)/test/test-%.o
 	@ echo "LD $@"
 	$(Q) gcc $^ $(LDFLAGS) -o $@
 
-$(results_dir)/src/%.o: $(src_dir)/%.c | $(results_dir)/src
+$(results_dir)/traces-%: $(results_dir)/test/traces-%.o
+	@ echo "LD $@"
+	$(Q) gcc $^ $(LDFLAGS) -o $@
+
+$(results_dir)/test/%.o: %.c | $(results_dir)/test
 	@ echo "CC $@"
 	$(Q) gcc -c $< $(CFLAGS) -o $@
 
-$(results_dir)/test/%.o: %.c | $(results_dir)/test
+$(results_dir)/src/%.o: $(src_dir)/%.c | $(results_dir)/src
 	@ echo "CC $@"
 	$(Q) gcc -c $< $(CFLAGS) -o $@
 
 
 # Program => additional objects dependencies
 
-$(results_dir)/test-tbc-decrypt $(results_dir)/test-tbc-encrypt:        \
-$(results_dir)/src/cipher.o $(results_dir)/src/tweakey.o                \
+$(results_dir)/test-tbc-decrypt $(results_dir)/test-tbc-encrypt $(results_dir)/traces-tbc:      \
+$(results_dir)/src/cipher.o $(results_dir)/src/tweakey.o                                        \
 $(results_dir)/src/constants.o
 
-$(results_dir)/test-ae-decrypt $(results_dir)/test-ae-encrypt $(results_dir)/test-ae-roundtrip: \
-$(results_dir)/src/lilliput-ae-$(mode).o $(results_dir)/src/cipher.o                            \
+$(results_dir)/test-ae-decrypt $(results_dir)/test-ae-encrypt $(results_dir)/test-ae-roundtrip $(results_dir)/traces-ae: \
+$(results_dir)/src/lilliput-ae-$(mode).o $(results_dir)/src/cipher.o                                                     \
 $(results_dir)/src/tweakey.o $(results_dir)/src/constants.o
 
 $(results_dir)/test-tweakey:                                    \
@@ -72,21 +81,19 @@ $(variant_dir)/_parameters.h
 
 $(results_dir)/$(src_dir)/constants.o: $(src_dir)/constants.h
 
-$(results_dir)/$(src_dir)/lilliput-ae-i.o: $(src_dir)/lilliput-ae.h     \
-$(src_dir)/cipher.h $(src_dir)/parameters.h                             \
-$(variant_dir)/_parameters.h
-
-$(results_dir)/$(src_dir)/lilliput-ae-ii.o: $(src_dir)/lilliput-ae.h    \
-$(src_dir)/cipher.h $(src_dir)/parameters.h                             \
+$(results_dir)/$(src_dir)/lilliput-ae-i.o $(results_dir)/$(src_dir)/lilliput-ae-ii.o:   \
+$(src_dir)/lilliput-ae.h $(src_dir)/cipher.h $(src_dir)/parameters.h                    \
 $(variant_dir)/_parameters.h
 
 $(results_dir)/$(src_dir)/tweakey.o: $(src_dir)/tweakey.h       \
 $(src_dir)/constants.h $(src_dir)/parameters.h                  \
 $(variant_dir)/_parameters.h
 
-$(results_dir)/test/test-tbc-encrypt.o $(results_dir)/test/test-tbc-encrypt.o: \
+$(results_dir)/test/test-tbc-encrypt.o $(results_dir)/test/test-tbc-decrypt.o $(results_dir)/test/traces-tbc.o: \
 $(src_dir)/cipher.h
 
+$(results_dir)/test/test-ae-encrypt.o $(results_dir)/test/test-ae-decrypt.o $(results_dir)/test/test-ae-roundtrip.o $(results_dir)/test/traces-ae.o: \
+$(src_dir)/lilliput-ae.h
 
 
 # TODO: add valgrind, although it does not seem to play well with ASAN
diff --git a/test/i-128/Makefile b/test/i-128/Makefile
index 0c47ef0..c380514 100644
--- a/test/i-128/Makefile
+++ b/test/i-128/Makefile
@@ -2,6 +2,3 @@ mode = i
 keylen = 128
 
 include ../common.mk
-
-results/traces-ae-128-i: results/src/lilliput-ae-i.o results/src/cipher.o results/src/tweakey.o results/src/constants.o | results/src
-results/traces-tbc-128-i: results/src/cipher.o results/src/tweakey.o results/src/constants.o | results/src
diff --git a/crypto_aead/lilliputaei128v1/ref/test/traces-ae-128-i.c b/test/i-128/traces-ae.c
index 223ab2e..223ab2e 100644
--- a/crypto_aead/lilliputaei128v1/ref/test/traces-ae-128-i.c
+++ b/test/i-128/traces-ae.c
diff --git a/crypto_aead/lilliputaei128v1/ref/test/traces-tbc-128-i.c b/test/i-128/traces-tbc.c
index c128da2..c128da2 100644
--- a/crypto_aead/lilliputaei128v1/ref/test/traces-tbc-128-i.c
+++ b/test/i-128/traces-tbc.c
diff --git a/test/i-192/Makefile b/test/i-192/Makefile
index a1c2edf..83921dc 100644
--- a/test/i-192/Makefile
+++ b/test/i-192/Makefile
@@ -2,6 +2,3 @@ mode = i
 keylen = 192
 
 include ../common.mk
-
-results/traces-ae-192-i: results/src/lilliput-ae-i.o results/src/cipher.o results/src/tweakey.o results/src/constants.o | results/src
-results/traces-tbc-192-i: results/src/cipher.o results/src/tweakey.o results/src/constants.o | results/src
diff --git a/crypto_aead/lilliputaei192v1/ref/test/traces-ae-192-i.c b/test/i-192/traces-ae.c
index 84d3355..84d3355 100644
--- a/crypto_aead/lilliputaei192v1/ref/test/traces-ae-192-i.c
+++ b/test/i-192/traces-ae.c
diff --git a/crypto_aead/lilliputaei192v1/ref/test/traces-tbc-192-i.c b/test/i-192/traces-tbc.c
index 251141e..251141e 100644
--- a/crypto_aead/lilliputaei192v1/ref/test/traces-tbc-192-i.c
+++ b/test/i-192/traces-tbc.c
diff --git a/test/i-256/Makefile b/test/i-256/Makefile
index a07df90..5ab0411 100644
--- a/test/i-256/Makefile
+++ b/test/i-256/Makefile
@@ -2,6 +2,3 @@ mode = i
 keylen = 256
 
 include ../common.mk
-
-results/traces-ae-256-i: results/src/lilliput-ae-i.o results/src/cipher.o results/src/tweakey.o results/src/constants.o | results/src
-results/traces-tbc-256-i: results/src/cipher.o results/src/tweakey.o results/src/constants.o | results/src
diff --git a/crypto_aead/lilliputaei256v1/ref/test/traces-ae-256-i.c b/test/i-256/traces-ae.c
index c233bcc..c233bcc 100644
--- a/crypto_aead/lilliputaei256v1/ref/test/traces-ae-256-i.c
+++ b/test/i-256/traces-ae.c
diff --git a/crypto_aead/lilliputaei256v1/ref/test/traces-tbc-256-i.c b/test/i-256/traces-tbc.c
index 6668c8c..6668c8c 100644
--- a/crypto_aead/lilliputaei256v1/ref/test/traces-tbc-256-i.c
+++ b/test/i-256/traces-tbc.c
diff --git a/test/ii-128/Makefile b/test/ii-128/Makefile
index 0fc4b6c..8a07660 100644
--- a/test/ii-128/Makefile
+++ b/test/ii-128/Makefile
@@ -2,6 +2,3 @@ mode = ii
 keylen = 128
 
 include ../common.mk
-
-results/traces-ae-128-ii: results/src/lilliput-ae-ii.o results/src/cipher.o results/src/tweakey.o results/src/constants.o | results/src
-results/traces-tbc-128-ii: results/src/cipher.o results/src/tweakey.o results/src/constants.o | results/src
diff --git a/crypto_aead/lilliputaeii128v1/ref/test/traces-ae-128-ii.c b/test/ii-128/traces-ae.c
index 853d3d5..853d3d5 100644
--- a/crypto_aead/lilliputaeii128v1/ref/test/traces-ae-128-ii.c
+++ b/test/ii-128/traces-ae.c
diff --git a/crypto_aead/lilliputaeii128v1/ref/test/traces-tbc-128-ii.c b/test/ii-128/traces-tbc.c
index 729f3fe..729f3fe 100644
--- a/crypto_aead/lilliputaeii128v1/ref/test/traces-tbc-128-ii.c
+++ b/test/ii-128/traces-tbc.c
diff --git a/test/ii-192/Makefile b/test/ii-192/Makefile
index 3c18f22..29f85d6 100644
--- a/test/ii-192/Makefile
+++ b/test/ii-192/Makefile
@@ -2,6 +2,3 @@ mode = ii
 keylen = 192
 
 include ../common.mk
-
-results/traces-ae-192-ii: results/src/lilliput-ae-ii.o results/src/cipher.o results/src/tweakey.o results/src/constants.o | results/src
-results/traces-tbc-192-ii: results/src/cipher.o results/src/tweakey.o results/src/constants.o | results/src
diff --git a/crypto_aead/lilliputaeii192v1/ref/test/traces-ae-192-ii.c b/test/ii-192/traces-ae.c
index ea48b4b..ea48b4b 100644
--- a/crypto_aead/lilliputaeii192v1/ref/test/traces-ae-192-ii.c
+++ b/test/ii-192/traces-ae.c
diff --git a/crypto_aead/lilliputaeii192v1/ref/test/traces-tbc-192-ii.c b/test/ii-192/traces-tbc.c
index 5f5929f..5f5929f 100644
--- a/crypto_aead/lilliputaeii192v1/ref/test/traces-tbc-192-ii.c
+++ b/test/ii-192/traces-tbc.c
diff --git a/test/ii-256/Makefile b/test/ii-256/Makefile
index 211ce25..ca7d5a3 100644
--- a/test/ii-256/Makefile
+++ b/test/ii-256/Makefile
@@ -2,6 +2,3 @@ mode = ii
 keylen = 256
 
 include ../common.mk
-
-results/traces-ae-256-ii: results/src/lilliput-ae-ii.o results/src/cipher.o results/src/tweakey.o results/src/constants.o | results/src
-results/traces-tbc-256-ii: results/src/cipher.o results/src/tweakey.o results/src/constants.o | results/src
diff --git a/crypto_aead/lilliputaeii256v1/ref/test/traces-ae-256-ii.c b/test/ii-256/traces-ae.c
index 343617f..343617f 100644
--- a/crypto_aead/lilliputaeii256v1/ref/test/traces-ae-256-ii.c
+++ b/test/ii-256/traces-ae.c
diff --git a/crypto_aead/lilliputaeii256v1/ref/test/traces-tbc-256-ii.c b/test/ii-256/traces-tbc.c
index 217d335..217d335 100644
--- a/crypto_aead/lilliputaeii256v1/ref/test/traces-tbc-256-ii.c
+++ b/test/ii-256/traces-tbc.c
diff --git a/traces/collect-traces.sh b/traces/collect-traces.sh
index 2b5eb1e..16e8408 100755
--- a/traces/collect-traces.sh
+++ b/traces/collect-traces.sh
@@ -13,16 +13,12 @@ d=$(mktemp -d)
 
 git apply ${patch}
 
-for makefile in $(find crypto_aead -name Makefile)
+for makefile in $(find test -name Makefile)
 do
     implem_dir=$(dirname ${makefile})
     make -C ${implem_dir} clean
 
-    [[ ${implem_dir} =~ lilliputae(i|ii)([0-9]+)v ]]
-
-    ae_type=${BASH_REMATCH[1]}
-    keysize=${BASH_REMATCH[2]}
-    make -C ${implem_dir} ${trace_type}-${keysize}-${ae_type}
+    make -C ${implem_dir} ${trace_type}
     cp ${implem_dir}/results/traces*.txt ${d}
 done