From 48f6f08e2c88e38577625f2b6a9652f1e2a6a8f8 Mon Sep 17 00:00:00 2001 From: Spencer Wilson Date: Mon, 4 Mar 2024 11:57:42 -0500 Subject: [PATCH] Run generate.py [skip ci] --- ALGORITHMS.md | 40 +++++++++++++++++----------------- oqs-template/oqs-sig-info.md | 25 ++++++++++++--------- oqsprov/oqsprov.c | 20 ++++++++--------- oqsprov/oqsprov_capabilities.c | 30 ++++++++++++------------- 4 files changed, 60 insertions(+), 55 deletions(-) diff --git a/ALGORITHMS.md b/ALGORITHMS.md index a198afe7..f09b40a7 100644 --- a/ALGORITHMS.md +++ b/ALGORITHMS.md @@ -78,16 +78,16 @@ As standardization for these algorithms within TLS is not done, all TLS code poi | p384_mldsa65 | 0xfed5 |Yes| OQS_CODEPOINT_P384_MLDSA65 | mldsa87 | 0xfed2 |Yes| OQS_CODEPOINT_MLDSA87 | p521_mldsa87 | 0xfed6 |Yes| OQS_CODEPOINT_P521_MLDSA87 -| falcon512 | 0xfeae |Yes| OQS_CODEPOINT_FALCON512 -| p256_falcon512 | 0xfeaf |Yes| OQS_CODEPOINT_P256_FALCON512 -| rsa3072_falcon512 | 0xfeb0 |Yes| OQS_CODEPOINT_RSA3072_FALCON512 -| falcon512_padded | 0xfed7 |Yes| OQS_CODEPOINT_FALCON512_PADDED -| p256_falcon512_padded | 0xfed8 |Yes| OQS_CODEPOINT_P256_FALCON512_PADDED -| rsa3072_falcon512_padded | 0xfed9 |Yes| OQS_CODEPOINT_RSA3072_FALCON512_PADDED -| falcon1024 | 0xfeb1 |Yes| OQS_CODEPOINT_FALCON1024 -| p521_falcon1024 | 0xfeb2 |Yes| OQS_CODEPOINT_P521_FALCON1024 -| falcon1024_padded | 0xfeda |Yes| OQS_CODEPOINT_FALCON1024_PADDED -| p521_falcon1024_padded | 0xfedb |Yes| OQS_CODEPOINT_P521_FALCON1024_PADDED +| falcon512 | 0xfed7 |Yes| OQS_CODEPOINT_FALCON512 +| p256_falcon512 | 0xfed8 |Yes| OQS_CODEPOINT_P256_FALCON512 +| rsa3072_falcon512 | 0xfed9 |Yes| OQS_CODEPOINT_RSA3072_FALCON512 +| falcon512_padded | 0xfedc |Yes| OQS_CODEPOINT_FALCON512_PADDED +| p256_falcon512_padded | 0xfedd |Yes| OQS_CODEPOINT_P256_FALCON512_PADDED +| rsa3072_falcon512_padded | 0xfede |Yes| OQS_CODEPOINT_RSA3072_FALCON512_PADDED +| falcon1024 | 0xfeda |Yes| OQS_CODEPOINT_FALCON1024 +| p521_falcon1024 | 0xfedb |Yes| OQS_CODEPOINT_P521_FALCON1024 +| falcon1024_padded | 0xfedf |Yes| OQS_CODEPOINT_FALCON1024_PADDED +| p521_falcon1024_padded | 0xfee0 |Yes| OQS_CODEPOINT_P521_FALCON1024_PADDED | sphincssha2128fsimple | 0xfeb3 |Yes| OQS_CODEPOINT_SPHINCSSHA2128FSIMPLE | p256_sphincssha2128fsimple | 0xfeb4 |Yes| OQS_CODEPOINT_P256_SPHINCSSHA2128FSIMPLE | rsa3072_sphincssha2128fsimple | 0xfeb5 |Yes| OQS_CODEPOINT_RSA3072_SPHINCSSHA2128FSIMPLE @@ -155,16 +155,16 @@ adapting the OIDs of all supported signature algorithms as per the table below. | p384_mldsa65 | 1.3.9999.7.3 |Yes| OQS_OID_P384_MLDSA65 | mldsa87 | 1.3.6.1.4.1.2.267.12.8.7 |Yes| OQS_OID_MLDSA87 | p521_mldsa87 | 1.3.9999.7.4 |Yes| OQS_OID_P521_MLDSA87 -| falcon512 | 1.3.9999.3.6 |Yes| OQS_OID_FALCON512 -| p256_falcon512 | 1.3.9999.3.7 |Yes| OQS_OID_P256_FALCON512 -| rsa3072_falcon512 | 1.3.9999.3.8 |Yes| OQS_OID_RSA3072_FALCON512 -| falcon512_padded | 1.3.9999.3.11 |Yes| OQS_OID_FALCON512_PADDED -| p256_falcon512_padded | 1.3.9999.3.12 |Yes| OQS_OID_P256_FALCON512_PADDED -| rsa3072_falcon512_padded | 1.3.9999.3.13 |Yes| OQS_OID_RSA3072_FALCON512_PADDED -| falcon1024 | 1.3.9999.3.9 |Yes| OQS_OID_FALCON1024 -| p521_falcon1024 | 1.3.9999.3.10 |Yes| OQS_OID_P521_FALCON1024 -| falcon1024_padded | 1.3.9999.3.14 |Yes| OQS_OID_FALCON1024_PADDED -| p521_falcon1024_padded | 1.3.9999.3.15 |Yes| OQS_OID_P521_FALCON1024_PADDED +| falcon512 | 1.3.9999.3.11 |Yes| OQS_OID_FALCON512 +| p256_falcon512 | 1.3.9999.3.12 |Yes| OQS_OID_P256_FALCON512 +| rsa3072_falcon512 | 1.3.9999.3.13 |Yes| OQS_OID_RSA3072_FALCON512 +| falcon512_padded | 1.3.9999.3.16 |Yes| OQS_OID_FALCON512_PADDED +| p256_falcon512_padded | 1.3.9999.3.17 |Yes| OQS_OID_P256_FALCON512_PADDED +| rsa3072_falcon512_padded | 1.3.9999.3.18 |Yes| OQS_OID_RSA3072_FALCON512_PADDED +| falcon1024 | 1.3.9999.3.14 |Yes| OQS_OID_FALCON1024 +| p521_falcon1024 | 1.3.9999.3.15 |Yes| OQS_OID_P521_FALCON1024 +| falcon1024_padded | 1.3.9999.3.19 |Yes| OQS_OID_FALCON1024_PADDED +| p521_falcon1024_padded | 1.3.9999.3.20 |Yes| OQS_OID_P521_FALCON1024_PADDED | sphincssha2128fsimple | 1.3.9999.6.4.13 |Yes| OQS_OID_SPHINCSSHA2128FSIMPLE | p256_sphincssha2128fsimple | 1.3.9999.6.4.14 |Yes| OQS_OID_P256_SPHINCSSHA2128FSIMPLE | rsa3072_sphincssha2128fsimple | 1.3.9999.6.4.15 |Yes| OQS_OID_RSA3072_SPHINCSSHA2128FSIMPLE diff --git a/oqs-template/oqs-sig-info.md b/oqs-template/oqs-sig-info.md index d1d2205b..35d53b78 100644 --- a/oqs-template/oqs-sig-info.md +++ b/oqs-template/oqs-sig-info.md @@ -14,21 +14,26 @@ | dilithium3_aes **hybrid with** p384 | NIST Round 3 submission | 3 | 3 | 0xfeab | 1.3.9999.2.11.3 | | dilithium5_aes | NIST Round 3 submission | 3 | 5 | 0xfeac | 1.3.6.1.4.1.2.267.11.8.7 | | dilithium5_aes **hybrid with** p521 | NIST Round 3 submission | 3 | 5 | 0xfead | 1.3.9999.2.11.4 | -| falcon512 | 20211101 | 3 | 1 | 0xfeae | 1.3.9999.3.6 | -| falcon512 **hybrid with** p256 | 20211101 | 3 | 1 | 0xfeaf | 1.3.9999.3.7 | -| falcon512 **hybrid with** rsa3072 | 20211101 | 3 | 1 | 0xfeb0 | 1.3.9999.3.8 | +| falcon512 | 20211101 | 3 | 1 | 0xfed7 | 1.3.9999.3.11 | +| falcon512 **hybrid with** p256 | 20211101 | 3 | 1 | 0xfed8 | 1.3.9999.3.12 | +| falcon512 **hybrid with** rsa3072 | 20211101 | 3 | 1 | 0xfed9 | 1.3.9999.3.13 | +| falcon512 | PQClean Round 3 version | 3 | 1 | 0xfeae | 1.3.9999.3.6 | +| falcon512 **hybrid with** p256 | PQClean Round 3 version | 3 | 1 | 0xfeaf | 1.3.9999.3.7 | +| falcon512 **hybrid with** rsa3072 | PQClean Round 3 version | 3 | 1 | 0xfeb0 | 1.3.9999.3.8 | | falcon512 | NIST Round 3 submission | 3 | 1 | 0xfe0b | 1.3.9999.3.1 | | falcon512 **hybrid with** p256 | NIST Round 3 submission | 3 | 1 | 0xfe0c | 1.3.9999.3.2 | | falcon512 **hybrid with** rsa3072 | NIST Round 3 submission | 3 | 1 | 0xfe0d | 1.3.9999.3.3 | -| falcon512_padded | 20211101 | 3 | 1 | 0xfed7 | 1.3.9999.3.11 | -| falcon512_padded **hybrid with** p256 | 20211101 | 3 | 1 | 0xfed8 | 1.3.9999.3.12 | -| falcon512_padded **hybrid with** rsa3072 | 20211101 | 3 | 1 | 0xfed9 | 1.3.9999.3.13 | -| falcon1024 | 20211101 | 3 | 5 | 0xfeb1 | 1.3.9999.3.9 | -| falcon1024 **hybrid with** p521 | 20211101 | 3 | 5 | 0xfeb2 | 1.3.9999.3.10 | +| falcon512_padded | 20211101 | 3 | 1 | 0xfedc | 1.3.9999.3.16 | +| falcon512_padded **hybrid with** p256 | 20211101 | 3 | 1 | 0xfedd | 1.3.9999.3.17 | +| falcon512_padded **hybrid with** rsa3072 | 20211101 | 3 | 1 | 0xfede | 1.3.9999.3.18 | +| falcon1024 | 20211101 | 3 | 5 | 0xfeda | 1.3.9999.3.14 | +| falcon1024 **hybrid with** p521 | 20211101 | 3 | 5 | 0xfedb | 1.3.9999.3.15 | +| falcon1024 | PQClean Round 3 version | 3 | 5 | 0xfeb1 | 1.3.9999.3.9 | +| falcon1024 **hybrid with** p521 | PQClean Round 3 version | 3 | 5 | 0xfeb2 | 1.3.9999.3.10 | | falcon1024 | NIST Round 3 submission | 3 | 5 | 0xfe0e | 1.3.9999.3.4 | | falcon1024 **hybrid with** p521 | NIST Round 3 submission | 3 | 5 | 0xfe0f | 1.3.9999.3.5 | -| falcon1024_padded | 20211101 | 3 | 5 | 0xfeda | 1.3.9999.3.14 | -| falcon1024_padded **hybrid with** p521 | 20211101 | 3 | 5 | 0xfedb | 1.3.9999.3.15 | +| falcon1024_padded | 20211101 | 3 | 5 | 0xfedf | 1.3.9999.3.19 | +| falcon1024_padded **hybrid with** p521 | 20211101 | 3 | 5 | 0xfee0 | 1.3.9999.3.20 | | mldsa44 | ML-DSA-ipd | ipd | 1 | 0xfed0 | 1.3.6.1.4.1.2.267.12.4.4 | | mldsa44 **hybrid with** p256 | ML-DSA-ipd | ipd | 1 | 0xfed3 | 1.3.9999.7.1 | | mldsa44 **hybrid with** rsa3072 | ML-DSA-ipd | ipd | 1 | 0xfed4 | 1.3.9999.7.2 | diff --git a/oqsprov/oqsprov.c b/oqsprov/oqsprov.c index ebaece9a..d0a50900 100644 --- a/oqsprov/oqsprov.c +++ b/oqsprov/oqsprov.c @@ -129,16 +129,16 @@ const char* oqs_oid_alg_list[OQS_OID_CNT] = "1.3.9999.7.3" , "p384_mldsa65", "1.3.6.1.4.1.2.267.12.8.7", "mldsa87", "1.3.9999.7.4" , "p521_mldsa87", -"1.3.9999.3.6", "falcon512", -"1.3.9999.3.7" , "p256_falcon512", -"1.3.9999.3.8" , "rsa3072_falcon512", -"1.3.9999.3.11", "falcon512_padded", -"1.3.9999.3.12" , "p256_falcon512_padded", -"1.3.9999.3.13" , "rsa3072_falcon512_padded", -"1.3.9999.3.9", "falcon1024", -"1.3.9999.3.10" , "p521_falcon1024", -"1.3.9999.3.14", "falcon1024_padded", -"1.3.9999.3.15" , "p521_falcon1024_padded", +"1.3.9999.3.11", "falcon512", +"1.3.9999.3.12" , "p256_falcon512", +"1.3.9999.3.13" , "rsa3072_falcon512", +"1.3.9999.3.16", "falcon512_padded", +"1.3.9999.3.17" , "p256_falcon512_padded", +"1.3.9999.3.18" , "rsa3072_falcon512_padded", +"1.3.9999.3.14", "falcon1024", +"1.3.9999.3.15" , "p521_falcon1024", +"1.3.9999.3.19", "falcon1024_padded", +"1.3.9999.3.20" , "p521_falcon1024_padded", "1.3.9999.6.4.13", "sphincssha2128fsimple", "1.3.9999.6.4.14" , "p256_sphincssha2128fsimple", "1.3.9999.6.4.15" , "rsa3072_sphincssha2128fsimple", diff --git a/oqsprov/oqsprov_capabilities.c b/oqsprov/oqsprov_capabilities.c index aa6cc066..905d1a60 100644 --- a/oqsprov/oqsprov_capabilities.c +++ b/oqsprov/oqsprov_capabilities.c @@ -270,16 +270,16 @@ static OQS_SIGALG_CONSTANTS oqs_sigalg_list[] = { { 0xfed5, 192, TLS1_3_VERSION, 0 }, { 0xfed2, 256, TLS1_3_VERSION, 0 }, { 0xfed6, 256, TLS1_3_VERSION, 0 }, - { 0xfeae, 128, TLS1_3_VERSION, 0 }, - { 0xfeaf, 128, TLS1_3_VERSION, 0 }, - { 0xfeb0, 128, TLS1_3_VERSION, 0 }, { 0xfed7, 128, TLS1_3_VERSION, 0 }, { 0xfed8, 128, TLS1_3_VERSION, 0 }, { 0xfed9, 128, TLS1_3_VERSION, 0 }, - { 0xfeb1, 256, TLS1_3_VERSION, 0 }, - { 0xfeb2, 256, TLS1_3_VERSION, 0 }, + { 0xfedc, 128, TLS1_3_VERSION, 0 }, + { 0xfedd, 128, TLS1_3_VERSION, 0 }, + { 0xfede, 128, TLS1_3_VERSION, 0 }, { 0xfeda, 256, TLS1_3_VERSION, 0 }, { 0xfedb, 256, TLS1_3_VERSION, 0 }, + { 0xfedf, 256, TLS1_3_VERSION, 0 }, + { 0xfee0, 256, TLS1_3_VERSION, 0 }, { 0xfeb3, 128, TLS1_3_VERSION, 0 }, { 0xfeb4, 128, TLS1_3_VERSION, 0 }, { 0xfeb5, 128, TLS1_3_VERSION, 0 }, @@ -453,22 +453,22 @@ static const OSSL_PARAM oqs_param_sigalg_list[][12] = { OQS_SIGALG_ENTRY(p521_mldsa87, p521_mldsa87, p521_mldsa87, "1.3.9999.7.4", 13), #endif #ifdef OQS_ENABLE_SIG_falcon_512 - OQS_SIGALG_ENTRY(falcon512, falcon512, falcon512, "1.3.9999.3.6", 14), - OQS_SIGALG_ENTRY(p256_falcon512, p256_falcon512, p256_falcon512, "1.3.9999.3.7", 15), - OQS_SIGALG_ENTRY(rsa3072_falcon512, rsa3072_falcon512, rsa3072_falcon512, "1.3.9999.3.8", 16), + OQS_SIGALG_ENTRY(falcon512, falcon512, falcon512, "1.3.9999.3.11", 14), + OQS_SIGALG_ENTRY(p256_falcon512, p256_falcon512, p256_falcon512, "1.3.9999.3.12", 15), + OQS_SIGALG_ENTRY(rsa3072_falcon512, rsa3072_falcon512, rsa3072_falcon512, "1.3.9999.3.13", 16), #endif #ifdef OQS_ENABLE_SIG_falcon_512_padded - OQS_SIGALG_ENTRY(falcon512_padded, falcon512_padded, falcon512_padded, "1.3.9999.3.11", 17), - OQS_SIGALG_ENTRY(p256_falcon512_padded, p256_falcon512_padded, p256_falcon512_padded, "1.3.9999.3.12", 18), - OQS_SIGALG_ENTRY(rsa3072_falcon512_padded, rsa3072_falcon512_padded, rsa3072_falcon512_padded, "1.3.9999.3.13", 19), + OQS_SIGALG_ENTRY(falcon512_padded, falcon512_padded, falcon512_padded, "1.3.9999.3.16", 17), + OQS_SIGALG_ENTRY(p256_falcon512_padded, p256_falcon512_padded, p256_falcon512_padded, "1.3.9999.3.17", 18), + OQS_SIGALG_ENTRY(rsa3072_falcon512_padded, rsa3072_falcon512_padded, rsa3072_falcon512_padded, "1.3.9999.3.18", 19), #endif #ifdef OQS_ENABLE_SIG_falcon_1024 - OQS_SIGALG_ENTRY(falcon1024, falcon1024, falcon1024, "1.3.9999.3.9", 20), - OQS_SIGALG_ENTRY(p521_falcon1024, p521_falcon1024, p521_falcon1024, "1.3.9999.3.10", 21), + OQS_SIGALG_ENTRY(falcon1024, falcon1024, falcon1024, "1.3.9999.3.14", 20), + OQS_SIGALG_ENTRY(p521_falcon1024, p521_falcon1024, p521_falcon1024, "1.3.9999.3.15", 21), #endif #ifdef OQS_ENABLE_SIG_falcon_1024_padded - OQS_SIGALG_ENTRY(falcon1024_padded, falcon1024_padded, falcon1024_padded, "1.3.9999.3.14", 22), - OQS_SIGALG_ENTRY(p521_falcon1024_padded, p521_falcon1024_padded, p521_falcon1024_padded, "1.3.9999.3.15", 23), + OQS_SIGALG_ENTRY(falcon1024_padded, falcon1024_padded, falcon1024_padded, "1.3.9999.3.19", 22), + OQS_SIGALG_ENTRY(p521_falcon1024_padded, p521_falcon1024_padded, p521_falcon1024_padded, "1.3.9999.3.20", 23), #endif #ifdef OQS_ENABLE_SIG_sphincs_sha2_128f_simple OQS_SIGALG_ENTRY(sphincssha2128fsimple, sphincssha2128fsimple, sphincssha2128fsimple, "1.3.9999.6.4.13", 24),