authorgravatar for 124872+jedisct1@users.noreply.github.comFrank Denis <124872+jedisct1@users.noreply.github.com> 2024-08-22 07:54:12+02:00
committergravatar for 124872+jedisct1@users.noreply.github.comFrank Denis <124872+jedisct1@users.noreply.github.com> 2024-08-22 07:54:12+02:00
logb131b6dd3639ff4c449c73978ddc77f51161fd9b
tree08ec1c932a7e4d462e74983cf7607ef3599db147
parent067ae04e0b34bfba9bdb192705731fbf9801e69f

Rename the namespace for ml_kem variants of Kyber to nist

2 files changed, 16 insertions(+), 22 deletions(-)

lib/std/crypto.zig+3-2
...@@ -74,8 +74,9 @@ pub const dh = struct {...@@ -74,8 +74,9 @@ pub const dh = struct {
7474
75/// Key Encapsulation Mechanisms.75/// Key Encapsulation Mechanisms.
76pub const kem = struct {76pub const kem = struct {
77 pub const kyber_d00 = @import("crypto/ml_kem.zig").kyber_d00;77 pub const kyber_d00 = @import("crypto/ml_kem.zig").d00;
78 pub const ml_kem_01 = @import("crypto/ml_kem.zig").ml_kem_01;78 pub const ml_kem = @import("crypto/ml_kem.zig").nist;
79 pub const ml_kem_01 = @compileError("deprecated: final version of the specification has been published, use ml_kem instead");
79};80};
8081
81/// Elliptic-curve arithmetic.82/// Elliptic-curve arithmetic.
lib/std/crypto/ml_kem.zig+13-20
...@@ -1,13 +1,8 @@...@@ -1,13 +1,8 @@
1//! Implementation of the IND-CCA2 post-quantum secure key encapsulation mechanism (KEM)1//! Implementation of the IND-CCA2 post-quantum secure key encapsulation mechanism (KEM)
2//! ML-KEM (NIST FIPS-203 publication) and CRYSTALS-Kyber (v3.02/"draft00" CFRG draft).2//! ML-KEM (NIST FIPS-203 publication) and CRYSTALS-Kyber (v3.02/"draft00" CFRG draft).
3//!3//!
4//! The Kyber namespace suffix (currently `_d00`) refers to the version currently4//! The namespace `d00` refers to the version currently implemented, in accordance with the CFRG draft.
5//! implemented, in accordance with the CFRG draft.5//! The `nist` namespace refers to the FIPS-203 publication.
6//!
7//! The ML-KEM namespace refers to the FIPS-203 publication.
8//!
9//! Suffixes may not be updated if new versions of the documents only include editorial changes.
10//! The suffixes will be removed once the schemes are finalized.
11//!6//!
12//! Quoting from the CFRG I-D:7//! Quoting from the CFRG I-D:
13//!8//!
...@@ -146,7 +141,7 @@ const Params = struct {...@@ -146,7 +141,7 @@ const Params = struct {
146 dv: u8,141 dv: u8,
147};142};
148143
149pub const kyber_d00 = struct {144pub const d00 = struct {
150 pub const Kyber512 = Kyber(.{145 pub const Kyber512 = Kyber(.{
151 .name = "Kyber512",146 .name = "Kyber512",
152 .k = 2,147 .k = 2,
...@@ -172,9 +167,7 @@ pub const kyber_d00 = struct {...@@ -172,9 +167,7 @@ pub const kyber_d00 = struct {
172 });167 });
173};168};
174169
175pub const ml_kem_01 = @compileError("deprecated: final version of the specification has been published, use ml_kem instead");170pub const nist = struct {
176
177pub const ml_kem = struct {
178 pub const MLKem512 = Kyber(.{171 pub const MLKem512 = Kyber(.{
179 .name = "ML-KEM-512",172 .name = "ML-KEM-512",
180 .ml_kem = true,173 .ml_kem = true,
...@@ -204,12 +197,12 @@ pub const ml_kem = struct {...@@ -204,12 +197,12 @@ pub const ml_kem = struct {
204};197};
205198
206const modes = [_]type{199const modes = [_]type{
207 kyber_d00.Kyber512,200 d00.Kyber512,
208 kyber_d00.Kyber768,201 d00.Kyber768,
209 kyber_d00.Kyber1024,202 d00.Kyber1024,
210 ml_kem.MLKem512,203 nist.MLKem512,
211 ml_kem.MLKem768,204 nist.MLKem768,
212 ml_kem.MLKem1024,205 nist.MLKem1024,
213};206};
214const h_length: usize = 32;207const h_length: usize = 32;
215const inner_seed_length: usize = 32;208const inner_seed_length: usize = 32;
...@@ -1725,9 +1718,9 @@ const sha2 = crypto.hash.sha2;...@@ -1725,9 +1718,9 @@ const sha2 = crypto.hash.sha2;
17251718
1726test "NIST KAT test" {1719test "NIST KAT test" {
1727 inline for (.{1720 inline for (.{
1728 .{ kyber_d00.Kyber512, "e9c2bd37133fcb40772f81559f14b1f58dccd1c816701be9ba6214d43baf4547" },1721 .{ d00.Kyber512, "e9c2bd37133fcb40772f81559f14b1f58dccd1c816701be9ba6214d43baf4547" },
1729 .{ kyber_d00.Kyber1024, "89248f2f33f7f4f7051729111f3049c409a933ec904aedadf035f30fa5646cd5" },1722 .{ d00.Kyber1024, "89248f2f33f7f4f7051729111f3049c409a933ec904aedadf035f30fa5646cd5" },
1730 .{ kyber_d00.Kyber768, "a1e122cad3c24bc51622e4c242d8b8acbcd3f618fee4220400605ca8f9ea02c2" },1723 .{ d00.Kyber768, "a1e122cad3c24bc51622e4c242d8b8acbcd3f618fee4220400605ca8f9ea02c2" },
1731 }) |modeHash| {1724 }) |modeHash| {
1732 const mode = modeHash[0];1725 const mode = modeHash[0];
1733 var seed: [48]u8 = undefined;1726 var seed: [48]u8 = undefined;