diff --git a/ALGORITHMS.md b/ALGORITHMS.md index 0a161bfa..0af1797d 100644 --- a/ALGORITHMS.md +++ b/ALGORITHMS.md @@ -72,26 +72,26 @@ As standardization for these algorithms within TLS is not done, all TLS code poi | p384_dilithium3 | 0xfea4 |Yes| OQS_CODEPOINT_P384_DILITHIUM3 | dilithium5 | 0xfea5 |Yes| OQS_CODEPOINT_DILITHIUM5 | p521_dilithium5 | 0xfea6 |Yes| OQS_CODEPOINT_P521_DILITHIUM5 -| mldsa44 | 0xff06 |Yes| OQS_CODEPOINT_MLDSA44 -| p256_mldsa44 | 0xff09 |Yes| OQS_CODEPOINT_P256_MLDSA44 -| rsa3072_mldsa44 | 0xff0a |Yes| OQS_CODEPOINT_RSA3072_MLDSA44 -| mldsa44_pss2048 | 0xfee1 |Yes| OQS_CODEPOINT_MLDSA44_pss2048 -| mldsa44_rsa2048 | 0xfee2 |Yes| OQS_CODEPOINT_MLDSA44_rsa2048 -| mldsa44_ed25519 | 0xfee3 |Yes| OQS_CODEPOINT_MLDSA44_ed25519 -| mldsa44_p256 | 0xfee4 |Yes| OQS_CODEPOINT_MLDSA44_p256 +| mldsa44 | 0x0904 |Yes| OQS_CODEPOINT_MLDSA44 +| p256_mldsa44 | 0xff06 |Yes| OQS_CODEPOINT_P256_MLDSA44 +| rsa3072_mldsa44 | 0xff07 |Yes| OQS_CODEPOINT_RSA3072_MLDSA44 +| mldsa44_pss2048 | 0x090f |Yes| OQS_CODEPOINT_MLDSA44_pss2048 +| mldsa44_rsa2048 | 0x090c |Yes| OQS_CODEPOINT_MLDSA44_rsa2048 +| mldsa44_ed25519 | 0x090a |Yes| OQS_CODEPOINT_MLDSA44_ed25519 +| mldsa44_p256 | 0x0907 |Yes| OQS_CODEPOINT_MLDSA44_p256 | mldsa44_bp256 | 0xfee5 |Yes| OQS_CODEPOINT_MLDSA44_bp256 -| mldsa65 | 0xff07 |Yes| OQS_CODEPOINT_MLDSA65 -| p384_mldsa65 | 0xff0b |Yes| OQS_CODEPOINT_P384_MLDSA65 -| mldsa65_pss3072 | 0xfee6 |Yes| OQS_CODEPOINT_MLDSA65_pss3072 -| mldsa65_rsa3072 | 0xfee7 |Yes| OQS_CODEPOINT_MLDSA65_rsa3072 -| mldsa65_p256 | 0xfee8 |Yes| OQS_CODEPOINT_MLDSA65_p256 +| mldsa65 | 0x0905 |Yes| OQS_CODEPOINT_MLDSA65 +| p384_mldsa65 | 0xff08 |Yes| OQS_CODEPOINT_P384_MLDSA65 +| mldsa65_pss3072 | 0x0910 |Yes| OQS_CODEPOINT_MLDSA65_pss3072 +| mldsa65_rsa3072 | 0x090d |Yes| OQS_CODEPOINT_MLDSA65_rsa3072 +| mldsa65_p256 | 0x0908 |Yes| OQS_CODEPOINT_MLDSA65_p256 | mldsa65_bp256 | 0xfee9 |Yes| OQS_CODEPOINT_MLDSA65_bp256 -| mldsa65_ed25519 | 0xfeea |Yes| OQS_CODEPOINT_MLDSA65_ed25519 -| mldsa87 | 0xff08 |Yes| OQS_CODEPOINT_MLDSA87 -| p521_mldsa87 | 0xff0c |Yes| OQS_CODEPOINT_P521_MLDSA87 -| mldsa87_p384 | 0xfeeb |Yes| OQS_CODEPOINT_MLDSA87_p384 +| mldsa65_ed25519 | 0x090b |Yes| OQS_CODEPOINT_MLDSA65_ed25519 +| mldsa87 | 0x0906 |Yes| OQS_CODEPOINT_MLDSA87 +| p521_mldsa87 | 0xff09 |Yes| OQS_CODEPOINT_P521_MLDSA87 +| mldsa87_p384 | 0x0909 |Yes| OQS_CODEPOINT_MLDSA87_p384 | mldsa87_bp384 | 0xfeec |Yes| OQS_CODEPOINT_MLDSA87_bp384 -| mldsa87_ed448 | 0xfeed |Yes| OQS_CODEPOINT_MLDSA87_ed448 +| mldsa87_ed448 | 0x0912 |Yes| OQS_CODEPOINT_MLDSA87_ed448 | falcon512 | 0xfed7 |Yes| OQS_CODEPOINT_FALCON512 | p256_falcon512 | 0xfed8 |Yes| OQS_CODEPOINT_P256_FALCON512 | rsa3072_falcon512 | 0xfed9 |Yes| OQS_CODEPOINT_RSA3072_FALCON512 diff --git a/oqs-template/generate.yml b/oqs-template/generate.yml index 901283e7..affcc4d3 100644 --- a/oqs-template/generate.yml +++ b/oqs-template/generate.yml @@ -426,7 +426,7 @@ kem_nid_end: '0x0250' kem_nid_hybrid_end: '0x2FFF' # need to edit ssl_local.h macros IS_OQS_KEM_CURVEID and IS_OQS_KEM_HYBRID_CURVEID with the above _end values -# Next free signature ID: 0xff19 +# Next free signature ID: 0xff0a sigs: # - # iso (1) @@ -583,36 +583,36 @@ sigs: pretty_name: 'ML-DSA-44' oqs_meth: 'OQS_SIG_alg_ml_dsa_44' oid: '2.16.840.1.101.3.4.3.17' - code_point: '0xff06' + code_point: '0x0904' enable: true mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.7.5', - 'code_point': '0xff09'}, + 'code_point': '0xff06'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', 'oid': '1.3.9999.7.6', - 'code_point': '0xff0a'}] + 'code_point': '0xff07'}] composite: [{'name': 'pss2048', 'pretty_name': 'RSA PSS 2048', 'security': '112', 'oid': '2.16.840.1.114027.80.8.1.1', - 'code_point': '0xfee1'}, + 'code_point': '0x090f'}, {'name': 'rsa2048', - 'pretty_name': 'RSA2028', + 'pretty_name': 'RSA2048', 'security': '112', 'oid': '2.16.840.1.114027.80.8.1.2', - 'code_point': '0xfee2'}, + 'code_point': '0x090c'}, {'name': 'ed25519', 'pretty_name': 'ED25519', 'security': '128', 'oid': '2.16.840.1.114027.80.8.1.3', - 'code_point': '0xfee3'}, + 'code_point': '0x090a'}, {'name': 'p256', 'pretty_name': 'ECDSA p256', 'security': '128', 'oid': '2.16.840.1.114027.80.8.1.4', - 'code_point': '0xfee4'}, + 'code_point': '0x0907'}, {'name': 'bp256', 'pretty_name': 'ECDSA brainpoolP256r1', 'security': '256', @@ -623,27 +623,27 @@ sigs: pretty_name: 'ML-DSA-65' oqs_meth: 'OQS_SIG_alg_ml_dsa_65' oid: '2.16.840.1.101.3.4.3.18' - code_point: '0xff07' + code_point: '0x0905' enable: true mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.7.7', - 'code_point': '0xff0b'}] + 'code_point': '0xff08'}] composite: [{'name': 'pss3072', 'pretty_name': 'RSA PSS 3072', 'security': '128', 'oid': '2.16.840.1.114027.80.8.1.6', - 'code_point': '0xfee6'}, + 'code_point': '0x0910'}, {'name': 'rsa3072', 'pretty_name': 'RSA 3072', 'security': '128', 'oid': '2.16.840.1.114027.80.8.1.7', - 'code_point': '0xfee7'}, + 'code_point': '0x090d'}, {'name': 'p256', 'pretty_name': 'ECDSA p256', 'security': '128', 'oid': '2.16.840.1.114027.80.8.1.8', - 'code_point': '0xfee8'}, + 'code_point': '0x0908'}, {'name': 'bp256', 'pretty_name': 'ECDSA brainpoolP256r1', 'security': '256', @@ -653,23 +653,23 @@ sigs: 'pretty_name': 'ED25519', 'security': '128', 'oid': '2.16.840.1.114027.80.8.1.10', - 'code_point': '0xfeea'}] + 'code_point': '0x090b'}] - name: 'mldsa87' pretty_name: 'ML-DSA-87' oqs_meth: 'OQS_SIG_alg_ml_dsa_87' oid: '2.16.840.1.101.3.4.3.19' - code_point: '0xff08' + code_point: '0x0906' enable: true mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.7.8', - 'code_point': '0xff0c'}] + 'code_point': '0xff09'}] composite: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'security': '192', 'oid': '2.16.840.1.114027.80.8.1.11', - 'code_point': '0xfeeb'}, + 'code_point': '0x0909'}, {'name': 'bp384', 'pretty_name': 'ECDSA brainpoolP384r1', 'security': '384', @@ -679,7 +679,7 @@ sigs: 'pretty_name': 'ED448', 'security': '192', 'oid': '2.16.840.1.114027.80.8.1.13', - 'code_point': '0xfeed'}] + 'code_point': '0x0912'}] - # iso (1) # identified-organization (3) diff --git a/oqs-template/oqs-sig-info.md b/oqs-template/oqs-sig-info.md index ea2b70fb..7ba2a85a 100644 --- a/oqs-template/oqs-sig-info.md +++ b/oqs-template/oqs-sig-info.md @@ -58,26 +58,26 @@ | mayo3 **hybrid with** p384 | https://doi.org/10.46586/tches.v2024.i2.252-275 | 1 | 3 | 0xfef4 | 1.3.9999.8.3.2 | | mayo5 | https://doi.org/10.46586/tches.v2024.i2.252-275 | 1 | 5 | 0xfef1 | 1.3.9999.8.5.1 | | mayo5 **hybrid with** p521 | https://doi.org/10.46586/tches.v2024.i2.252-275 | 1 | 5 | 0xfef5 | 1.3.9999.8.5.2 | -| mldsa44 | ML-DSA | FIPS204 | 1 | 0xff06 | 2.16.840.1.101.3.4.3.17 | -| mldsa44 **hybrid with** p256 | ML-DSA | FIPS204 | 1 | 0xff09 | 1.3.9999.7.5 | -| mldsa44 **hybrid with** rsa3072 | ML-DSA | FIPS204 | 1 | 0xff0a | 1.3.9999.7.6 | -| mldsa44 **composite with** pss2048 | ML-DSA | FIPS204 | 1 | 0xfee1 | 2.16.840.1.114027.80.8.1.1 | -| mldsa44 **composite with** rsa2048 | ML-DSA | FIPS204 | 1 | 0xfee2 | 2.16.840.1.114027.80.8.1.2 | -| mldsa44 **composite with** ed25519 | ML-DSA | FIPS204 | 1 | 0xfee3 | 2.16.840.1.114027.80.8.1.3 | -| mldsa44 **composite with** p256 | ML-DSA | FIPS204 | 1 | 0xfee4 | 2.16.840.1.114027.80.8.1.4 | +| mldsa44 | ML-DSA | FIPS204 | 1 | 0x0904 | 2.16.840.1.101.3.4.3.17 | +| mldsa44 **hybrid with** p256 | ML-DSA | FIPS204 | 1 | 0xff06 | 1.3.9999.7.5 | +| mldsa44 **hybrid with** rsa3072 | ML-DSA | FIPS204 | 1 | 0xff07 | 1.3.9999.7.6 | +| mldsa44 **composite with** pss2048 | ML-DSA | FIPS204 | 1 | 0x090f | 2.16.840.1.114027.80.8.1.1 | +| mldsa44 **composite with** rsa2048 | ML-DSA | FIPS204 | 1 | 0x090c | 2.16.840.1.114027.80.8.1.2 | +| mldsa44 **composite with** ed25519 | ML-DSA | FIPS204 | 1 | 0x090a | 2.16.840.1.114027.80.8.1.3 | +| mldsa44 **composite with** p256 | ML-DSA | FIPS204 | 1 | 0x0907 | 2.16.840.1.114027.80.8.1.4 | | mldsa44 **composite with** bp256 | ML-DSA | FIPS204 | 1 | 0xfee5 | 2.16.840.1.114027.80.8.1.5 | -| mldsa65 | ML-DSA | FIPS204 | 3 | 0xff07 | 2.16.840.1.101.3.4.3.18 | -| mldsa65 **hybrid with** p384 | ML-DSA | FIPS204 | 3 | 0xff0b | 1.3.9999.7.7 | -| mldsa65 **composite with** pss3072 | ML-DSA | FIPS204 | 3 | 0xfee6 | 2.16.840.1.114027.80.8.1.6 | -| mldsa65 **composite with** rsa3072 | ML-DSA | FIPS204 | 3 | 0xfee7 | 2.16.840.1.114027.80.8.1.7 | -| mldsa65 **composite with** p256 | ML-DSA | FIPS204 | 3 | 0xfee8 | 2.16.840.1.114027.80.8.1.8 | +| mldsa65 | ML-DSA | FIPS204 | 3 | 0x0905 | 2.16.840.1.101.3.4.3.18 | +| mldsa65 **hybrid with** p384 | ML-DSA | FIPS204 | 3 | 0xff08 | 1.3.9999.7.7 | +| mldsa65 **composite with** pss3072 | ML-DSA | FIPS204 | 3 | 0x0910 | 2.16.840.1.114027.80.8.1.6 | +| mldsa65 **composite with** rsa3072 | ML-DSA | FIPS204 | 3 | 0x090d | 2.16.840.1.114027.80.8.1.7 | +| mldsa65 **composite with** p256 | ML-DSA | FIPS204 | 3 | 0x0908 | 2.16.840.1.114027.80.8.1.8 | | mldsa65 **composite with** bp256 | ML-DSA | FIPS204 | 3 | 0xfee9 | 2.16.840.1.114027.80.8.1.9 | -| mldsa65 **composite with** ed25519 | ML-DSA | FIPS204 | 3 | 0xfeea | 2.16.840.1.114027.80.8.1.10 | -| mldsa87 | ML-DSA | FIPS204 | 5 | 0xff08 | 2.16.840.1.101.3.4.3.19 | -| mldsa87 **hybrid with** p521 | ML-DSA | FIPS204 | 5 | 0xff0c | 1.3.9999.7.8 | -| mldsa87 **composite with** p384 | ML-DSA | FIPS204 | 5 | 0xfeeb | 2.16.840.1.114027.80.8.1.11 | +| mldsa65 **composite with** ed25519 | ML-DSA | FIPS204 | 3 | 0x090b | 2.16.840.1.114027.80.8.1.10 | +| mldsa87 | ML-DSA | FIPS204 | 5 | 0x0906 | 2.16.840.1.101.3.4.3.19 | +| mldsa87 **hybrid with** p521 | ML-DSA | FIPS204 | 5 | 0xff09 | 1.3.9999.7.8 | +| mldsa87 **composite with** p384 | ML-DSA | FIPS204 | 5 | 0x0909 | 2.16.840.1.114027.80.8.1.11 | | mldsa87 **composite with** bp384 | ML-DSA | FIPS204 | 5 | 0xfeec | 2.16.840.1.114027.80.8.1.12 | -| mldsa87 **composite with** ed448 | ML-DSA | FIPS204 | 5 | 0xfeed | 2.16.840.1.114027.80.8.1.13 | +| mldsa87 **composite with** ed448 | ML-DSA | FIPS204 | 5 | 0x0912 | 2.16.840.1.114027.80.8.1.13 | | sphincsharaka128frobust | NIST Round 3 submission | 3 | 1 | 0xfe42 | 1.3.9999.6.1.1 | | sphincsharaka128frobust **hybrid with** p256 | NIST Round 3 submission | 3 | 1 | 0xfe43 | 1.3.9999.6.1.2 | | sphincsharaka128frobust **hybrid with** rsa3072 | NIST Round 3 submission | 3 | 1 | 0xfe44 | 1.3.9999.6.1.3 | @@ -189,4 +189,4 @@ | sphincsshake256ssimple | NIST Round 3 submission, v3.1 (June 10, 2022) | 3 | 5 | 0xfece | 1.3.9999.6.9.12 | | sphincsshake256ssimple **hybrid with** p521 | NIST Round 3 submission, v3.1 (June 10, 2022) | 3 | 5 | 0xfecf | 1.3.9999.6.9.13 | | sphincsshake256ssimple | NIST Round 3 submission | 3 | 5 | 0xfe94 | 1.3.9999.6.9.7 | -| sphincsshake256ssimple **hybrid with** p521 | NIST Round 3 submission | 3 | 5 | 0xfe95 | 1.3.9999.6.9.8 | +| sphincsshake256ssimple **hybrid with** p521 | NIST Round 3 submission | 3 | 5 | 0xfe95 | 1.3.9999.6.9.8 | \ No newline at end of file diff --git a/oqsprov/oqsprov_capabilities.c b/oqsprov/oqsprov_capabilities.c index 28a032a9..fb0c0df1 100644 --- a/oqsprov/oqsprov_capabilities.c +++ b/oqsprov/oqsprov_capabilities.c @@ -269,17 +269,17 @@ static OQS_SIGALG_CONSTANTS oqs_sigalg_list[] = { {0xfea0, 128, TLS1_3_VERSION, 0}, {0xfea1, 128, TLS1_3_VERSION, 0}, {0xfea2, 128, TLS1_3_VERSION, 0}, {0xfea3, 192, TLS1_3_VERSION, 0}, {0xfea4, 192, TLS1_3_VERSION, 0}, {0xfea5, 256, TLS1_3_VERSION, 0}, - {0xfea6, 256, TLS1_3_VERSION, 0}, {0xff06, 128, TLS1_3_VERSION, 0}, - {0xff09, 128, TLS1_3_VERSION, 0}, {0xff0a, 128, TLS1_3_VERSION, 0}, - {0xfee1, 128, TLS1_3_VERSION, 0}, {0xfee2, 128, TLS1_3_VERSION, 0}, - {0xfee3, 128, TLS1_3_VERSION, 0}, {0xfee4, 128, TLS1_3_VERSION, 0}, - {0xfee5, 128, TLS1_3_VERSION, 0}, {0xff07, 192, TLS1_3_VERSION, 0}, - {0xff0b, 192, TLS1_3_VERSION, 0}, {0xfee6, 192, TLS1_3_VERSION, 0}, - {0xfee7, 192, TLS1_3_VERSION, 0}, {0xfee8, 192, TLS1_3_VERSION, 0}, - {0xfee9, 192, TLS1_3_VERSION, 0}, {0xfeea, 192, TLS1_3_VERSION, 0}, - {0xff08, 256, TLS1_3_VERSION, 0}, {0xff0c, 256, TLS1_3_VERSION, 0}, - {0xfeeb, 256, TLS1_3_VERSION, 0}, {0xfeec, 256, TLS1_3_VERSION, 0}, - {0xfeed, 256, TLS1_3_VERSION, 0}, {0xfed7, 128, TLS1_3_VERSION, 0}, + {0xfea6, 256, TLS1_3_VERSION, 0}, {0x0904, 128, TLS1_3_VERSION, 0}, + {0xff06, 128, TLS1_3_VERSION, 0}, {0xff07, 128, TLS1_3_VERSION, 0}, + {0x090f, 128, TLS1_3_VERSION, 0}, {0x090c, 128, TLS1_3_VERSION, 0}, + {0x090a, 128, TLS1_3_VERSION, 0}, {0x0907, 128, TLS1_3_VERSION, 0}, + {0xfee5, 128, TLS1_3_VERSION, 0}, {0x0905, 192, TLS1_3_VERSION, 0}, + {0xff08, 192, TLS1_3_VERSION, 0}, {0x0910, 192, TLS1_3_VERSION, 0}, + {0x090d, 192, TLS1_3_VERSION, 0}, {0x0908, 192, TLS1_3_VERSION, 0}, + {0xfee9, 192, TLS1_3_VERSION, 0}, {0x090b, 192, TLS1_3_VERSION, 0}, + {0x0906, 256, TLS1_3_VERSION, 0}, {0xff09, 256, TLS1_3_VERSION, 0}, + {0x0909, 256, TLS1_3_VERSION, 0}, {0xfeec, 256, TLS1_3_VERSION, 0}, + {0x0912, 256, TLS1_3_VERSION, 0}, {0xfed7, 128, TLS1_3_VERSION, 0}, {0xfed8, 128, TLS1_3_VERSION, 0}, {0xfed9, 128, 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},