From ff54e8b4a758d35f4a1d4e0b0303092e7d96da0e Mon Sep 17 00:00:00 2001
From: Kévin Le Gouguec <kevin.legouguec@airbus.com>
Date: Tue, 5 Feb 2019 08:44:52 +0100
Subject: Renommage des entêtes de constantes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.

🤷
---
 src/ref/ae-common.h   |  2 +-
 src/ref/cipher.c      |  2 +-
 src/ref/cipher.h      |  2 +-
 src/ref/constants.h   | 20 ++++++++++++++++++++
 src/ref/lilliput-ae.h |  2 +-
 src/ref/parameters.h  | 20 --------------------
 src/ref/tweakey.c     |  2 +-
 src/ref/tweakey.h     |  2 +-
 8 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 src/ref/constants.h
 delete mode 100644 src/ref/parameters.h

(limited to 'src/ref')

diff --git a/src/ref/ae-common.h b/src/ref/ae-common.h
index 561854e..6648280 100644
--- a/src/ref/ae-common.h
+++ b/src/ref/ae-common.h
@@ -6,7 +6,7 @@
 #include <string.h>
 
 #include "cipher.h"
-#include "parameters.h"
+#include "constants.h"
 
 
 static inline uint8_t upper_nibble(uint8_t i)
diff --git a/src/ref/cipher.c b/src/ref/cipher.c
index e5ccd15..48fc35c 100644
--- a/src/ref/cipher.c
+++ b/src/ref/cipher.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "cipher.h"
-#include "parameters.h"
+#include "constants.h"
 #include "tweakey.h"
 
 
diff --git a/src/ref/cipher.h b/src/ref/cipher.h
index 06dfde5..30cb9c5 100644
--- a/src/ref/cipher.h
+++ b/src/ref/cipher.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include "parameters.h"
+#include "constants.h"
 
 
 void lilliput_tbc_encrypt(
diff --git a/src/ref/constants.h b/src/ref/constants.h
new file mode 100644
index 0000000..063c8af
--- /dev/null
+++ b/src/ref/constants.h
@@ -0,0 +1,20 @@
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
+
+#include "parameters.h"
+
+#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)
+
+#endif /* CONSTANTS_H */
diff --git a/src/ref/lilliput-ae.h b/src/ref/lilliput-ae.h
index e2d5051..24bd7de 100644
--- a/src/ref/lilliput-ae.h
+++ b/src/ref/lilliput-ae.h
@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "parameters.h"
+#include "constants.h"
 
 
 void lilliput_ae_encrypt(
diff --git a/src/ref/parameters.h b/src/ref/parameters.h
deleted file mode 100644
index 681a152..0000000
--- a/src/ref/parameters.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef PARAMETERS_H
-#define PARAMETERS_H
-
-#include "_parameters.h"
-
-#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)
-
-#endif /* PARAMETERS_H */
diff --git a/src/ref/tweakey.c b/src/ref/tweakey.c
index 0588c1b..e5faf2a 100644
--- a/src/ref/tweakey.c
+++ b/src/ref/tweakey.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "parameters.h"
+#include "constants.h"
 #include "tweakey.h"
 
 
diff --git a/src/ref/tweakey.h b/src/ref/tweakey.h
index 5470bc8..f4c1f0a 100644
--- a/src/ref/tweakey.h
+++ b/src/ref/tweakey.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include "parameters.h"
+#include "constants.h"
 
 
 void tweakey_state_init(
-- 
cgit v1.2.3