summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKévin Le Gouguec <kevin.legouguec@airbus.com>2019-02-05 08:44:52 +0100
committerKévin Le Gouguec <kevin.legouguec@airbus.com>2019-02-05 08:44:52 +0100
commitff54e8b4a758d35f4a1d4e0b0303092e7d96da0e (patch)
tree689ac21607d8760fb53f6a97903c1c5976c52896 /src
parent833b24eb5dffcfb675aabbefd2435ed6f6b72bfe (diff)
downloadlilliput-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 'src')
l---------src/add_tweakeyloop/constants.h1
l---------src/add_tweakeyloop/parameters.h1
-rw-r--r--src/add_tweakeyloop/tweakey.c2
l---------src/add_tweakeysequences/constants.h1
l---------src/add_tweakeysequences/parameters.h1
-rw-r--r--src/add_tweakeysequences/tweakey.c2
-rw-r--r--src/i-128/parameters.h (renamed from src/i-128/_parameters.h)6
-rw-r--r--src/i-192/parameters.h (renamed from src/i-192/_parameters.h)6
-rw-r--r--src/i-256/parameters.h (renamed from src/i-256/_parameters.h)6
-rw-r--r--src/ii-128/parameters.h (renamed from src/ii-128/_parameters.h)6
-rw-r--r--src/ii-192/parameters.h (renamed from src/ii-192/_parameters.h)6
-rw-r--r--src/ii-256/parameters.h (renamed from src/ii-256/_parameters.h)6
-rw-r--r--src/ref/ae-common.h2
-rw-r--r--src/ref/cipher.c2
-rw-r--r--src/ref/cipher.h2
-rw-r--r--src/ref/constants.h (renamed from src/ref/parameters.h)8
-rw-r--r--src/ref/lilliput-ae.h2
-rw-r--r--src/ref/tweakey.c2
-rw-r--r--src/ref/tweakey.h2
19 files changed, 32 insertions, 32 deletions
diff --git a/src/add_tweakeyloop/constants.h b/src/add_tweakeyloop/constants.h
new file mode 120000
index 0000000..67df0f3
--- /dev/null
+++ b/src/add_tweakeyloop/constants.h
@@ -0,0 +1 @@
+../ref/constants.h \ No newline at end of file
diff --git a/src/add_tweakeyloop/parameters.h b/src/add_tweakeyloop/parameters.h
deleted file mode 120000
index 8eff42f..0000000
--- a/src/add_tweakeyloop/parameters.h
+++ /dev/null
@@ -1 +0,0 @@
-../ref/parameters.h \ No newline at end of file
diff --git a/src/add_tweakeyloop/tweakey.c b/src/add_tweakeyloop/tweakey.c
index 54b3036..6b1232e 100644
--- a/src/add_tweakeyloop/tweakey.c
+++ b/src/add_tweakeyloop/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/add_tweakeysequences/constants.h b/src/add_tweakeysequences/constants.h
new file mode 120000
index 0000000..67df0f3
--- /dev/null
+++ b/src/add_tweakeysequences/constants.h
@@ -0,0 +1 @@
+../ref/constants.h \ No newline at end of file
diff --git a/src/add_tweakeysequences/parameters.h b/src/add_tweakeysequences/parameters.h
deleted file mode 120000
index 8eff42f..0000000
--- a/src/add_tweakeysequences/parameters.h
+++ /dev/null
@@ -1 +0,0 @@
-../ref/parameters.h \ No newline at end of file
diff --git a/src/add_tweakeysequences/tweakey.c b/src/add_tweakeysequences/tweakey.c
index 776352f..9f71622 100644
--- a/src/add_tweakeysequences/tweakey.c
+++ b/src/add_tweakeysequences/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/i-128/_parameters.h b/src/i-128/parameters.h
index 08ce8c1..c1165b1 100644
--- a/src/i-128/_parameters.h
+++ b/src/i-128/parameters.h
@@ -1,9 +1,9 @@
-#ifndef _PARAMETERS_H
-#define _PARAMETERS_H
+#ifndef PARAMETERS_H
+#define PARAMETERS_H
#define KEY_LENGTH_BITS 128
#define ROUNDS 32
#define TWEAK_LENGTH_BITS 192
-#endif /* _PARAMETERS_H */
+#endif /* PARAMETERS_H */
diff --git a/src/i-192/_parameters.h b/src/i-192/parameters.h
index d1dc476..295c8b0 100644
--- a/src/i-192/_parameters.h
+++ b/src/i-192/parameters.h
@@ -1,9 +1,9 @@
-#ifndef _PARAMETERS_H
-#define _PARAMETERS_H
+#ifndef PARAMETERS_H
+#define PARAMETERS_H
#define KEY_LENGTH_BITS 192
#define ROUNDS 36
#define TWEAK_LENGTH_BITS 192
-#endif /* _PARAMETERS_H */
+#endif /* PARAMETERS_H */
diff --git a/src/i-256/_parameters.h b/src/i-256/parameters.h
index d948ac5..782611b 100644
--- a/src/i-256/_parameters.h
+++ b/src/i-256/parameters.h
@@ -1,9 +1,9 @@
-#ifndef _PARAMETERS_H
-#define _PARAMETERS_H
+#ifndef PARAMETERS_H
+#define PARAMETERS_H
#define KEY_LENGTH_BITS 256
#define ROUNDS 42
#define TWEAK_LENGTH_BITS 192
-#endif /* _PARAMETERS_H */
+#endif /* PARAMETERS_H */
diff --git a/src/ii-128/_parameters.h b/src/ii-128/parameters.h
index 147730d..bf3936d 100644
--- a/src/ii-128/_parameters.h
+++ b/src/ii-128/parameters.h
@@ -1,9 +1,9 @@
-#ifndef _PARAMETERS_H
-#define _PARAMETERS_H
+#ifndef PARAMETERS_H
+#define PARAMETERS_H
#define KEY_LENGTH_BITS 128
#define ROUNDS 32
#define TWEAK_LENGTH_BITS 128
-#endif /* _PARAMETERS_H */
+#endif /* PARAMETERS_H */
diff --git a/src/ii-192/_parameters.h b/src/ii-192/parameters.h
index 8b76285..bfb541e 100644
--- a/src/ii-192/_parameters.h
+++ b/src/ii-192/parameters.h
@@ -1,9 +1,9 @@
-#ifndef _PARAMETERS_H
-#define _PARAMETERS_H
+#ifndef PARAMETERS_H
+#define PARAMETERS_H
#define KEY_LENGTH_BITS 192
#define ROUNDS 36
#define TWEAK_LENGTH_BITS 128
-#endif /* _PARAMETERS_H */
+#endif /* PARAMETERS_H */
diff --git a/src/ii-256/_parameters.h b/src/ii-256/parameters.h
index 8bd0430..1255859 100644
--- a/src/ii-256/_parameters.h
+++ b/src/ii-256/parameters.h
@@ -1,9 +1,9 @@
-#ifndef _PARAMETERS_H
-#define _PARAMETERS_H
+#ifndef PARAMETERS_H
+#define PARAMETERS_H
#define KEY_LENGTH_BITS 256
#define ROUNDS 42
#define TWEAK_LENGTH_BITS 128
-#endif /* _PARAMETERS_H */
+#endif /* PARAMETERS_H */
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/parameters.h b/src/ref/constants.h
index 681a152..063c8af 100644
--- a/src/ref/parameters.h
+++ b/src/ref/constants.h
@@ -1,7 +1,7 @@
-#ifndef PARAMETERS_H
-#define PARAMETERS_H
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
-#include "_parameters.h"
+#include "parameters.h"
#define TWEAKEY_LENGTH_BITS (TWEAK_LENGTH_BITS+KEY_LENGTH_BITS)
#define ROUND_TWEAKEY_LENGTH_BITS 64
@@ -17,4 +17,4 @@
#define NONCE_BYTES (NONCE_LENGTH_BITS/8)
#define TAG_BYTES (TAG_LENGTH_BITS/8)
-#endif /* PARAMETERS_H */
+#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/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(