From 2bf9ad6563dede03a321ab85ab00e45b7ff89e1f Mon Sep 17 00:00:00 2001
From: Kévin Le Gouguec <kevin.legouguec@airbus.com>
Date: Thu, 13 Jun 2019 15:16:19 +0200
Subject: Adaptation des tests et des traces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- mise à jour des vecteurs de test i-128/test-ae-*crypt
- affichage des tableaux d'octets par indices croissants
---
 test/debug.h | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'test/debug.h')

diff --git a/test/debug.h b/test/debug.h
index 24b7787..d958475 100644
--- a/test/debug.h
+++ b/test/debug.h
@@ -17,9 +17,7 @@ static inline void debug_dump_lanes(const char *header, size_t len, const uint8_
         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, "%*s%02x", 5, "", buf[line*8+b]);
         }
         fprintf(DUMP, "\n");
     }
@@ -30,26 +28,24 @@ static inline void debug_dump_buffer(const char *header, size_t len, const uint8
 {
     fprintf(DUMP, "%*s%s\n", indent, "", header);
 
-    if (len%8 != 0)
+    for (size_t line=0; line<len/8; line++)
     {
-        fprintf(DUMP, "%*s", (int)(3*(8-len%8))+indent, "");
-        for (size_t b=0; b<len%8; b++)
+        fprintf(DUMP, "%*s", indent, "");
+        for (size_t b=0; b<8; b++)
         {
-            size_t byte_index = len-1-b;
-            fprintf(DUMP, "%02x ", buf[byte_index]);
+            /* fprintf(DUMP, "[%zu / %zu => %zu]", line, b, line*8+b); */
+            fprintf(DUMP, "%02x ", buf[line*8+b]);
         }
         fprintf(DUMP, "\n");
     }
 
-    for (size_t line=0; line<len/8; line++)
+    size_t rest = len%8;
+    if (rest != 0)
     {
         fprintf(DUMP, "%*s", indent, "");
-        for (size_t b=0; b<8; b++)
+        for (size_t b=0; b<rest; 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, "%02x ", buf[len-rest+b]);
         }
         fprintf(DUMP, "\n");
     }
-- 
cgit v1.2.3


From 5e6b7ba5dc688bc9addfd89fca0c532bc2af248c Mon Sep 17 00:00:00 2001
From: Kévin Le Gouguec <kevin.legouguec@airbus.com>
Date: Thu, 4 Jul 2019 17:24:52 +0200
Subject: Ajout d'indices dans les traces

---
 test/debug.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test/debug.h')

diff --git a/test/debug.h b/test/debug.h
index d958475..56cd123 100644
--- a/test/debug.h
+++ b/test/debug.h
@@ -30,7 +30,7 @@ static inline void debug_dump_buffer(const char *header, size_t len, const uint8
 
     for (size_t line=0; line<len/8; line++)
     {
-        fprintf(DUMP, "%*s", indent, "");
+        fprintf(DUMP, "%*s[0x%02zx] ", indent, "", line*8);
         for (size_t b=0; b<8; b++)
         {
             /* fprintf(DUMP, "[%zu / %zu => %zu]", line, b, line*8+b); */
@@ -42,7 +42,7 @@ static inline void debug_dump_buffer(const char *header, size_t len, const uint8
     size_t rest = len%8;
     if (rest != 0)
     {
-        fprintf(DUMP, "%*s", indent, "");
+        fprintf(DUMP, "%*s[0x%02zx] ", indent, "", len-rest);
         for (size_t b=0; b<rest; b++)
         {
             fprintf(DUMP, "%02x ", buf[len-rest+b]);
-- 
cgit v1.2.3