diff options
| author | Kévin Le Gouguec <kevin.legouguec@airbus.com> | 2019-02-05 08:44:52 +0100 |
|---|---|---|
| committer | Kévin Le Gouguec <kevin.legouguec@airbus.com> | 2019-02-05 08:44:52 +0100 |
| commit | ff54e8b4a758d35f4a1d4e0b0303092e7d96da0e (patch) | |
| tree | 689ac21607d8760fb53f6a97903c1c5976c52896 /test | |
| parent | 833b24eb5dffcfb675aabbefd2435ed6f6b72bfe (diff) | |
| download | lilliput-ae-implem-ff54e8b4a758d35f4a1d4e0b0303092e7d96da0e.tar.xz | |
Renommage des entêtes de constantes
Aucune idée de pourquoi j'avais insisté pour nommer les deux
"parameters" plutôt que de distinguer les constantes des paramètres.
Peut-être par souci de compatibilité avec FELICS, qui utilise
constants.h.
🤷
Diffstat (limited to 'test')
| -rwxr-xr-x | test/check-implementation.sh | 4 | ||||
| -rw-r--r-- | test/common.mk | 10 | ||||
| -rw-r--r-- | test/test-helpers.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/test/check-implementation.sh b/test/check-implementation.sh index 0ce739d..951c6af 100755 --- a/test/check-implementation.sh +++ b/test/check-implementation.sh @@ -27,8 +27,8 @@ run-genkat () local source_files=( ae-common.h cipher.{c,h} + constants.h lilliput-ae{.h,-${mode}.c} - parameters.h tweakey.{c,h} ) @@ -40,7 +40,7 @@ run-genkat () cp ${src_dir}/${implem}/${f} ${genkat_dir} done - cp ${src_dir}/${mode}-${keylen}/_parameters.h ${genkat_dir} + cp ${src_dir}/${mode}-${keylen}/parameters.h ${genkat_dir} cp ${ROOT_DIR}/nist/{api.h,encrypt.c} ${genkat_dir} cp ${ROOT_DIR}/nist/TestVectorGen/* ${genkat_dir} diff --git a/test/common.mk b/test/common.mk index e018a9d..c3182cb 100644 --- a/test/common.mk +++ b/test/common.mk @@ -78,14 +78,14 @@ $(results_dir)/test-tweakey: $(results_dir)/src/tweakey.o # Object => headers dependencies $(results_dir)/$(src_dir)/cipher.o: $(src_dir)/cipher.h \ -$(src_dir)/tweakey.h $(variant_dir)/_parameters.h +$(src_dir)/tweakey.h $(variant_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 +$(src_dir)/lilliput-ae.h $(src_dir)/cipher.h $(src_dir)/constants.h \ +$(variant_dir)/parameters.h $(results_dir)/$(src_dir)/tweakey.o: $(src_dir)/tweakey.h \ -$(src_dir)/parameters.h $(variant_dir)/_parameters.h +$(src_dir)/constants.h $(variant_dir)/parameters.h $(results_dir)/test/test-tbc-encrypt.o $(results_dir)/test/test-tbc-decrypt.o $(results_dir)/test/traces-tbc.o: \ $(src_dir)/cipher.h @@ -95,4 +95,4 @@ $(src_dir)/lilliput-ae.h # TODO: add valgrind, although it does not seem to play well with ASAN -# TODO: should use gcc -M... to generate .o -> .h dependencies +# TODO: use gcc -M... to generate .o -> .h dependencies diff --git a/test/test-helpers.h b/test/test-helpers.h index 67b15a1..067b1fe 100644 --- a/test/test-helpers.h +++ b/test/test-helpers.h @@ -4,7 +4,7 @@ #include <inttypes.h> #include <stdio.h> -#include "parameters.h" +#include "constants.h" #define ARRAY_NB(A) (sizeof(A)/sizeof(A[0])) |