authorgravatar for 124872+jedisct1@users.noreply.github.comFrank Denis <124872+jedisct1@users.noreply.github.com> 2026-07-05 12:25:21+02:00
committergravatar for 124872+jedisct1@users.noreply.github.comFrank Denis <124872+jedisct1@users.noreply.github.com> 2026-07-05 12:25:21+02:00
log05d745ea634b085380b94e47f006c1a80555aec2
tree7f8e763bd10c91fe02d7b7e01266d76bbe8d88af
parent300116b028df4d80c3088c38ac63f7d6c2da4f3e
parent81f7b7effe02b6d545e6aa1e4b90feec279369c4

Merge pull request 'crypto.aes_ccm: fix the IEEE 802.15.4 test vector' (#35908) from jedisct1/zig:aesccmfix into master

Reviewed-on: https://codeberg.org/ziglang/zig/pulls/35908

2 files changed, 4 insertions(+), 1 deletions(-)

lib/std/crypto.zig+3
...@@ -282,6 +282,8 @@ test {...@@ -282,6 +282,8 @@ test {
282 _ = aead.aes_ocb.Aes128Ocb;282 _ = aead.aes_ocb.Aes128Ocb;
283 _ = aead.aes_ocb.Aes256Ocb;283 _ = aead.aes_ocb.Aes256Ocb;
284284
285 _ = aead.aes_ccm;
286
285 _ = aead.chacha_poly.ChaCha20Poly1305;287 _ = aead.chacha_poly.ChaCha20Poly1305;
286 _ = aead.chacha_poly.ChaCha12Poly1305;288 _ = aead.chacha_poly.ChaCha12Poly1305;
287 _ = aead.chacha_poly.ChaCha8Poly1305;289 _ = aead.chacha_poly.ChaCha8Poly1305;
...@@ -294,6 +296,7 @@ test {...@@ -294,6 +296,7 @@ test {
294296
295 _ = auth.hmac;297 _ = auth.hmac;
296 _ = auth.cmac;298 _ = auth.cmac;
299 _ = auth.cbc_mac;
297 _ = auth.siphash;300 _ = auth.siphash;
298301
299 _ = core.aes;302 _ = core.aes;
lib/std/crypto/aes_ccm.zig+1-1
...@@ -823,7 +823,7 @@ test "Aes128Ccm0 - IEEE 802.15.4 Data Frame (Encryption-only)" {...@@ -823,7 +823,7 @@ test "Aes128Ccm0 - IEEE 802.15.4 Data Frame (Encryption-only)" {
823 var plaintext: [4]u8 = undefined;823 var plaintext: [4]u8 = undefined;
824 _ = try hexToBytes(&plaintext, "61626364");824 _ = try hexToBytes(&plaintext, "61626364");
825 var ad: [26]u8 = undefined;825 var ad: [26]u8 = undefined;
826 _ = try hexToBytes(&ad, "69DC84214302000000004DEAC010000000048DEAC04050000");826 _ = try hexToBytes(&ad, "69DC842143020000000048DEAC010000000048DEAC0405000000");
827827
828 // Expected ciphertext from IEEE spec828 // Expected ciphertext from IEEE spec
829 var expected_ciphertext: [4]u8 = undefined;829 var expected_ciphertext: [4]u8 = undefined;