1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
|
diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-i.c b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-i.c
index 2754fbb..061a24e 100644
--- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-i.c
+++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-i.c
@@ -15,6 +15,8 @@ http://creativecommons.org/publicdomain/zero/1.0/
This file implements Lilliput-AE's nonce-respecting mode based on ΘCB3.
*/
+#include "debug.h"
+
#include <stdbool.h>
#include <stdint.h>
#include <string.h>
@@ -82,32 +84,54 @@ static void _encrypt_message(
memset(tweak, 0, TWEAK_BYTES);
memset(checksum, 0, BLOCK_BYTES);
+ fprintf(DUMP, "message encryption\n");
+
for (size_t j=0; j<l; j++)
{
+ fprintf(DUMP, " j=%zu\n", j);
+
+ debug_dump_buffer("Mj", BLOCK_BYTES, &M[j*BLOCK_BYTES], 8);
xor_into(checksum, &M[j*BLOCK_BYTES]);
+ debug_dump_buffer("Checksum", BLOCK_BYTES, checksum, 8);
_fill_msg_tweak(0x0, N, j, tweak);
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
encrypt(key, tweak, &M[j*BLOCK_BYTES], &C[j*BLOCK_BYTES]);
+ debug_dump_buffer("Cj", BLOCK_BYTES, &C[j*BLOCK_BYTES], 8);
}
if (rest == 0)
{
+ fprintf(DUMP, " no padding\n");
+
_fill_msg_tweak(0x1, N, l-1, tweak);
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
encrypt(key, tweak, checksum, Final);
+ debug_dump_buffer("Final", BLOCK_BYTES, Final, 8);
}
else
{
+ fprintf(DUMP, " padding\n");
+
uint8_t M_rest[BLOCK_BYTES];
uint8_t Pad[BLOCK_BYTES];
pad10(rest, &M[l*BLOCK_BYTES], M_rest);
+ debug_dump_buffer("M*", rest, &M[l*BLOCK_BYTES], 8);
+ debug_dump_buffer("pad10*(M*)", BLOCK_BYTES, M_rest, 8);
xor_into(checksum, M_rest);
+ debug_dump_buffer("Checksum", BLOCK_BYTES, checksum, 8);
_fill_msg_tweak(0x4, N, l, tweak);
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
encrypt(key, tweak, _0n, Pad);
xor_arrays(rest, &C[l*BLOCK_BYTES], &M[l*BLOCK_BYTES], Pad);
+ debug_dump_buffer("Pad", BLOCK_BYTES, Pad, 8);
+ debug_dump_buffer("C*", rest, &C[l*BLOCK_BYTES], 8);
_fill_msg_tweak(0x5, N, l, tweak);
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
encrypt(key, tweak, checksum, Final);
+ debug_dump_buffer("Final", BLOCK_BYTES, Final, 8);
}
}
@@ -129,32 +153,54 @@ static void _decrypt_message(
memset(tweak, 0, TWEAK_BYTES);
memset(checksum, 0, BLOCK_BYTES);
+ fprintf(DUMP, "message decryption\n");
+
for (size_t j=0; j<l; j++)
{
+ fprintf(DUMP, " j=%zu\n", j);
+
+ debug_dump_buffer("Cj", BLOCK_BYTES, &C[j*BLOCK_BYTES], 8);
_fill_msg_tweak(0x0, N, j, tweak);
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
decrypt(key, tweak, &C[j*BLOCK_BYTES], &M[j*BLOCK_BYTES]);
+ debug_dump_buffer("Mj", BLOCK_BYTES, &M[j*BLOCK_BYTES], 8);
xor_into(checksum, &M[j*BLOCK_BYTES]);
+ debug_dump_buffer("Checksum", BLOCK_BYTES, checksum, 8);
}
if (rest == 0)
{
+ fprintf(DUMP, " no padding\n");
+
_fill_msg_tweak(0x1, N, l-1, tweak);
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
encrypt(key, tweak, checksum, Final);
+ debug_dump_buffer("Final", BLOCK_BYTES, Final, 8);
}
else
{
+ fprintf(DUMP, " padding\n");
+
uint8_t M_rest[BLOCK_BYTES];
uint8_t Pad[BLOCK_BYTES];
+ debug_dump_buffer("C*", rest, &C[l*BLOCK_BYTES], 8);
_fill_msg_tweak(0x4, N, l, tweak);
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
encrypt(key, tweak, _0n, Pad);
+ debug_dump_buffer("Pad", BLOCK_BYTES, Pad, 8);
xor_arrays(rest, &M[l*BLOCK_BYTES], &C[l*BLOCK_BYTES], Pad);
+ debug_dump_buffer("M*", rest, &M[l*BLOCK_BYTES], 8);
pad10(rest, &M[l*BLOCK_BYTES], M_rest);
+ debug_dump_buffer("pad10*(M*)", BLOCK_BYTES, M_rest, 8);
xor_into(checksum, M_rest);
_fill_msg_tweak(0x5, N, l, tweak);
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
+ debug_dump_buffer("Checksum", BLOCK_BYTES, checksum, 8);
encrypt(key, tweak, checksum, Final);
+ debug_dump_buffer("Final", BLOCK_BYTES, Final, 8);
}
}
@@ -164,7 +210,13 @@ static void _generate_tag(
uint8_t tag[TAG_BYTES]
)
{
+ fprintf(DUMP, "generating tag\n");
+ debug_dump_buffer("Final", BLOCK_BYTES, Final, 8);
+ debug_dump_buffer("Auth", BLOCK_BYTES, Auth, 8);
+
xor_arrays(TAG_BYTES, tag, Final, Auth);
+
+ debug_dump_buffer("tag", TAG_BYTES, tag, 8);
}
diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-ii.c b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-ii.c
index 862892c..7dfb38e 100644
--- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-ii.c
+++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-ii.c
@@ -15,6 +15,8 @@ http://creativecommons.org/publicdomain/zero/1.0/
This file implements Lilliput-AE's nonce-misuse-resistant mode based on SCT-2.
*/
+#include "debug.h"
+
#include <stdbool.h>
#include <stdint.h>
#include <string.h>
@@ -79,24 +81,40 @@ static void _generate_tag(
size_t l = M_len / BLOCK_BYTES;
size_t rest = M_len % BLOCK_BYTES;
+ fprintf(DUMP, "computing tag\n");
+ debug_dump_buffer("Auth", BLOCK_BYTES, Auth, 8);
+
for (size_t j=0; j<l; j++)
{
+ fprintf(DUMP, " j=%zu\n", j);
fill_index_tweak(0x0, j, tweak);
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
encrypt(key, tweak, &M[j*BLOCK_BYTES], Ek_Mj);
+ debug_dump_buffer("Mj", BLOCK_BYTES, &M[j*BLOCK_BYTES], 8);
+ debug_dump_buffer("Ek(Mj)", BLOCK_BYTES, Ek_Mj, 8);
xor_into(tag_tmp, Ek_Mj);
+ debug_dump_buffer("tag", TAG_BYTES, tag_tmp, 8);
}
if (rest != 0)
{
+ fprintf(DUMP, " l=%zu (padding)\n", l);
uint8_t M_rest[BLOCK_BYTES];
pad10(rest, &M[l*BLOCK_BYTES], M_rest);
fill_index_tweak(0x4, l, tweak);
+ debug_dump_buffer("pad10*(M*)", BLOCK_BYTES, M_rest, 8);
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
encrypt(key, tweak, M_rest, Ek_Mj);
+ debug_dump_buffer("Ek(M*)", BLOCK_BYTES, Ek_Mj, 8);
xor_into(tag_tmp, Ek_Mj);
+ debug_dump_buffer("tag", TAG_BYTES, tag_tmp, 8);
}
+ fprintf(DUMP, " Ek(tag)\n");
_fill_tag_tweak(N, tweak);
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
encrypt(key, tweak, tag_tmp, tag);
+ debug_dump_buffer("tag = Ek(tag)", TAG_BYTES, tag, 8);
}
static void _encrypt_message(
@@ -120,18 +138,33 @@ static void _encrypt_message(
size_t l = M_len / BLOCK_BYTES;
size_t rest = M_len % BLOCK_BYTES;
+ fprintf(DUMP, "message encryption\n");
+
for (size_t j=0; j<l; j++)
{
+ fprintf(DUMP, " j=%zu\n", j);
+
_fill_msg_tweak(tag, j, tweak);
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
encrypt(key, tweak, padded_N, Ek_N);
+ debug_dump_buffer("N (padded)", BLOCK_BYTES, padded_N, 8);
+ debug_dump_buffer("Ek(Mj, N)", BLOCK_BYTES, Ek_N, 8);
+ debug_dump_buffer("Mj", BLOCK_BYTES, &M[j*BLOCK_BYTES], 8);
xor_arrays(BLOCK_BYTES, &C[j*BLOCK_BYTES], &M[j*BLOCK_BYTES], Ek_N);
+ debug_dump_buffer("Cj", BLOCK_BYTES, &C[j*BLOCK_BYTES], 8);
}
if (rest != 0)
{
+ fprintf(DUMP, " l=%zu (padding)\n", l);
_fill_msg_tweak(tag, l, tweak);
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
encrypt(key, tweak, padded_N, Ek_N);
+ debug_dump_buffer("N (padded)", BLOCK_BYTES, padded_N, 8);
+ debug_dump_buffer("Ek(M*, N)", BLOCK_BYTES, Ek_N, 8);
+ debug_dump_buffer("M*", rest, &M[l*BLOCK_BYTES], 8);
xor_arrays(rest, &C[l*BLOCK_BYTES], &M[l*BLOCK_BYTES], Ek_N);
+ debug_dump_buffer("C*", rest, &C[l*BLOCK_BYTES], 8);
}
}
diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-utils.h b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-utils.h
index 6b60adc..0bd77cf 100644
--- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-utils.h
+++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-utils.h
@@ -18,6 +18,8 @@ This file provides functions used by both authenticated encryption modes.
#ifndef LILLIPUT_AE_UTILS_H
#define LILLIPUT_AE_UTILS_H
+#include "debug.h"
+
#include <stddef.h>
#include <stdint.h>
#include <string.h>
@@ -122,20 +124,45 @@ static void process_associated_data(
size_t l_a = A_len / BLOCK_BYTES;
size_t rest = A_len % BLOCK_BYTES;
+ fprintf(DUMP, "computing Auth\n");
+
for (size_t i=0; i<l_a; i++)
{
+ fprintf(DUMP, " i=%zu\n", i);
+
fill_index_tweak(0x2, i, tweak);
+
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
+
encrypt(key, tweak, &A[i*BLOCK_BYTES], Ek_Ai);
+
+ debug_dump_buffer("Ai", BLOCK_BYTES, &A[i*BLOCK_BYTES], 8);
+ debug_dump_buffer("Ek(Ai)", BLOCK_BYTES, Ek_Ai, 8);
+
xor_into(Auth, Ek_Ai);
+
+ debug_dump_buffer("Auth", BLOCK_BYTES, Auth, 8);
}
if (rest != 0)
{
uint8_t A_rest[BLOCK_BYTES];
pad10(rest, &A[l_a*BLOCK_BYTES], A_rest);
+
+ fprintf(DUMP, " l_a=%zu (padding)\n", l_a);
+
fill_index_tweak(0x6, l_a, tweak);
+
+ debug_dump_buffer("pad10*(A*)", BLOCK_BYTES, A_rest, 8);
+ debug_dump_buffer("tweak", TWEAK_BYTES, tweak, 8);
+
encrypt(key, tweak, A_rest, Ek_Ai);
+
+ debug_dump_buffer("Ek(A*)", BLOCK_BYTES, Ek_Ai, 8);
+
xor_into(Auth, Ek_Ai);
+
+ debug_dump_buffer("Auth", BLOCK_BYTES, Auth, 8);
}
}
|
