authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-09-29 15:18:06-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-09-29 15:18:06-04:00
loga1ae3f92c1cdbae2333d26ad5da224b91e20cb6f
treeaff26022bffd2f47e7b5f3647648bb7bedaca094
parent65b03092e3414f920de8df9cac60cf973ff56b37
parent8d67f15d36bdd1a094596876796c77606a5e4a83
signature Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #6442 from jedisct1/aegis

std/crypto: add the AEGIS AEADs

5 files changed, 494 insertions(+), 13 deletions(-)

lib/std/crypto.zig+2
......@@ -28,6 +28,8 @@ pub const aead = struct {
2828 pub const Gimli = @import("crypto/gimli.zig").Aead;
2929 pub const ChaCha20Poly1305 = chacha20.Chacha20Poly1305;
3030 pub const XChaCha20Poly1305 = chacha20.XChacha20Poly1305;
31 pub const AEGIS128L = @import("crypto/aegis.zig").AEGIS128L;
32 pub const AEGIS256 = @import("crypto/aegis.zig").AEGIS256;
3133};
3234
3335/// MAC functions requiring single-use secret keys.
lib/std/crypto/aegis.zig created+447
......@@ -0,0 +1,447 @@
1const std = @import("std");
2const mem = std.mem;
3const assert = std.debug.assert;
4const AESBlock = std.crypto.core.aes.Block;
5
6const State128L = struct {
7 blocks: [8]AESBlock,
8
9 fn init(key: [16]u8, nonce: [16]u8) State128L {
10 const c1 = AESBlock.fromBytes(&[16]u8{ 0xdb, 0x3d, 0x18, 0x55, 0x6d, 0xc2, 0x2f, 0xf1, 0x20, 0x11, 0x31, 0x42, 0x73, 0xb5, 0x28, 0xdd });
11 const c2 = AESBlock.fromBytes(&[16]u8{ 0x0, 0x1, 0x01, 0x02, 0x03, 0x05, 0x08, 0x0d, 0x15, 0x22, 0x37, 0x59, 0x90, 0xe9, 0x79, 0x62 });
12 const key_block = AESBlock.fromBytes(&key);
13 const nonce_block = AESBlock.fromBytes(&nonce);
14 const blocks = [8]AESBlock{
15 key_block.xorBlocks(nonce_block),
16 c1,
17 c2,
18 c1,
19 key_block.xorBlocks(nonce_block),
20 key_block.xorBlocks(c2),
21 key_block.xorBlocks(c1),
22 key_block.xorBlocks(c2),
23 };
24 var state = State128L{ .blocks = blocks };
25 var i: usize = 0;
26 while (i < 10) : (i += 1) {
27 state.update(nonce_block, key_block);
28 }
29 return state;
30 }
31
32 inline fn update(state: *State128L, d1: AESBlock, d2: AESBlock) void {
33 const blocks = &state.blocks;
34 const tmp = blocks[7];
35 comptime var i: usize = 7;
36 inline while (i > 0) : (i -= 1) {
37 blocks[i] = blocks[i - 1].encrypt(blocks[i]);
38 }
39 blocks[0] = tmp.encrypt(blocks[0]);
40 blocks[0] = blocks[0].xorBlocks(d1);
41 blocks[4] = blocks[4].xorBlocks(d2);
42 }
43
44 fn enc(state: *State128L, dst: *[32]u8, src: *const [32]u8) void {
45 const blocks = &state.blocks;
46 const msg0 = AESBlock.fromBytes(src[0..16]);
47 const msg1 = AESBlock.fromBytes(src[16..32]);
48 var tmp0 = msg0.xorBlocks(blocks[6]).xorBlocks(blocks[1]);
49 var tmp1 = msg1.xorBlocks(blocks[2]).xorBlocks(blocks[5]);
50 tmp0 = tmp0.xorBlocks(blocks[2].andBlocks(blocks[3]));
51 tmp1 = tmp1.xorBlocks(blocks[6].andBlocks(blocks[7]));
52 dst[0..16].* = tmp0.toBytes();
53 dst[16..32].* = tmp1.toBytes();
54 state.update(msg0, msg1);
55 }
56
57 fn dec(state: *State128L, dst: *[32]u8, src: *const [32]u8) void {
58 const blocks = &state.blocks;
59 var msg0 = AESBlock.fromBytes(src[0..16]).xorBlocks(blocks[6]).xorBlocks(blocks[1]);
60 var msg1 = AESBlock.fromBytes(src[16..32]).xorBlocks(blocks[2]).xorBlocks(blocks[5]);
61 msg0 = msg0.xorBlocks(blocks[2].andBlocks(blocks[3]));
62 msg1 = msg1.xorBlocks(blocks[6].andBlocks(blocks[7]));
63 dst[0..16].* = msg0.toBytes();
64 dst[16..32].* = msg1.toBytes();
65 state.update(msg0, msg1);
66 }
67
68 fn mac(state: *State128L, adlen: usize, mlen: usize) [16]u8 {
69 const blocks = &state.blocks;
70 var sizes: [16]u8 = undefined;
71 mem.writeIntLittle(u64, sizes[0..8], adlen * 8);
72 mem.writeIntLittle(u64, sizes[8..16], mlen * 8);
73 const tmp = AESBlock.fromBytes(&sizes).xorBlocks(blocks[2]);
74 var i: usize = 0;
75 while (i < 7) : (i += 1) {
76 state.update(tmp, tmp);
77 }
78 return blocks[0].xorBlocks(blocks[1]).xorBlocks(blocks[2]).xorBlocks(blocks[3]).xorBlocks(blocks[4]).
79 xorBlocks(blocks[5]).xorBlocks(blocks[6]).toBytes();
80 }
81};
82
83/// AEGIS is a very fast authenticated encryption system built on top of the core AES function.
84///
85/// The 128L variant of AEGIS has a 128 bit key, a 128 bit nonce, and processes 256 bit message blocks.
86/// It was designed to fully exploit the parallelism and built-in AES support of recent Intel and ARM CPUs.
87///
88/// https://competitions.cr.yp.to/round3/aegisv11.pdf
89pub const AEGIS128L = struct {
90 pub const tag_length = 16;
91 pub const nonce_length = 16;
92 pub const key_length = 16;
93
94 /// c: ciphertext: output buffer should be of size m.len
95 /// tag: authentication tag: output MAC
96 /// m: message
97 /// ad: Associated Data
98 /// npub: public nonce
99 /// k: private key
100 pub fn encrypt(c: []u8, tag: *[tag_length]u8, m: []const u8, ad: []const u8, npub: [nonce_length]u8, key: [key_length]u8) void {
101 assert(c.len == m.len);
102 var state = State128L.init(key, npub);
103 var src: [32]u8 align(16) = undefined;
104 var dst: [32]u8 align(16) = undefined;
105 var i: usize = 0;
106 while (i + 32 <= ad.len) : (i += 32) {
107 state.enc(&dst, ad[i..][0..32]);
108 }
109 if (ad.len % 32 != 0) {
110 mem.set(u8, src[0..], 0);
111 mem.copy(u8, src[0 .. ad.len % 32], ad[i .. i + ad.len % 32]);
112 state.enc(&dst, &src);
113 }
114 i = 0;
115 while (i + 32 <= m.len) : (i += 32) {
116 state.enc(c[i..][0..32], m[i..][0..32]);
117 }
118 if (m.len % 32 != 0) {
119 mem.set(u8, src[0..], 0);
120 mem.copy(u8, src[0 .. m.len % 32], m[i .. i + m.len % 32]);
121 state.enc(&dst, &src);
122 mem.copy(u8, c[i .. i + m.len % 32], dst[0 .. m.len % 32]);
123 }
124 tag.* = state.mac(ad.len, m.len);
125 }
126
127 /// m: message: output buffer should be of size c.len
128 /// c: ciphertext
129 /// tag: authentication tag
130 /// ad: Associated Data
131 /// npub: public nonce
132 /// k: private key
133 pub fn decrypt(m: []u8, c: []const u8, tag: [tag_length]u8, ad: []const u8, npub: [nonce_length]u8, key: [key_length]u8) !void {
134 assert(c.len == m.len);
135 var state = State128L.init(key, npub);
136 var src: [32]u8 align(16) = undefined;
137 var dst: [32]u8 align(16) = undefined;
138 var i: usize = 0;
139 while (i + 32 <= ad.len) : (i += 32) {
140 state.enc(&dst, ad[i..][0..32]);
141 }
142 if (ad.len % 32 != 0) {
143 mem.set(u8, src[0..], 0);
144 mem.copy(u8, src[0 .. ad.len % 32], ad[i .. i + ad.len % 32]);
145 state.enc(&dst, &src);
146 }
147 i = 0;
148 while (i + 32 <= m.len) : (i += 32) {
149 state.dec(m[i..][0..32], c[i..][0..32]);
150 }
151 if (m.len % 32 != 0) {
152 mem.set(u8, src[0..], 0);
153 mem.copy(u8, src[0 .. m.len % 32], c[i .. i + m.len % 32]);
154 state.dec(&dst, &src);
155 mem.copy(u8, m[i .. i + m.len % 32], dst[0 .. m.len % 32]);
156 mem.set(u8, dst[0 .. m.len % 32], 0);
157 const blocks = &state.blocks;
158 blocks[0] = blocks[0].xorBlocks(AESBlock.fromBytes(dst[0..16]));
159 blocks[4] = blocks[4].xorBlocks(AESBlock.fromBytes(dst[16..32]));
160 }
161 const computed_tag = state.mac(ad.len, m.len);
162 var acc: u8 = 0;
163 for (computed_tag) |_, j| {
164 acc |= (computed_tag[j] ^ tag[j]);
165 }
166 if (acc != 0) {
167 mem.set(u8, m, 0xaa);
168 return error.AuthenticationFailed;
169 }
170 }
171};
172
173const State256 = struct {
174 blocks: [6]AESBlock,
175
176 fn init(key: [32]u8, nonce: [32]u8) State256 {
177 const c1 = AESBlock.fromBytes(&[16]u8{ 0xdb, 0x3d, 0x18, 0x55, 0x6d, 0xc2, 0x2f, 0xf1, 0x20, 0x11, 0x31, 0x42, 0x73, 0xb5, 0x28, 0xdd });
178 const c2 = AESBlock.fromBytes(&[16]u8{ 0x0, 0x1, 0x01, 0x02, 0x03, 0x05, 0x08, 0x0d, 0x15, 0x22, 0x37, 0x59, 0x90, 0xe9, 0x79, 0x62 });
179 const key_block1 = AESBlock.fromBytes(key[0..16]);
180 const key_block2 = AESBlock.fromBytes(key[16..32]);
181 const nonce_block1 = AESBlock.fromBytes(nonce[0..16]);
182 const nonce_block2 = AESBlock.fromBytes(nonce[16..32]);
183 const kxn1 = key_block1.xorBlocks(nonce_block1);
184 const kxn2 = key_block2.xorBlocks(nonce_block2);
185 const blocks = [6]AESBlock{
186 kxn1,
187 kxn2,
188 c1,
189 c2,
190 key_block1.xorBlocks(c2),
191 key_block2.xorBlocks(c1),
192 };
193 var state = State256{ .blocks = blocks };
194 var i: usize = 0;
195 while (i < 4) : (i += 1) {
196 state.update(key_block1);
197 state.update(key_block2);
198 state.update(kxn1);
199 state.update(kxn2);
200 }
201 return state;
202 }
203
204 inline fn update(state: *State256, d: AESBlock) void {
205 const blocks = &state.blocks;
206 const tmp = blocks[5].encrypt(blocks[0]);
207 comptime var i: usize = 5;
208 inline while (i > 0) : (i -= 1) {
209 blocks[i] = blocks[i - 1].encrypt(blocks[i]);
210 }
211 blocks[0] = tmp.xorBlocks(d);
212 }
213
214 fn enc(state: *State256, dst: *[16]u8, src: *const [16]u8) void {
215 const blocks = &state.blocks;
216 const msg = AESBlock.fromBytes(src);
217 var tmp = msg.xorBlocks(blocks[5]).xorBlocks(blocks[4]).xorBlocks(blocks[1]);
218 tmp = tmp.xorBlocks(blocks[2].andBlocks(blocks[3]));
219 dst.* = tmp.toBytes();
220 state.update(msg);
221 }
222
223 fn dec(state: *State256, dst: *[16]u8, src: *const [16]u8) void {
224 const blocks = &state.blocks;
225 var msg = AESBlock.fromBytes(src).xorBlocks(blocks[5]).xorBlocks(blocks[4]).xorBlocks(blocks[1]);
226 msg = msg.xorBlocks(blocks[2].andBlocks(blocks[3]));
227 dst.* = msg.toBytes();
228 state.update(msg);
229 }
230
231 fn mac(state: *State256, adlen: usize, mlen: usize) [16]u8 {
232 const blocks = &state.blocks;
233 var sizes: [16]u8 = undefined;
234 mem.writeIntLittle(u64, sizes[0..8], adlen * 8);
235 mem.writeIntLittle(u64, sizes[8..16], mlen * 8);
236 const tmp = AESBlock.fromBytes(&sizes).xorBlocks(blocks[3]);
237 var i: usize = 0;
238 while (i < 7) : (i += 1) {
239 state.update(tmp);
240 }
241 return blocks[0].xorBlocks(blocks[1]).xorBlocks(blocks[2]).xorBlocks(blocks[3]).xorBlocks(blocks[4]).
242 xorBlocks(blocks[5]).toBytes();
243 }
244};
245
246/// AEGIS is a very fast authenticated encryption system built on top of the core AES function.
247///
248/// The 256 bit variant of AEGIS has a 256 bit key, a 256 bit nonce, and processes 128 bit message blocks.
249///
250/// https://competitions.cr.yp.to/round3/aegisv11.pdf
251pub const AEGIS256 = struct {
252 pub const tag_length = 16;
253 pub const nonce_length = 32;
254 pub const key_length = 32;
255
256 /// c: ciphertext: output buffer should be of size m.len
257 /// tag: authentication tag: output MAC
258 /// m: message
259 /// ad: Associated Data
260 /// npub: public nonce
261 /// k: private key
262 pub fn encrypt(c: []u8, tag: *[tag_length]u8, m: []const u8, ad: []const u8, npub: [nonce_length]u8, key: [key_length]u8) void {
263 assert(c.len == m.len);
264 var state = State256.init(key, npub);
265 var src: [16]u8 align(16) = undefined;
266 var dst: [16]u8 align(16) = undefined;
267 var i: usize = 0;
268 while (i + 16 <= ad.len) : (i += 16) {
269 state.enc(&dst, ad[i..][0..16]);
270 }
271 if (ad.len % 16 != 0) {
272 mem.set(u8, src[0..], 0);
273 mem.copy(u8, src[0 .. ad.len % 16], ad[i .. i + ad.len % 16]);
274 state.enc(&dst, &src);
275 }
276 i = 0;
277 while (i + 16 <= m.len) : (i += 16) {
278 state.enc(c[i..][0..16], m[i..][0..16]);
279 }
280 if (m.len % 16 != 0) {
281 mem.set(u8, src[0..], 0);
282 mem.copy(u8, src[0 .. m.len % 16], m[i .. i + m.len % 16]);
283 state.enc(&dst, &src);
284 mem.copy(u8, c[i .. i + m.len % 16], dst[0 .. m.len % 16]);
285 }
286 tag.* = state.mac(ad.len, m.len);
287 }
288
289 /// m: message: output buffer should be of size c.len
290 /// c: ciphertext
291 /// tag: authentication tag
292 /// ad: Associated Data
293 /// npub: public nonce
294 /// k: private key
295 pub fn decrypt(m: []u8, c: []const u8, tag: [tag_length]u8, ad: []const u8, npub: [nonce_length]u8, key: [key_length]u8) !void {
296 assert(c.len == m.len);
297 var state = State256.init(key, npub);
298 var src: [16]u8 align(16) = undefined;
299 var dst: [16]u8 align(16) = undefined;
300 var i: usize = 0;
301 while (i + 16 <= ad.len) : (i += 16) {
302 state.enc(&dst, ad[i..][0..16]);
303 }
304 if (ad.len % 16 != 0) {
305 mem.set(u8, src[0..], 0);
306 mem.copy(u8, src[0 .. ad.len % 16], ad[i .. i + ad.len % 16]);
307 state.enc(&dst, &src);
308 }
309 i = 0;
310 while (i + 16 <= m.len) : (i += 16) {
311 state.dec(m[i..][0..16], c[i..][0..16]);
312 }
313 if (m.len % 16 != 0) {
314 mem.set(u8, src[0..], 0);
315 mem.copy(u8, src[0 .. m.len % 16], c[i .. i + m.len % 16]);
316 state.dec(&dst, &src);
317 mem.copy(u8, m[i .. i + m.len % 16], dst[0 .. m.len % 16]);
318 mem.set(u8, dst[0 .. m.len % 16], 0);
319 const blocks = &state.blocks;
320 blocks[0] = blocks[0].xorBlocks(AESBlock.fromBytes(&dst));
321 }
322 const computed_tag = state.mac(ad.len, m.len);
323 var acc: u8 = 0;
324 for (computed_tag) |_, j| {
325 acc |= (computed_tag[j] ^ tag[j]);
326 }
327 if (acc != 0) {
328 mem.set(u8, m, 0xaa);
329 return error.AuthenticationFailed;
330 }
331 }
332};
333
334const htest = @import("test.zig");
335const testing = std.testing;
336
337test "AEGIS128L test vector 1" {
338 const key: [AEGIS128L.key_length]u8 = [_]u8{ 0x10, 0x01 } ++ [_]u8{0x00} ** 14;
339 const nonce: [AEGIS128L.nonce_length]u8 = [_]u8{ 0x10, 0x00, 0x02 } ++ [_]u8{0x00} ** 13;
340 const ad = [8]u8{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 };
341 const m = [32]u8{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f };
342 var c: [m.len]u8 = undefined;
343 var m2: [m.len]u8 = undefined;
344 var tag: [AEGIS128L.tag_length]u8 = undefined;
345
346 AEGIS128L.encrypt(&c, &tag, &m, &ad, nonce, key);
347 try AEGIS128L.decrypt(&m2, &c, tag, &ad, nonce, key);
348 testing.expectEqualSlices(u8, &m, &m2);
349
350 htest.assertEqual("79d94593d8c2119d7e8fd9b8fc77845c5c077a05b2528b6ac54b563aed8efe84", &c);
351 htest.assertEqual("cc6f3372f6aa1bb82388d695c3962d9a", &tag);
352
353 c[0] +%= 1;
354 testing.expectError(error.AuthenticationFailed, AEGIS128L.decrypt(&m2, &c, tag, &ad, nonce, key));
355 c[0] -%= 1;
356 tag[0] +%= 1;
357 testing.expectError(error.AuthenticationFailed, AEGIS128L.decrypt(&m2, &c, tag, &ad, nonce, key));
358}
359
360test "AEGIS128L test vector 2" {
361 const key: [AEGIS128L.key_length]u8 = [_]u8{0x00} ** 16;
362 const nonce: [AEGIS128L.nonce_length]u8 = [_]u8{0x00} ** 16;
363 const ad = [_]u8{};
364 const m = [_]u8{0x00} ** 16;
365 var c: [m.len]u8 = undefined;
366 var m2: [m.len]u8 = undefined;
367 var tag: [AEGIS128L.tag_length]u8 = undefined;
368
369 AEGIS128L.encrypt(&c, &tag, &m, &ad, nonce, key);
370 try AEGIS128L.decrypt(&m2, &c, tag, &ad, nonce, key);
371 testing.expectEqualSlices(u8, &m, &m2);
372
373 htest.assertEqual("41de9000a7b5e40e2d68bb64d99ebb19", &c);
374 htest.assertEqual("f4d997cc9b94227ada4fe4165422b1c8", &tag);
375}
376
377test "AEGIS128L test vector 3" {
378 const key: [AEGIS128L.key_length]u8 = [_]u8{0x00} ** 16;
379 const nonce: [AEGIS128L.nonce_length]u8 = [_]u8{0x00} ** 16;
380 const ad = [_]u8{};
381 const m = [_]u8{};
382 var c: [m.len]u8 = undefined;
383 var m2: [m.len]u8 = undefined;
384 var tag: [AEGIS128L.tag_length]u8 = undefined;
385
386 AEGIS128L.encrypt(&c, &tag, &m, &ad, nonce, key);
387 try AEGIS128L.decrypt(&m2, &c, tag, &ad, nonce, key);
388 testing.expectEqualSlices(u8, &m, &m2);
389
390 htest.assertEqual("83cc600dc4e3e7e62d4055826174f149", &tag);
391}
392
393test "AEGIS256 test vector 1" {
394 const key: [AEGIS256.key_length]u8 = [_]u8{ 0x10, 0x01 } ++ [_]u8{0x00} ** 30;
395 const nonce: [AEGIS256.nonce_length]u8 = [_]u8{ 0x10, 0x00, 0x02 } ++ [_]u8{0x00} ** 29;
396 const ad = [8]u8{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 };
397 const m = [32]u8{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f };
398 var c: [m.len]u8 = undefined;
399 var m2: [m.len]u8 = undefined;
400 var tag: [AEGIS256.tag_length]u8 = undefined;
401
402 AEGIS256.encrypt(&c, &tag, &m, &ad, nonce, key);
403 try AEGIS256.decrypt(&m2, &c, tag, &ad, nonce, key);
404 testing.expectEqualSlices(u8, &m, &m2);
405
406 htest.assertEqual("f373079ed84b2709faee373584585d60accd191db310ef5d8b11833df9dec711", &c);
407 htest.assertEqual("8d86f91ee606e9ff26a01b64ccbdd91d", &tag);
408
409 c[0] +%= 1;
410 testing.expectError(error.AuthenticationFailed, AEGIS256.decrypt(&m2, &c, tag, &ad, nonce, key));
411 c[0] -%= 1;
412 tag[0] +%= 1;
413 testing.expectError(error.AuthenticationFailed, AEGIS256.decrypt(&m2, &c, tag, &ad, nonce, key));
414}
415
416test "AEGIS256 test vector 2" {
417 const key: [AEGIS256.key_length]u8 = [_]u8{0x00} ** 32;
418 const nonce: [AEGIS256.nonce_length]u8 = [_]u8{0x00} ** 32;
419 const ad = [_]u8{};
420 const m = [_]u8{0x00} ** 16;
421 var c: [m.len]u8 = undefined;
422 var m2: [m.len]u8 = undefined;
423 var tag: [AEGIS256.tag_length]u8 = undefined;
424
425 AEGIS256.encrypt(&c, &tag, &m, &ad, nonce, key);
426 try AEGIS256.decrypt(&m2, &c, tag, &ad, nonce, key);
427 testing.expectEqualSlices(u8, &m, &m2);
428
429 htest.assertEqual("b98f03a947807713d75a4fff9fc277a6", &c);
430 htest.assertEqual("478f3b50dc478ef7d5cf2d0f7cc13180", &tag);
431}
432
433test "AEGIS256 test vector 3" {
434 const key: [AEGIS256.key_length]u8 = [_]u8{0x00} ** 32;
435 const nonce: [AEGIS256.nonce_length]u8 = [_]u8{0x00} ** 32;
436 const ad = [_]u8{};
437 const m = [_]u8{};
438 var c: [m.len]u8 = undefined;
439 var m2: [m.len]u8 = undefined;
440 var tag: [AEGIS256.tag_length]u8 = undefined;
441
442 AEGIS256.encrypt(&c, &tag, &m, &ad, nonce, key);
443 try AEGIS256.decrypt(&m2, &c, tag, &ad, nonce, key);
444 testing.expectEqualSlices(u8, &m, &m2);
445
446 htest.assertEqual("f7a0878f68bd083e8065354071fc27c3", &tag);
447}
lib/std/crypto/aes/aesni.zig+18-8
......@@ -84,11 +84,21 @@ pub const Block = struct {
8484 };
8585 }
8686
87 /// XOR the content of two blocks.
88 pub inline fn xor(block1: Block, block2: Block) Block {
87 /// Apply the bitwise XOR operation to the content of two blocks.
88 pub inline fn xorBlocks(block1: Block, block2: Block) Block {
8989 return Block{ .repr = block1.repr ^ block2.repr };
9090 }
9191
92 /// Apply the bitwise AND operation to the content of two blocks.
93 pub inline fn andBlocks(block1: Block, block2: Block) Block {
94 return Block{ .repr = block1.repr & block2.repr };
95 }
96
97 /// Apply the bitwise OR operation to the content of two blocks.
98 pub inline fn orBlocks(block1: Block, block2: Block) Block {
99 return Block{ .repr = block1.repr | block2.repr };
100 }
101
92102 /// Perform operations on multiple blocks in parallel.
93103 pub const parallel = struct {
94104 /// The recommended number of AES encryption/decryption to perform in parallel for the chosen implementation.
......@@ -261,7 +271,7 @@ pub fn AESEncryptCtx(comptime AES: type) type {
261271 /// Encrypt a single block.
262272 pub fn encrypt(ctx: Self, dst: *[16]u8, src: *const [16]u8) void {
263273 const round_keys = ctx.key_schedule.round_keys;
264 var t = Block.fromBytes(src).xor(round_keys[0]);
274 var t = Block.fromBytes(src).xorBlocks(round_keys[0]);
265275 comptime var i = 1;
266276 inline while (i < rounds) : (i += 1) {
267277 t = t.encrypt(round_keys[i]);
......@@ -273,7 +283,7 @@ pub fn AESEncryptCtx(comptime AES: type) type {
273283 /// Encrypt+XOR a single block.
274284 pub fn xor(ctx: Self, dst: *[16]u8, src: *const [16]u8, counter: [16]u8) void {
275285 const round_keys = ctx.key_schedule.round_keys;
276 var t = Block.fromBytes(&counter).xor(round_keys[0]);
286 var t = Block.fromBytes(&counter).xorBlocks(round_keys[0]);
277287 comptime var i = 1;
278288 inline while (i < rounds) : (i += 1) {
279289 t = t.encrypt(round_keys[i]);
......@@ -288,7 +298,7 @@ pub fn AESEncryptCtx(comptime AES: type) type {
288298 var ts: [count]Block = undefined;
289299 comptime var j = 0;
290300 inline while (j < count) : (j += 1) {
291 ts[j] = Block.fromBytes(src[j * 16 .. j * 16 + 16][0..16]).xor(round_keys[0]);
301 ts[j] = Block.fromBytes(src[j * 16 .. j * 16 + 16][0..16]).xorBlocks(round_keys[0]);
292302 }
293303 comptime var i = 1;
294304 inline while (i < rounds) : (i += 1) {
......@@ -310,7 +320,7 @@ pub fn AESEncryptCtx(comptime AES: type) type {
310320 var ts: [count]Block = undefined;
311321 comptime var j = 0;
312322 inline while (j < count) : (j += 1) {
313 ts[j] = Block.fromBytes(counters[j * 16 .. j * 16 + 16][0..16]).xor(round_keys[0]);
323 ts[j] = Block.fromBytes(counters[j * 16 .. j * 16 + 16][0..16]).xorBlocks(round_keys[0]);
314324 }
315325 comptime var i = 1;
316326 inline while (i < rounds) : (i += 1) {
......@@ -352,7 +362,7 @@ pub fn AESDecryptCtx(comptime AES: type) type {
352362 /// Decrypt a single block.
353363 pub fn decrypt(ctx: Self, dst: *[16]u8, src: *const [16]u8) void {
354364 const inv_round_keys = ctx.key_schedule.round_keys;
355 var t = Block.fromBytes(src).xor(inv_round_keys[0]);
365 var t = Block.fromBytes(src).xorBlocks(inv_round_keys[0]);
356366 comptime var i = 1;
357367 inline while (i < rounds) : (i += 1) {
358368 t = t.decrypt(inv_round_keys[i]);
......@@ -367,7 +377,7 @@ pub fn AESDecryptCtx(comptime AES: type) type {
367377 var ts: [count]Block = undefined;
368378 comptime var j = 0;
369379 inline while (j < count) : (j += 1) {
370 ts[j] = Block.fromBytes(src[j * 16 .. j * 16 + 16][0..16]).xor(inv_round_keys[0]);
380 ts[j] = Block.fromBytes(src[j * 16 .. j * 16 + 16][0..16]).xorBlocks(inv_round_keys[0]);
371381 }
372382 comptime var i = 1;
373383 inline while (i < rounds) : (i += 1) {
lib/std/crypto/aes/soft.zig+25-5
......@@ -125,8 +125,8 @@ pub const Block = struct {
125125 return Block{ .repr = BlockVec{ s0, s1, s2, s3 } };
126126 }
127127
128 /// XOR the content of two blocks.
129 pub inline fn xor(block1: Block, block2: Block) Block {
128 /// Apply the bitwise XOR operation to the content of two blocks.
129 pub inline fn xorBlocks(block1: Block, block2: Block) Block {
130130 var x: BlockVec = undefined;
131131 comptime var i = 0;
132132 inline while (i < 4) : (i += 1) {
......@@ -135,6 +135,26 @@ pub const Block = struct {
135135 return Block{ .repr = x };
136136 }
137137
138 /// Apply the bitwise AND operation to the content of two blocks.
139 pub inline fn andBlocks(block1: Block, block2: Block) Block {
140 var x: BlockVec = undefined;
141 comptime var i = 0;
142 inline while (i < 4) : (i += 1) {
143 x[i] = block1.repr[i] & block2.repr[i];
144 }
145 return Block{ .repr = x };
146 }
147
148 /// Apply the bitwise OR operation to the content of two blocks.
149 pub inline fn orBlocks(block1: Block, block2: Block) Block {
150 var x: BlockVec = undefined;
151 comptime var i = 0;
152 inline while (i < 4) : (i += 1) {
153 x[i] = block1.repr[i] | block2.repr[i];
154 }
155 return Block{ .repr = x };
156 }
157
138158 /// Perform operations on multiple blocks in parallel.
139159 pub const parallel = struct {
140160 /// The recommended number of AES encryption/decryption to perform in parallel for the chosen implementation.
......@@ -283,7 +303,7 @@ pub fn AESEncryptCtx(comptime AES: type) type {
283303 /// Encrypt a single block.
284304 pub fn encrypt(ctx: Self, dst: *[16]u8, src: *const [16]u8) void {
285305 const round_keys = ctx.key_schedule.round_keys;
286 var t = Block.fromBytes(src).xor(round_keys[0]);
306 var t = Block.fromBytes(src).xorBlocks(round_keys[0]);
287307 comptime var i = 1;
288308 inline while (i < rounds) : (i += 1) {
289309 t = t.encrypt(round_keys[i]);
......@@ -295,7 +315,7 @@ pub fn AESEncryptCtx(comptime AES: type) type {
295315 /// Encrypt+XOR a single block.
296316 pub fn xor(ctx: Self, dst: *[16]u8, src: *const [16]u8, counter: [16]u8) void {
297317 const round_keys = ctx.key_schedule.round_keys;
298 var t = Block.fromBytes(&counter).xor(round_keys[0]);
318 var t = Block.fromBytes(&counter).xorBlocks(round_keys[0]);
299319 comptime var i = 1;
300320 inline while (i < rounds) : (i += 1) {
301321 t = t.encrypt(round_keys[i]);
......@@ -349,7 +369,7 @@ pub fn AESDecryptCtx(comptime AES: type) type {
349369 /// Decrypt a single block.
350370 pub fn decrypt(ctx: Self, dst: *[16]u8, src: *const [16]u8) void {
351371 const inv_round_keys = ctx.key_schedule.round_keys;
352 var t = Block.fromBytes(src).xor(inv_round_keys[0]);
372 var t = Block.fromBytes(src).xorBlocks(inv_round_keys[0]);
353373 comptime var i = 1;
354374 inline while (i < rounds) : (i += 1) {
355375 t = t.decrypt(inv_round_keys[i]);
lib/std/crypto/benchmark.zig+2
......@@ -149,6 +149,8 @@ const aeads = [_]Crypto{
149149 Crypto{ .ty = crypto.aead.ChaCha20Poly1305, .name = "chacha20Poly1305" },
150150 Crypto{ .ty = crypto.aead.XChaCha20Poly1305, .name = "xchacha20Poly1305" },
151151 Crypto{ .ty = crypto.aead.Gimli, .name = "gimli-aead" },
152 Crypto{ .ty = crypto.aead.AEGIS128L, .name = "aegis-128l" },
153 Crypto{ .ty = crypto.aead.AEGIS256, .name = "aegis-256" },
152154};
153155
154156pub fn benchmarkAead(comptime Aead: anytype, comptime bytes: comptime_int) !u64 {