From 52c0e83053a4a7326da6436f9ef29b7dcc64db41 Mon Sep 17 00:00:00 2001
From: Kévin Le Gouguec <kevin.legouguec@airbus.com>
Date: Tue, 4 Dec 2018 11:30:57 +0100
Subject: Déplacement des entêtes de test/debug hors de src/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/debug.h         | 71 -----------------------------------------------------
 src/test-helpers.h  | 33 -------------------------
 test/common.mk      |  2 +-
 test/debug.h        | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 test/test-helpers.h | 33 +++++++++++++++++++++++++
 5 files changed, 105 insertions(+), 105 deletions(-)
 delete mode 100644 src/debug.h
 delete mode 100644 src/test-helpers.h
 create mode 100644 test/debug.h
 create mode 100644 test/test-helpers.h

diff --git a/src/debug.h b/src/debug.h
deleted file mode 100644
index 24b7787..0000000
--- a/src/debug.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef DEBUG_H
-#define DEBUG_H
-
-#include <inttypes.h>
-#include <stdio.h>
-
-
-extern FILE *DUMP; /* Define this variable somewhere (eg with DUMP = stderr). */
-
-
-static inline void debug_dump_lanes(const char *header, size_t len, const uint8_t buf[len], int indent)
-{
-    fprintf(DUMP, "%s\n", header);
-
-    for (size_t line=0; line<len/8; line++)
-    {
-        fprintf(DUMP, "%*s", indent, "");
-        for (size_t b=0; b<8; b++)
-        {
-            /* start with MSB */
-            size_t byte_index = len-(1+line*8+b);
-            fprintf(DUMP, "%*s%02x", 5, "", buf[byte_index]);
-        }
-        fprintf(DUMP, "\n");
-    }
-    fprintf(DUMP, "\n");
-}
-
-static inline void debug_dump_buffer(const char *header, size_t len, const uint8_t buf[len], int indent)
-{
-    fprintf(DUMP, "%*s%s\n", indent, "", header);
-
-    if (len%8 != 0)
-    {
-        fprintf(DUMP, "%*s", (int)(3*(8-len%8))+indent, "");
-        for (size_t b=0; b<len%8; b++)
-        {
-            size_t byte_index = len-1-b;
-            fprintf(DUMP, "%02x ", buf[byte_index]);
-        }
-        fprintf(DUMP, "\n");
-    }
-
-    for (size_t line=0; line<len/8; line++)
-    {
-        fprintf(DUMP, "%*s", indent, "");
-        for (size_t b=0; b<8; b++)
-        {
-            /* start with MSB */
-            size_t byte_index = 8*(len/8 - 1 - line) + 7-b;
-            /* fprintf(DUMP, "[%zu / %zu => %zu]", line, b, byte_index); */
-            fprintf(DUMP, "%02x ", buf[byte_index]);
-        }
-        fprintf(DUMP, "\n");
-    }
-
-    fprintf(DUMP, "\n");
-}
-
-static inline void debug_open_dump(const char *folder, const char *suite, const char *vector_name)
-{
-    size_t namelen = snprintf(
-        NULL, 0, "%s/traces-%s-%s.txt", folder, suite, vector_name
-    );
-    char name[namelen+1];
-    snprintf(name, sizeof(name), "%s/traces-%s-%s.txt", folder, suite, vector_name);
-    DUMP = fopen(name, "w");
-}
-
-
-#endif /* DEBUG_H */
diff --git a/src/test-helpers.h b/src/test-helpers.h
deleted file mode 100644
index 1991542..0000000
--- a/src/test-helpers.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef TEST_HELPERS_H
-#define TEST_HELPERS_H
-
-#include <stdint.h>
-#include <stdio.h>
-
-#include "parameters.h"
-
-
-#define ARRAY_NB(A) (sizeof(A)/sizeof(A[0]))
-#define ARRAY_END(A) (A+ARRAY_NB(A))
-
-#define REPORT_DIFFERENCE(VECTOR, ELEMENT) do {                         \
-        fprintf(stderr, "%s: vector %s: %s differs from expected\n",    \
-                __FILE__, (VECTOR), (ELEMENT));                         \
-    } while (0)
-
-#define REPORT_INVALID(VECTOR) do {                                     \
-        fprintf(stderr, "%s: vector %s: ciphertext/tag invalid\n",      \
-                __FILE__, (VECTOR));                                    \
-    } while (0)
-
-
-static inline FILE* open_dump_file(const char *folder, const char* vector, const char *name)
-{
-    size_t filename_len = snprintf(NULL, 0, "%s/%s_%s.txt", folder, vector, name);
-    char filename[filename_len+1];
-    snprintf(filename, sizeof(filename), "%s/%s_%s.txt", folder, vector, name);
-    return fopen(filename, "w");
-}
-
-
-#endif /* TEST_HELPERS_H */
diff --git a/test/common.mk b/test/common.mk
index 127d44b..be3955f 100644
--- a/test/common.mk
+++ b/test/common.mk
@@ -19,7 +19,7 @@ variant_dir = $(src_dir)/$(mode)-$(keylen)
 
 
 nist_flags = -std=c99 -Wall -Wextra -Wshadow -fsanitize=address,undefined -O2
-CFLAGS += -I$(src_dir) -I$(variant_dir) $(nist_flags) -Werror
+CFLAGS += -I$(src_dir) -I$(variant_dir) -I$(test_dir) $(nist_flags) -Werror
 LDFLAGS += $(nist_flags)
 
 
diff --git a/test/debug.h b/test/debug.h
new file mode 100644
index 0000000..24b7787
--- /dev/null
+++ b/test/debug.h
@@ -0,0 +1,71 @@
+#ifndef DEBUG_H
+#define DEBUG_H
+
+#include <inttypes.h>
+#include <stdio.h>
+
+
+extern FILE *DUMP; /* Define this variable somewhere (eg with DUMP = stderr). */
+
+
+static inline void debug_dump_lanes(const char *header, size_t len, const uint8_t buf[len], int indent)
+{
+    fprintf(DUMP, "%s\n", header);
+
+    for (size_t line=0; line<len/8; line++)
+    {
+        fprintf(DUMP, "%*s", indent, "");
+        for (size_t b=0; b<8; b++)
+        {
+            /* start with MSB */
+            size_t byte_index = len-(1+line*8+b);
+            fprintf(DUMP, "%*s%02x", 5, "", buf[byte_index]);
+        }
+        fprintf(DUMP, "\n");
+    }
+    fprintf(DUMP, "\n");
+}
+
+static inline void debug_dump_buffer(const char *header, size_t len, const uint8_t buf[len], int indent)
+{
+    fprintf(DUMP, "%*s%s\n", indent, "", header);
+
+    if (len%8 != 0)
+    {
+        fprintf(DUMP, "%*s", (int)(3*(8-len%8))+indent, "");
+        for (size_t b=0; b<len%8; b++)
+        {
+            size_t byte_index = len-1-b;
+            fprintf(DUMP, "%02x ", buf[byte_index]);
+        }
+        fprintf(DUMP, "\n");
+    }
+
+    for (size_t line=0; line<len/8; line++)
+    {
+        fprintf(DUMP, "%*s", indent, "");
+        for (size_t b=0; b<8; b++)
+        {
+            /* start with MSB */
+            size_t byte_index = 8*(len/8 - 1 - line) + 7-b;
+            /* fprintf(DUMP, "[%zu / %zu => %zu]", line, b, byte_index); */
+            fprintf(DUMP, "%02x ", buf[byte_index]);
+        }
+        fprintf(DUMP, "\n");
+    }
+
+    fprintf(DUMP, "\n");
+}
+
+static inline void debug_open_dump(const char *folder, const char *suite, const char *vector_name)
+{
+    size_t namelen = snprintf(
+        NULL, 0, "%s/traces-%s-%s.txt", folder, suite, vector_name
+    );
+    char name[namelen+1];
+    snprintf(name, sizeof(name), "%s/traces-%s-%s.txt", folder, suite, vector_name);
+    DUMP = fopen(name, "w");
+}
+
+
+#endif /* DEBUG_H */
diff --git a/test/test-helpers.h b/test/test-helpers.h
new file mode 100644
index 0000000..1991542
--- /dev/null
+++ b/test/test-helpers.h
@@ -0,0 +1,33 @@
+#ifndef TEST_HELPERS_H
+#define TEST_HELPERS_H
+
+#include <stdint.h>
+#include <stdio.h>
+
+#include "parameters.h"
+
+
+#define ARRAY_NB(A) (sizeof(A)/sizeof(A[0]))
+#define ARRAY_END(A) (A+ARRAY_NB(A))
+
+#define REPORT_DIFFERENCE(VECTOR, ELEMENT) do {                         \
+        fprintf(stderr, "%s: vector %s: %s differs from expected\n",    \
+                __FILE__, (VECTOR), (ELEMENT));                         \
+    } while (0)
+
+#define REPORT_INVALID(VECTOR) do {                                     \
+        fprintf(stderr, "%s: vector %s: ciphertext/tag invalid\n",      \
+                __FILE__, (VECTOR));                                    \
+    } while (0)
+
+
+static inline FILE* open_dump_file(const char *folder, const char* vector, const char *name)
+{
+    size_t filename_len = snprintf(NULL, 0, "%s/%s_%s.txt", folder, vector, name);
+    char filename[filename_len+1];
+    snprintf(filename, sizeof(filename), "%s/%s_%s.txt", folder, vector, name);
+    return fopen(filename, "w");
+}
+
+
+#endif /* TEST_HELPERS_H */
-- 
cgit v1.2.3