update MLKEM code points

Signed-off-by: Michael Baentsch <[email protected]>
open-quantum-safe · Oct 30, 2024 · 8642b72 · 8642b72
1 parent 8b4a8fa
commit 8642b72
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/ALGORITHMS.md b/ALGORITHMS.md
@@ -38,15 +38,15 @@ As standardization for these algorithms within TLS is not done, all TLS code poi
 | p256_kyber768 | 0x639A | Yes | OQS_CODEPOINT_P256_KYBER768 |
 | kyber1024 | 0x023D | Yes | OQS_CODEPOINT_KYBER1024 |
 | p521_kyber1024 | 0x2F3D | Yes | OQS_CODEPOINT_P521_KYBER1024 |
-| mlkem512 | 0x024A | Yes | OQS_CODEPOINT_MLKEM512 |
+| mlkem512 | 261 | Yes | OQS_CODEPOINT_MLKEM512 |
 | p256_mlkem512 | 0x2F4B | Yes | OQS_CODEPOINT_P256_MLKEM512 |
 | x25519_mlkem512 | 0x2FB6 | Yes | OQS_CODEPOINT_X25519_MLKEM512 |
-| mlkem768 | 0x0768 | Yes | OQS_CODEPOINT_MLKEM768 |
+| mlkem768 | 262 | Yes | OQS_CODEPOINT_MLKEM768 |
 | p384_mlkem768 | 0x2F4C | Yes | OQS_CODEPOINT_P384_MLKEM768 |
 | x448_mlkem768 | 0x2FB7 | Yes | OQS_CODEPOINT_X448_MLKEM768 |
 | X25519MLKEM768 | 0x11ec | Yes | OQS_CODEPOINT_X25519MLKEM768 |
 | SecP256r1MLKEM768 | 0x11eb | Yes | OQS_CODEPOINT_SECP256R1MLKEM768 |
-| mlkem1024 | 0x1024 | Yes | OQS_CODEPOINT_MLKEM1024 |
+| mlkem1024 | 263 | Yes | OQS_CODEPOINT_MLKEM1024 |
 | p521_mlkem1024 | 0x2F4D | Yes | OQS_CODEPOINT_P521_MLKEM1024 |
 | p384_mlkem1024 | 0x2F4E | Yes | OQS_CODEPOINT_P384_MLKEM1024 |
 | bikel1 | 0x0241 | Yes | OQS_CODEPOINT_BIKEL1 |

diff --git a/oqs-template/generate.yml b/oqs-template/generate.yml
@@ -150,8 +150,8 @@ kems:
     family: 'ML-KEM'
     fips_standard: 1
     name_group: 'mlkem512'
-# code point not standardized: Why? XXX
-    nid: '0x024A'
+# https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8
+    nid: '261'
 # NIST kem 1
     oid: '2.16.840.1.101.3.4.4.1'
 # code point not standardized: Why? XXX
@@ -170,8 +170,8 @@ kems:
     family: 'ML-KEM'
     fips_standard: 1
     name_group: 'mlkem768'
-# https://www.ietf.org/archive/id/draft-connolly-tls-mlkem-key-agreement-01.html
-    nid: '0x0768'
+# https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8
+    nid: '262'
 # NIST kem 2
     oid: '2.16.840.1.101.3.4.4.2'
 # code point not standardized: Why? XXX
@@ -194,8 +194,8 @@ kems:
     family: 'ML-KEM'
     fips_standard: 1
     name_group: 'mlkem1024'
-# https://www.ietf.org/archive/id/draft-connolly-tls-mlkem-key-agreement-01.html
-    nid: '0x1024'
+# https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8
+    nid: '263'
 # NIST kem 3
     oid: '2.16.840.1.101.3.4.4.3'
 # code point not standardized: Why? XXX
@@ -1664,4 +1664,4 @@ sigs:
         oqs_meth: 'OQS_SIG_alg_cross_rsdpg_256_small'
         oid: '1.3.6.1.4.1.62245.2.1.18'
         code_point: '0xff05'
-        enable: false
+        enable: false
diff --git 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                   | mlkem1024      | FIPS203      |                    5 | 0x1024       |                                  |
 | ML-KEM         | ML-KEM                   | mlkem1024      | FIPS203      |                    5 | 0x2F4D       | secp521_r1                       |
 | ML-KEM         | ML-KEM                   | mlkem1024      | FIPS203      |                    5 | 0x2F4E       | p384                             |
-| ML-KEM         | ML-KEM                   | mlkem512       | FIPS203      |                    1 | 0x024A       |                                  |
+| ML-KEM         | ML-KEM                   | mlkem1024      | FIPS203      |                    5 | 263          |                                  |
 | ML-KEM         | ML-KEM                   | mlkem512       | FIPS203      |                    1 | 0x2F4B       | secp256_r1                       |
 | ML-KEM         | ML-KEM                   | mlkem512       | FIPS203      |                    1 | 0x2FB6       | x25519                           |
-| ML-KEM         | ML-KEM                   | mlkem768       | FIPS203      |                    3 | 0x0768       |                                  |
+| ML-KEM         | ML-KEM                   | mlkem512       | FIPS203      |                    1 | 261          |                                  |
 | ML-KEM         | ML-KEM                   | mlkem768       | FIPS203      |                    3 | 0x11eb       | p256                             |
 | ML-KEM         | ML-KEM                   | mlkem768       | FIPS203      |                    3 | 0x11ec       | x25519                           |
 | ML-KEM         | ML-KEM                   | mlkem768       | FIPS203      |                    3 | 0x2F4C       | secp384_r1                       |
 | ML-KEM         | ML-KEM                   | mlkem768       | FIPS203      |                    3 | 0x2FB7       | x448                             |
+| ML-KEM         | ML-KEM                   | mlkem768       | FIPS203      |                    3 | 262          |                                  |
diff --git a/oqsprov/oqsprov_capabilities.c b/oqsprov/oqsprov_capabilities.c
@@ -70,17 +70,17 @@ static OQS_GROUP_CONSTANTS oqs_group_list[] = {
     {0x023D, 256, TLS1_3_VERSION, 0, -1, -1, 1},
 
     {0x2F3D, 256, TLS1_3_VERSION, 0, -1, -1, 1},
-    {0x024A, 128, TLS1_3_VERSION, 0, -1, -1, 1},
+    {261, 128, TLS1_3_VERSION, 0, -1, -1, 1},
 
     {0x2F4B, 128, TLS1_3_VERSION, 0, -1, -1, 1},
     {0x2FB6, 128, TLS1_3_VERSION, 0, -1, -1, 1},
-    {0x0768, 192, TLS1_3_VERSION, 0, -1, -1, 1},
+    {262, 192, TLS1_3_VERSION, 0, -1, -1, 1},
 
     {0x2F4C, 192, TLS1_3_VERSION, 0, -1, -1, 1},
     {0x2FB7, 192, TLS1_3_VERSION, 0, -1, -1, 1},
     {0x11ec, 192, TLS1_3_VERSION, 0, -1, -1, 1},
     {0x11eb, 192, TLS1_3_VERSION, 0, -1, -1, 1},
-    {0x1024, 256, TLS1_3_VERSION, 0, -1, -1, 1},
+    {263, 256, TLS1_3_VERSION, 0, -1, -1, 1},
 
     {0x2F4D, 256, TLS1_3_VERSION, 0, -1, -1, 1},
     {0x2F4E, 256, TLS1_3_VERSION, 0, -1, -1, 1},