From 53cf8a4b1265e0b6fcae3a0aa6750816f7ec679a Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Sat, 7 Sep 2024 07:36:59 +0200 Subject: [PATCH] update X25519-MLKEM768 code point Signed-off-by: Michael Baentsch <57787676+baentsch@users.noreply.github.com> --- ALGORITHMS.md | 2 +- oqs-template/generate.yml | 2 +- oqs-template/oqs-kem-info.md | 22 +++++++++++----------- oqsprov/oqsprov_capabilities.c | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ALGORITHMS.md b/ALGORITHMS.md index df2d1fcf..b61c7b24 100644 --- a/ALGORITHMS.md +++ b/ALGORITHMS.md @@ -44,7 +44,7 @@ As standardization for these algorithms within TLS is not done, all TLS code poi | mlkem768 | 0x0248 | Yes | OQS_CODEPOINT_MLKEM768 | | p384_mlkem768 | 0x2F48 | Yes | OQS_CODEPOINT_P384_MLKEM768 | | x448_mlkem768 | 0x2FB3 | Yes | OQS_CODEPOINT_X448_MLKEM768 | -| x25519_mlkem768 | 0x2FB4 | Yes | OQS_CODEPOINT_X25519_MLKEM768 | +| x25519_mlkem768 | 4588 | Yes | OQS_CODEPOINT_X25519_MLKEM768 | | p256_mlkem768 | 0x2FB5 | Yes | OQS_CODEPOINT_P256_MLKEM768 | | mlkem1024 | 0x0249 | Yes | OQS_CODEPOINT_MLKEM1024 | | p521_mlkem1024 | 0x2F49 | Yes | OQS_CODEPOINT_P521_MLKEM1024 | diff --git a/oqs-template/generate.yml b/oqs-template/generate.yml index 571dfdc1..125b80dd 100644 --- a/oqs-template/generate.yml +++ b/oqs-template/generate.yml @@ -168,7 +168,7 @@ kems: - hybrid_group: "x448" nid: '0x2FB3' - hybrid_group: "x25519" - nid: '0x2FB4' + nid: '4588' - hybrid_group: "p256" nid: '0x2FB5' - diff --git a/oqs-template/oqs-kem-info.md b/oqs-template/oqs-kem-info.md index dafa41cb..fdb201a7 100644 --- a/oqs-template/oqs-kem-info.md +++ b/oqs-template/oqs-kem-info.md @@ -85,14 +85,14 @@ | HQC | 2023-04-30 | hqc192 | 4 | 3 | 0x2FB1 | x448 | | HQC | 2023-04-30 | hqc256 | 4 | 5 | 0x0246 | | | HQC | 2023-04-30 | hqc256 | 4 | 5 | 0x2F46 | secp521_r1 | -| ML-KEM | ML-KEM-ipd | mlkem1024 | ipd | 5 | 0x0249 | | -| ML-KEM | ML-KEM-ipd | mlkem1024 | ipd | 5 | 0x2F49 | secp521_r1 | -| ML-KEM | ML-KEM-ipd | mlkem1024 | ipd | 5 | 0x2F4A | p384 | -| ML-KEM | ML-KEM-ipd | mlkem512 | ipd | 1 | 0x0247 | | -| ML-KEM | ML-KEM-ipd | mlkem512 | ipd | 1 | 0x2F47 | secp256_r1 | -| ML-KEM | ML-KEM-ipd | mlkem512 | ipd | 1 | 0x2FB2 | x25519 | -| ML-KEM | ML-KEM-ipd | mlkem768 | ipd | 3 | 0x0248 | | -| ML-KEM | ML-KEM-ipd | mlkem768 | ipd | 3 | 0x2F48 | secp384_r1 | -| ML-KEM | ML-KEM-ipd | mlkem768 | ipd | 3 | 0x2FB3 | x448 | -| ML-KEM | ML-KEM-ipd | mlkem768 | ipd | 3 | 0x2FB4 | x25519 | -| ML-KEM | ML-KEM-ipd | mlkem768 | ipd | 3 | 0x2FB5 | p256 | +| ML-KEM | ML-KEM | mlkem1024 | FIPS203 | 5 | 0x0249 | | +| ML-KEM | ML-KEM | mlkem1024 | FIPS203 | 5 | 0x2F49 | secp521_r1 | +| ML-KEM | ML-KEM | mlkem1024 | FIPS203 | 5 | 0x2F4A | p384 | +| ML-KEM | ML-KEM | mlkem512 | FIPS203 | 1 | 0x0247 | | +| ML-KEM | ML-KEM | mlkem512 | FIPS203 | 1 | 0x2F47 | secp256_r1 | +| ML-KEM | ML-KEM | mlkem512 | FIPS203 | 1 | 0x2FB2 | x25519 | +| ML-KEM | ML-KEM | mlkem768 | FIPS203 | 3 | 0x0248 | | +| ML-KEM | ML-KEM | mlkem768 | FIPS203 | 3 | 0x2F48 | secp384_r1 | +| ML-KEM | ML-KEM | mlkem768 | FIPS203 | 3 | 0x2FB3 | x448 | +| ML-KEM | ML-KEM | mlkem768 | FIPS203 | 3 | 0x2FB5 | p256 | +| ML-KEM | ML-KEM | mlkem768 | FIPS203 | 3 | 4588 | x25519 | diff --git a/oqsprov/oqsprov_capabilities.c b/oqsprov/oqsprov_capabilities.c index f3e3ea70..e402308f 100644 --- a/oqsprov/oqsprov_capabilities.c +++ b/oqsprov/oqsprov_capabilities.c @@ -78,7 +78,7 @@ static OQS_GROUP_CONSTANTS oqs_group_list[] = { {0x2F48, 192, TLS1_3_VERSION, 0, -1, -1, 1}, {0x2FB3, 192, TLS1_3_VERSION, 0, -1, -1, 1}, - {0x2FB4, 192, TLS1_3_VERSION, 0, -1, -1, 1}, + {4588, 192, TLS1_3_VERSION, 0, -1, -1, 1}, {0x2FB5, 192, TLS1_3_VERSION, 0, -1, -1, 1}, {0x0249, 256, TLS1_3_VERSION, 0, -1, -1, 1},