lilliput-ae-reference-implementation

commit 42b8c9908b04635cabc775c4f86f66cb91497c9f
parent ff288d2f59df26db2c26bb339ac00f45fc6e4d93
Author: Kévin Le Gouguec <kevin.legouguec@airbus.com>
Date:   Wed, 21 Nov 2018 15:45:31 +0100

Renommage de debug_dump_buffer()

Ce nom sera utilisé pour une  fonction plus simple qui ne wrappera pas
à 8 octets.

Diffstat:
M
crypto_aead/lilliputaei128v1/ref/debug.h
 | 
5
++---
M
crypto_aead/lilliputaei128v1/ref/tweakey.c
 | 
16
++++++++--------

2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/crypto_aead/lilliputaei128v1/ref/debug.h b/crypto_aead/lilliputaei128v1/ref/debug.h
@@ -4,7 +4,7 @@
 #include <stdio.h>
 
 
-static inline void debug_dump_buffer(FILE *output, const char *header, size_t len, const uint8_t buf[len], int indent)
+static inline void debug_dump_lanes(FILE *output, const char *header, size_t len, const uint8_t buf[len], int indent)
 {
     if (!output)
     {
@@ -20,8 +20,7 @@ static inline void debug_dump_buffer(FILE *output, const char *header, size_t le
         {
             /* start with MSB */
             size_t byte_index = len-(1+line*8+b);
-            fprintf(output, "%*s", 5, "");
-            fprintf(output, "%02x", buf[byte_index]);
+            fprintf(output, "%*s%02x", 5, "", buf[byte_index]);
         }
         fprintf(output, "\n");
     }
diff --git a/crypto_aead/lilliputaei128v1/ref/tweakey.c b/crypto_aead/lilliputaei128v1/ref/tweakey.c
@@ -25,9 +25,9 @@ void tweakey_state_init(
     memcpy(TK->TK+TWEAK_BYTES, key,   KEY_BYTES);
 
     TK->debug = debug;
-    debug_dump_buffer(debug, "     Tweak is :", TWEAK_BYTES, tweak, 5);
-    debug_dump_buffer(debug, "     Key is :", KEY_BYTES, key, 5);
-    debug_dump_buffer(debug, "     Tweakey is :", sizeof(TK->TK), TK->TK, 5);
+    debug_dump_lanes(debug, "     Tweak is :", TWEAK_BYTES, tweak, 5);
+    debug_dump_lanes(debug, "     Key is :", KEY_BYTES, key, 5);
+    debug_dump_lanes(debug, "     Tweakey is :", sizeof(TK->TK), TK->TK, 5);
 }
 
 
@@ -51,8 +51,8 @@ void tweakey_state_extract(
 
     char debug[512];
     snprintf(debug, sizeof(debug), "     Extracting Subtweakey round  %"PRIu8, i);
-    debug_dump_buffer(TK->debug, debug, sizeof(TK->TK), TK->TK, 5);
-    debug_dump_buffer(TK->debug, "     Subtweakey :", ROUND_TWEAKEY_BYTES, round_tweakey, 5);
+    debug_dump_lanes(TK->debug, debug, sizeof(TK->TK), TK->TK, 5);
+    debug_dump_lanes(TK->debug, "     Subtweakey :", ROUND_TWEAKEY_BYTES, round_tweakey, 5);
 }
 
 
@@ -92,13 +92,13 @@ static void _multiply_state(tweakey_state *TK)
 
 void tweakey_state_update(tweakey_state *TK)
 {
-    debug_dump_buffer(TK->debug, "          Input Tweakey :", sizeof(TK->TK), TK->TK, 10);
+    debug_dump_lanes(TK->debug, "          Input Tweakey :", sizeof(TK->TK), TK->TK, 10);
 
     _permute_state(TK);
 
-    debug_dump_buffer(TK->debug, "          Post permutation Tweakey :", sizeof(TK->TK), TK->TK, 10);
+    debug_dump_lanes(TK->debug, "          Post permutation Tweakey :", sizeof(TK->TK), TK->TK, 10);
 
     _multiply_state(TK);
 
-    debug_dump_buffer(TK->debug, "          Post multiplication Tweakey :", sizeof(TK->TK), TK->TK, 10);
+    debug_dump_lanes(TK->debug, "          Post multiplication Tweakey :", sizeof(TK->TK), TK->TK, 10);
 }