From 98a7cb6d80f4151aebf6c1c0e76a2e9a22ab6e57 Mon Sep 17 00:00:00 2001 From: Kévin Le Gouguec Date: Wed, 28 Nov 2018 13:42:48 +0100 Subject: Dégraissage de parameters.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crypto_aead/lilliputaei128v1/ref/Makefile | 4 +--- crypto_aead/lilliputaei128v1/ref/_parameters.h | 9 +++++++++ crypto_aead/lilliputaei128v1/ref/parameters.h | 23 ----------------------- crypto_aead/lilliputaei192v1/ref/Makefile | 1 - crypto_aead/lilliputaei192v1/ref/_parameters.h | 9 +++++++++ crypto_aead/lilliputaei192v1/ref/parameters.h | 23 ----------------------- crypto_aead/lilliputaeii128v1/ref/Makefile | 1 - crypto_aead/lilliputaeii128v1/ref/_parameters.h | 9 +++++++++ crypto_aead/lilliputaeii128v1/ref/parameters.h | 23 ----------------------- 9 files changed, 28 insertions(+), 74 deletions(-) create mode 100644 crypto_aead/lilliputaei128v1/ref/_parameters.h delete mode 100644 crypto_aead/lilliputaei128v1/ref/parameters.h create mode 100644 crypto_aead/lilliputaei192v1/ref/_parameters.h delete mode 100644 crypto_aead/lilliputaei192v1/ref/parameters.h create mode 100644 crypto_aead/lilliputaeii128v1/ref/_parameters.h delete mode 100644 crypto_aead/lilliputaeii128v1/ref/parameters.h (limited to 'crypto_aead') diff --git a/crypto_aead/lilliputaei128v1/ref/Makefile b/crypto_aead/lilliputaei128v1/ref/Makefile index 699a4be..ca9e1db 100644 --- a/crypto_aead/lilliputaei128v1/ref/Makefile +++ b/crypto_aead/lilliputaei128v1/ref/Makefile @@ -1,5 +1,4 @@ -tests = test-tweakey \ -test-tbc-encrypt test-tbc-decrypt \ +tests = test-tweakey test-tbc-encrypt test-tbc-decrypt \ test-ae-roundtrip test-ae-encrypt test-ae-decrypt include src/common.mk @@ -11,7 +10,6 @@ results/test-tbc-decrypt: results/src/cipher.o results/src/tweakey.o results/src results/test-tbc-encrypt: results/src/cipher.o results/src/tweakey.o results/src/constants.o | results results/test-tweakey: results/src/tweakey.o results/src/constants.o | results -results/test-*.o: test/helpers.h parameters.h results/test-ae-decrypt.o: src/lilliput-ae.h results/test-ae-encrypt.o: src/lilliput-ae.h results/test-ae-roundtrip.o: src/lilliput-ae.h diff --git a/crypto_aead/lilliputaei128v1/ref/_parameters.h b/crypto_aead/lilliputaei128v1/ref/_parameters.h new file mode 100644 index 0000000..08ce8c1 --- /dev/null +++ b/crypto_aead/lilliputaei128v1/ref/_parameters.h @@ -0,0 +1,9 @@ +#ifndef _PARAMETERS_H +#define _PARAMETERS_H + +#define KEY_LENGTH_BITS 128 +#define ROUNDS 32 + +#define TWEAK_LENGTH_BITS 192 + +#endif /* _PARAMETERS_H */ diff --git a/crypto_aead/lilliputaei128v1/ref/parameters.h b/crypto_aead/lilliputaei128v1/ref/parameters.h deleted file mode 100644 index d4d55c2..0000000 --- a/crypto_aead/lilliputaei128v1/ref/parameters.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef PARAMETERS_H -#define PARAMETERS_H - -#define TWEAK_LENGTH_BITS 192 -#define KEY_LENGTH_BITS 128 -#define TWEAKEY_LENGTH_BITS (TWEAK_LENGTH_BITS+KEY_LENGTH_BITS) -#define ROUND_TWEAKEY_LENGTH_BITS 64 -#define BLOCK_LENGTH_BITS 128 -#define NONCE_LENGTH_BITS 120 -#define TAG_LENGTH_BITS 128 - -#define TWEAK_BYTES (TWEAK_LENGTH_BITS/8) -#define KEY_BYTES (KEY_LENGTH_BITS/8) -#define TWEAKEY_BYTES (TWEAKEY_LENGTH_BITS/8) -#define ROUND_TWEAKEY_BYTES (ROUND_TWEAKEY_LENGTH_BITS/8) -#define BLOCK_BYTES (BLOCK_LENGTH_BITS/8) -#define NONCE_BYTES (NONCE_LENGTH_BITS/8) -#define TAG_BYTES (TAG_LENGTH_BITS/8) - - -#define ROUNDS 32 - -#endif /* PARAMETERS_H */ diff --git a/crypto_aead/lilliputaei192v1/ref/Makefile b/crypto_aead/lilliputaei192v1/ref/Makefile index 5853669..3692548 100644 --- a/crypto_aead/lilliputaei192v1/ref/Makefile +++ b/crypto_aead/lilliputaei192v1/ref/Makefile @@ -4,7 +4,6 @@ include src/common.mk results/test-ae-roundtrip: results/src/lilliput-ae-i.o results/src/cipher.o results/src/tweakey.o results/src/constants.o | results -results/test-*.o: test/helpers.h parameters.h results/test-ae-roundtrip.o: src/lilliput-ae.h # TODO: should add order-only prerequisites to remove mkdirs inside recipes diff --git a/crypto_aead/lilliputaei192v1/ref/_parameters.h b/crypto_aead/lilliputaei192v1/ref/_parameters.h new file mode 100644 index 0000000..d1dc476 --- /dev/null +++ b/crypto_aead/lilliputaei192v1/ref/_parameters.h @@ -0,0 +1,9 @@ +#ifndef _PARAMETERS_H +#define _PARAMETERS_H + +#define KEY_LENGTH_BITS 192 +#define ROUNDS 36 + +#define TWEAK_LENGTH_BITS 192 + +#endif /* _PARAMETERS_H */ diff --git a/crypto_aead/lilliputaei192v1/ref/parameters.h b/crypto_aead/lilliputaei192v1/ref/parameters.h deleted file mode 100644 index 061fb63..0000000 --- a/crypto_aead/lilliputaei192v1/ref/parameters.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef PARAMETERS_H -#define PARAMETERS_H - -#define TWEAK_LENGTH_BITS 192 -#define KEY_LENGTH_BITS 192 -#define TWEAKEY_LENGTH_BITS (TWEAK_LENGTH_BITS+KEY_LENGTH_BITS) -#define ROUND_TWEAKEY_LENGTH_BITS 64 -#define BLOCK_LENGTH_BITS 128 -#define NONCE_LENGTH_BITS 120 -#define TAG_LENGTH_BITS 128 - -#define TWEAK_BYTES (TWEAK_LENGTH_BITS/8) -#define KEY_BYTES (KEY_LENGTH_BITS/8) -#define TWEAKEY_BYTES (TWEAKEY_LENGTH_BITS/8) -#define ROUND_TWEAKEY_BYTES (ROUND_TWEAKEY_LENGTH_BITS/8) -#define BLOCK_BYTES (BLOCK_LENGTH_BITS/8) -#define NONCE_BYTES (NONCE_LENGTH_BITS/8) -#define TAG_BYTES (TAG_LENGTH_BITS/8) - - -#define ROUNDS 36 - -#endif /* PARAMETERS_H */ diff --git a/crypto_aead/lilliputaeii128v1/ref/Makefile b/crypto_aead/lilliputaeii128v1/ref/Makefile index 941a11a..0b15384 100644 --- a/crypto_aead/lilliputaeii128v1/ref/Makefile +++ b/crypto_aead/lilliputaeii128v1/ref/Makefile @@ -4,5 +4,4 @@ include src/common.mk results/test-ae-roundtrip: results/src/lilliput-ae-ii.o results/src/cipher.o results/src/tweakey.o results/src/constants.o | results -results/test-*.o: test/helpers.h parameters.h results/test-ae-roundtrip.o: src/lilliput-ae.h diff --git a/crypto_aead/lilliputaeii128v1/ref/_parameters.h b/crypto_aead/lilliputaeii128v1/ref/_parameters.h new file mode 100644 index 0000000..147730d --- /dev/null +++ b/crypto_aead/lilliputaeii128v1/ref/_parameters.h @@ -0,0 +1,9 @@ +#ifndef _PARAMETERS_H +#define _PARAMETERS_H + +#define KEY_LENGTH_BITS 128 +#define ROUNDS 32 + +#define TWEAK_LENGTH_BITS 128 + +#endif /* _PARAMETERS_H */ diff --git a/crypto_aead/lilliputaeii128v1/ref/parameters.h b/crypto_aead/lilliputaeii128v1/ref/parameters.h deleted file mode 100644 index f2ebe0a..0000000 --- a/crypto_aead/lilliputaeii128v1/ref/parameters.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef PARAMETERS_H -#define PARAMETERS_H - -#define TWEAK_LENGTH_BITS 128 -#define KEY_LENGTH_BITS 128 -#define TWEAKEY_LENGTH_BITS (TWEAK_LENGTH_BITS+KEY_LENGTH_BITS) -#define ROUND_TWEAKEY_LENGTH_BITS 64 -#define BLOCK_LENGTH_BITS 128 -#define NONCE_LENGTH_BITS 120 -#define TAG_LENGTH_BITS 128 - -#define TWEAK_BYTES (TWEAK_LENGTH_BITS/8) -#define KEY_BYTES (KEY_LENGTH_BITS/8) -#define TWEAKEY_BYTES (TWEAKEY_LENGTH_BITS/8) -#define ROUND_TWEAKEY_BYTES (ROUND_TWEAKEY_LENGTH_BITS/8) -#define BLOCK_BYTES (BLOCK_LENGTH_BITS/8) -#define NONCE_BYTES (NONCE_LENGTH_BITS/8) -#define TAG_BYTES (TAG_LENGTH_BITS/8) - - -#define ROUNDS 32 - -#endif /* PARAMETERS_H */ -- cgit v1.2.3