diff --git a/README.md b/README.md index 928df817df5..297016ec586 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ The following quantum-safe algorithms from liboqs are supported (assuming they h - **FrodoKEM**: `frodokem-640-aes-sha256`\*, `frodokem-976-aes-sha384`\*, `frodokem-1344-aes-sha512`\*, `frodokem-640-shake-sha256`\*, `frodokem-976-shake-sha384`\*, `frodokem-1344-shake-sha512`\* - **HQC**: `hqc-128-sha256`, `hqc-192-sha384`, `hqc-256-sha512`† - **Kyber**: `kyber-512-sha256`\*, `kyber-768-sha384`\*, `kyber-1024-sha512`\* -- **ML-KEM**: `ml-kem-512-sha256`\*, `ml-kem-768-sha256`\*, `ml-kem-1024-sha384`\* +- **ML-KEM**: `mlkem512-sha256`\*, `mlkem768-sha256`\*, `mlkem1024-sha384`\* - **NTRU-Prime**: `ntruprime-sntrup761-sha512`\* diff --git a/kex.h b/kex.h index 865cf5762ae..fa422c0fdb4 100644 --- a/kex.h +++ b/kex.h @@ -92,11 +92,11 @@ #define KEX_CLASSIC_MCELIECE_6960119F_SHA512 "classic-mceliece-6960119f-sha512" #define KEX_CLASSIC_MCELIECE_8192128_SHA512 "classic-mceliece-8192128-sha512" #define KEX_CLASSIC_MCELIECE_8192128F_SHA512 "classic-mceliece-8192128f-sha512" -#define KEX_ML_KEM_512_SHA256 "ml-kem-512-sha256" +#define KEX_ML_KEM_512_SHA256 "mlkem512-sha256" #define KEX_ML_KEM_512_X25519_SHA256 "x25519-ml-kem-512-sha256@openquantumsafe.org" -#define KEX_ML_KEM_768_SHA256 "ml-kem-768-sha256" +#define KEX_ML_KEM_768_SHA256 "mlkem768-sha256" #define KEX_ML_KEM_768_X25519_SHA256 "mlkem768x25519-sha256" -#define KEX_ML_KEM_1024_SHA384 "ml-kem-1024-sha384" +#define KEX_ML_KEM_1024_SHA384 "mlkem1024-sha384" #define KEX_NTRUPRIME_SNTRUP761_SHA512 "sntrup761-sha512" #define KEX_NTRUPRIME_SNTRUP761_X25519_SHA512 "sntrup761x25519-sha512@openssh.com" #ifdef WITH_OPENSSL diff --git a/myproposal.h b/myproposal.h index 7b6b20cdcc8..03663dc5e1b 100644 --- a/myproposal.h +++ b/myproposal.h @@ -88,13 +88,13 @@ "ecdh-nistp521-classic-mceliece-8192128r4-sha512@openquantumsafe.org," \ "classic-mceliece-8192128f-sha512," \ "ecdh-nistp521-classic-mceliece-8192128fr4-sha512@openquantumsafe.org," \ - "ml-kem-512-sha256," \ + "mlkem512-sha256," \ "ecdh-nistp256-ml-kem-512-sha256@openquantumsafe.org," \ "x25519-ml-kem-512-sha256@openquantumsafe.org," \ - "ml-kem-768-sha256," \ + "mlkem768-sha256," \ "mlkem768nistp256-sha256," \ "mlkem768x25519-sha256," \ - "ml-kem-1024-sha384," \ + "mlkem1024-sha384," \ "mlkem1024nistp384-sha384," \ "sntrup761-sha512," \ "sntrup761x25519-sha512@openssh.com" diff --git a/oqs-template/generate.yml b/oqs-template/generate.yml index ee52e773416..83a8ab10149 100644 --- a/oqs-template/generate.yml +++ b/oqs-template/generate.yml @@ -308,7 +308,7 @@ kexs: name: 'ml_kem_512' enable: true hash: 'sha256' - pretty_name: 'ml-kem-512-sha256' + pretty_name: 'mlkem512-sha256' mix_with: - name: 'nistp256' @@ -323,7 +323,7 @@ kexs: name: 'ml_kem_768' enable: true hash: 'sha256' - pretty_name: 'ml-kem-768-sha256' + pretty_name: 'mlkem768-sha256' mix_with: - name: 'nistp256' @@ -338,7 +338,7 @@ kexs: name: 'ml_kem_1024' enable: true hash: 'sha384' - pretty_name: 'ml-kem-1024-sha384' + pretty_name: 'mlkem1024-sha384' mix_with: - name: 'nistp384' diff --git a/oqs-test/try_connection.py b/oqs-test/try_connection.py index 5fafef1764e..7c1b3e0937d 100644 --- a/oqs-test/try_connection.py +++ b/oqs-test/try_connection.py @@ -63,13 +63,13 @@ "ecdh-nistp521-classic-mceliece-8192128r4-sha512@openquantumsafe.org", "classic-mceliece-8192128f-sha512", "ecdh-nistp521-classic-mceliece-8192128fr4-sha512@openquantumsafe.org", - "ml-kem-512-sha256", + "mlkem512-sha256", "ecdh-nistp256-ml-kem-512-sha256@openquantumsafe.org", "x25519-ml-kem-512-sha256@openquantumsafe.org", - "ml-kem-768-sha256", + "mlkem768-sha256", "mlkem768nistp256-sha256", "mlkem768x25519-sha256", - "ml-kem-1024-sha384", + "mlkem1024-sha384", "mlkem1024nistp384-sha384", "sntrup761-sha512", "sntrup761x25519-sha512@openssh.com",