diff --git a/ALGORITHMS.md b/ALGORITHMS.md index 10a92070..fd5c72ad 100644 --- a/ALGORITHMS.md +++ b/ALGORITHMS.md @@ -13,48 +13,48 @@ As standardization for these algorithms within TLS is not done, all TLS code poi |Algorithm name | default ID | enabled | environment variable | |---------------|:----------:|:-------:|----------------------| | frodo640aes | 65024 | Yes | OQS_CODEPOINT_FRODO640AES | -| p256_frodo640aes | 0x2F00 | Yes | OQS_CODEPOINT_P256_FRODO640AES | -| x25519_frodo640aes | 0x2F80 | Yes | OQS_CODEPOINT_X25519_FRODO640AES | +| p256_frodo640aes | 65027 | Yes | OQS_CODEPOINT_P256_FRODO640AES | +| x25519_frodo640aes | 65028 | Yes | OQS_CODEPOINT_X25519_FRODO640AES | | frodo640shake | 65025 | Yes | OQS_CODEPOINT_FRODO640SHAKE | -| p256_frodo640shake | 0x2F01 | Yes | OQS_CODEPOINT_P256_FRODO640SHAKE | -| x25519_frodo640shake | 0x2F81 | Yes | OQS_CODEPOINT_X25519_FRODO640SHAKE | +| p256_frodo640shake | 65029 | Yes | OQS_CODEPOINT_P256_FRODO640SHAKE | +| x25519_frodo640shake | 65030 | Yes | OQS_CODEPOINT_X25519_FRODO640SHAKE | | frodo976aes | 65026 | Yes | OQS_CODEPOINT_FRODO976AES | -| p384_frodo976aes | 0x2F02 | Yes | OQS_CODEPOINT_P384_FRODO976AES | -| x448_frodo976aes | 0x2F82 | Yes | OQS_CODEPOINT_X448_FRODO976AES | -| frodo976shake | 0x0203 | Yes | OQS_CODEPOINT_FRODO976SHAKE | -| p384_frodo976shake | 0x2F03 | Yes | OQS_CODEPOINT_P384_FRODO976SHAKE | -| x448_frodo976shake | 0x2F83 | Yes | OQS_CODEPOINT_X448_FRODO976SHAKE | -| frodo1344aes | 0x0204 | Yes | OQS_CODEPOINT_FRODO1344AES | -| p521_frodo1344aes | 0x2F04 | Yes | OQS_CODEPOINT_P521_FRODO1344AES | -| frodo1344shake | 0x0205 | Yes | OQS_CODEPOINT_FRODO1344SHAKE | -| p521_frodo1344shake | 0x2F05 | Yes | OQS_CODEPOINT_P521_FRODO1344SHAKE | +| p384_frodo976aes | 65031 | Yes | OQS_CODEPOINT_P384_FRODO976AES | +| x448_frodo976aes | 65032 | Yes | OQS_CODEPOINT_X448_FRODO976AES | +| frodo976shake | 65033 | Yes | OQS_CODEPOINT_FRODO976SHAKE | +| p384_frodo976shake | 65034 | Yes | OQS_CODEPOINT_P384_FRODO976SHAKE | +| x448_frodo976shake | 65035 | Yes | OQS_CODEPOINT_X448_FRODO976SHAKE | +| frodo1344aes | 65036 | Yes | OQS_CODEPOINT_FRODO1344AES | +| p521_frodo1344aes | 65037 | Yes | OQS_CODEPOINT_P521_FRODO1344AES | +| frodo1344shake | 65038 | Yes | OQS_CODEPOINT_FRODO1344SHAKE | +| p521_frodo1344shake | 65039 | Yes | OQS_CODEPOINT_P521_FRODO1344SHAKE | | mlkem512 | 512 | Yes | OQS_CODEPOINT_MLKEM512 | -| p256_mlkem512 | 0x2F4B | Yes | OQS_CODEPOINT_P256_MLKEM512 | -| x25519_mlkem512 | 0x2FB6 | Yes | OQS_CODEPOINT_X25519_MLKEM512 | +| p256_mlkem512 | 65040 | Yes | OQS_CODEPOINT_P256_MLKEM512 | +| x25519_mlkem512 | 65041 | Yes | OQS_CODEPOINT_X25519_MLKEM512 | | mlkem768 | 513 | Yes | OQS_CODEPOINT_MLKEM768 | -| p384_mlkem768 | 0x2F4C | Yes | OQS_CODEPOINT_P384_MLKEM768 | -| x448_mlkem768 | 0x2FB7 | Yes | OQS_CODEPOINT_X448_MLKEM768 | +| p384_mlkem768 | 65042 | Yes | OQS_CODEPOINT_P384_MLKEM768 | +| x448_mlkem768 | 65043 | Yes | OQS_CODEPOINT_X448_MLKEM768 | | X25519MLKEM768 | 0x11ec | Yes | OQS_CODEPOINT_X25519MLKEM768 | | SecP256r1MLKEM768 | 0x11eb | Yes | OQS_CODEPOINT_SECP256R1MLKEM768 | | mlkem1024 | 514 | Yes | OQS_CODEPOINT_MLKEM1024 | -| p521_mlkem1024 | 0x2F4D | Yes | OQS_CODEPOINT_P521_MLKEM1024 | +| p521_mlkem1024 | 65044 | Yes | OQS_CODEPOINT_P521_MLKEM1024 | | SecP384r1MLKEM1024 | 0x11ED | Yes | OQS_CODEPOINT_SECP384R1MLKEM1024 | -| bikel1 | 0x0241 | Yes | OQS_CODEPOINT_BIKEL1 | -| p256_bikel1 | 0x2F41 | Yes | OQS_CODEPOINT_P256_BIKEL1 | -| x25519_bikel1 | 0x2FAE | Yes | OQS_CODEPOINT_X25519_BIKEL1 | -| bikel3 | 0x0242 | Yes | OQS_CODEPOINT_BIKEL3 | -| p384_bikel3 | 0x2F42 | Yes | OQS_CODEPOINT_P384_BIKEL3 | -| x448_bikel3 | 0x2FAF | Yes | OQS_CODEPOINT_X448_BIKEL3 | -| bikel5 | 0x0243 | Yes | OQS_CODEPOINT_BIKEL5 | -| p521_bikel5 | 0x2F43 | Yes | OQS_CODEPOINT_P521_BIKEL5 | -| hqc128 | 0x0244 | Yes | OQS_CODEPOINT_HQC128 | -| p256_hqc128 | 0x2F44 | Yes | OQS_CODEPOINT_P256_HQC128 | -| x25519_hqc128 | 0x2FB0 | Yes | OQS_CODEPOINT_X25519_HQC128 | -| hqc192 | 0x0245 | Yes | OQS_CODEPOINT_HQC192 | -| p384_hqc192 | 0x2F45 | Yes | OQS_CODEPOINT_P384_HQC192 | -| x448_hqc192 | 0x2FB1 | Yes | OQS_CODEPOINT_X448_HQC192 | -| hqc256 | 0x0246 | Yes | OQS_CODEPOINT_HQC256 | -| p521_hqc256 | 0x2F46 | Yes | OQS_CODEPOINT_P521_HQC256 | +| bikel1 | 65045 | Yes | OQS_CODEPOINT_BIKEL1 | +| p256_bikel1 | 65046 | Yes | OQS_CODEPOINT_P256_BIKEL1 | +| x25519_bikel1 | 65047 | Yes | OQS_CODEPOINT_X25519_BIKEL1 | +| bikel3 | 65048 | Yes | OQS_CODEPOINT_BIKEL3 | +| p384_bikel3 | 65049 | Yes | OQS_CODEPOINT_P384_BIKEL3 | +| x448_bikel3 | 65050 | Yes | OQS_CODEPOINT_X448_BIKEL3 | +| bikel5 | 65051 | Yes | OQS_CODEPOINT_BIKEL5 | +| p521_bikel5 | 65052 | Yes | OQS_CODEPOINT_P521_BIKEL5 | +| hqc128 | 65053 | Yes | OQS_CODEPOINT_HQC128 | +| p256_hqc128 | 65054 | Yes | OQS_CODEPOINT_P256_HQC128 | +| x25519_hqc128 | 65055 | Yes | OQS_CODEPOINT_X25519_HQC128 | +| hqc192 | 65056 | Yes | OQS_CODEPOINT_HQC192 | +| p384_hqc192 | 65057 | Yes | OQS_CODEPOINT_P384_HQC192 | +| x448_hqc192 | 65058 | Yes | OQS_CODEPOINT_X448_HQC192 | +| hqc256 | 65059 | Yes | OQS_CODEPOINT_HQC256 | +| p521_hqc256 | 65060 | Yes | OQS_CODEPOINT_P521_HQC256 | | mldsa44 | 0x0904 |Yes| OQS_CODEPOINT_MLDSA44 | p256_mldsa44 | 0xff06 |Yes| OQS_CODEPOINT_P256_MLDSA44 | rsa3072_mldsa44 | 0xff07 |Yes| OQS_CODEPOINT_RSA3072_MLDSA44 diff --git a/oqs-template/generate.py b/oqs-template/generate.py index cfc69c3a..f99389a3 100644 --- a/oqs-template/generate.py +++ b/oqs-template/generate.py @@ -8,6 +8,7 @@ import shutil import subprocess import yaml +from ruamel.yaml import YAML kemoidcnt=0 @@ -229,6 +230,62 @@ def load_config(include_disabled_sigs=False): hybrid_nids.add(extra_hybrid_nid) return config +def complete_kem_nids(): + yaml = YAML() + yaml.indent(mapping=2, sequence=4, offset=2) + yaml.preserve_quotes = True + + with open(os.path.join('oqs-template', 'generate.yml'), "r") as f: + config = yaml.load(f) + + remainder_kem_nids = [str(x) for x in range(65024, 65280)] + def assignNid(): + if len(remainder_kem_nids) == 0: + print(f'Surpassed number of available nids. Exiting process now.') + exit(1) + nid = remainder_kem_nids[0] + remainder_kem_nids.pop(0) + return nid + + # remove established NIDs for KEMs (nid, hybrid_nid) + for kem in config['kems']: + # 'nid' + if 'nid' in kem: + nid = kem['nid'] + if nid in remainder_kem_nids: + remainder_kem_nids.remove(nid) + # 'nid_hybrid' + if 'nid_hybrid' in kem: + nid_hybrid = kem['nid_hybrid'] + if nid_hybrid in remainder_kem_nids: + remainder_kem_nids.remove(nid_hybrid) + # 'extra_nids.current.nid' + if 'extra_nids' not in kem or 'current' not in kem['extra_nids']: + continue + for extra_hybrid in kem['extra_nids']['current']: + if 'nid' in extra_hybrid: + nid = extra_hybrid['nid'] + if nid in remainder_kem_nids: + remainder_kem_nids.remove(nid) + + for kem in config['kems']: + if 'extra_nids' in kem and 'old' in kem['extra_nids'] and 'current' not in kem['extra_nids']: + continue + if not 'nid' in kem: + kem['nid'] = assignNid() + if not 'nid_hybrid' in kem: + kem['nid_hybrid'] = assignNid() + if 'extra_nids' not in kem or 'current' not in kem['extra_nids']: + continue + for extra_hybrid in kem['extra_nids']['current']: + if not 'nid' in extra_hybrid: + extra_hybrid['nid'] = assignNid() + + with open(os.path.join('oqs-template', 'generate.yml'), mode='w', encoding='utf-8') as f: + yaml.dump(config, f) + +complete_kem_nids() + # extend config with "hybrid_groups" array: config = load_config() # extend config with "hybrid_groups" array diff --git a/oqs-template/generate.yml b/oqs-template/generate.yml index 89ace50d..43504504 100644 --- a/oqs-template/generate.yml +++ b/oqs-template/generate.yml @@ -1,62 +1,54 @@ # This is the master document for ID interoperability for KEM IDs, p-hybrid KEM IDs, SIG (O)IDs -# Next free plain KEM ID: 0x024D, p-hybrid: 0x2F4F, X-hybrid: 0x2FB9 -# Switch to using unassigned code points as per https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8: -# Next free: 65027 (see https://github.com/open-quantum-safe/oqs-provider/issues/561) +# Code points as per https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8: +# Next free: 65061 kems: - - - family: 'FrodoKEM' + - family: 'FrodoKEM' name_group: 'frodo640aes' nid: '65024' - nid_hybrid: '0x2F00' + nid_hybrid: '65027' oqs_alg: 'OQS_KEM_alg_frodokem_640_aes' extra_nids: current: - hybrid_group: "x25519" - nid: '0x2F80' - - - family: 'FrodoKEM' + nid: '65028' + - family: 'FrodoKEM' name_group: 'frodo640shake' nid: '65025' - nid_hybrid: '0x2F01' + nid_hybrid: '65029' oqs_alg: 'OQS_KEM_alg_frodokem_640_shake' extra_nids: current: - hybrid_group: "x25519" - nid: '0x2F81' - - - family: 'FrodoKEM' + nid: '65030' + - family: 'FrodoKEM' name_group: 'frodo976aes' nid: '65026' - nid_hybrid: '0x2F02' + nid_hybrid: '65031' oqs_alg: 'OQS_KEM_alg_frodokem_976_aes' extra_nids: current: - hybrid_group: "x448" - nid: '0x2F82' - - - family: 'FrodoKEM' + nid: '65032' + - family: 'FrodoKEM' name_group: 'frodo976shake' - nid: '0x0203' - nid_hybrid: '0x2F03' + nid: '65033' + nid_hybrid: '65034' oqs_alg: 'OQS_KEM_alg_frodokem_976_shake' extra_nids: current: - hybrid_group: "x448" - nid: '0x2F83' - - - family: 'FrodoKEM' + nid: '65035' + - family: 'FrodoKEM' name_group: 'frodo1344aes' - nid: '0x0204' - nid_hybrid: '0x2F04' + nid: '65036' + nid_hybrid: '65037' oqs_alg: 'OQS_KEM_alg_frodokem_1344_aes' - - - family: 'FrodoKEM' + - family: 'FrodoKEM' name_group: 'frodo1344shake' - nid: '0x0205' - nid_hybrid: '0x2F05' + nid: '65038' + nid_hybrid: '65039' oqs_alg: 'OQS_KEM_alg_frodokem_1344_shake' - - - family: 'BIKE' + - family: 'BIKE' name_group: 'bike1l1cpa' bit_security: 128 extra_nids: @@ -69,8 +61,7 @@ kems: hybrid_group: secp256_r1 nid: '0x2F06' oqs_alg: 'OQS_KEM_alg_bike1_l1_cpa' - - - family: 'BIKE' + - family: 'BIKE' name_group: 'bike1l3cpa' bit_security: 192 extra_nids: @@ -83,8 +74,7 @@ kems: hybrid_group: secp384_r1 nid: '0x2F07' oqs_alg: 'OQS_KEM_alg_bike1_l3_cpa' - - - family: 'CRYSTALS-Kyber' + - family: 'CRYSTALS-Kyber' name_group: 'kyber512' oid: '1.3.6.1.4.1.2.267.8.2.2' oqs_alg: 'OQS_KEM_alg_kyber_512' @@ -112,8 +102,7 @@ kems: nist-round: 2 hybrid_group: x25519 nid: '0x2F26' - - - family: 'CRYSTALS-Kyber' + - family: 'CRYSTALS-Kyber' name_group: 'kyber768' oid: '1.3.6.1.4.1.2.267.8.3.3' extra_nids: @@ -145,8 +134,7 @@ kems: hybrid_group: secp384_r1 nid: '0x2F10' oqs_alg: 'OQS_KEM_alg_kyber_768' - - - family: 'CRYSTALS-Kyber' + - family: 'CRYSTALS-Kyber' name_group: 'kyber1024' oid: '1.3.6.1.4.1.2.267.8.4.4' extra_nids: @@ -169,8 +157,7 @@ kems: # end of IBM support section # NIST OIDs see https://csrc.nist.gov/projects/computer-security-objects-register/algorithm-registration # KEM prefix 2.16.840.1.101.3.4.4. - - - family: 'ML-KEM' + - family: 'ML-KEM' fips_standard: 1 name_group: 'mlkem512' # https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8 @@ -178,7 +165,7 @@ kems: # NIST kem 1 oid: '2.16.840.1.101.3.4.4.1' # code point not standardized: Why? XXX - nid_hybrid: '0x2F4B' + nid_hybrid: '65040' # retain OIDs of the Legion of the BouncyCastle: XXX check if OK hybrid_oid: '1.3.6.1.4.1.22554.5.7.1' oqs_alg: 'OQS_KEM_alg_ml_kem_512' @@ -188,9 +175,8 @@ kems: # retain OIDs of the Legion of the BouncyCastle: XXX check if OK hybrid_oid: '1.3.6.1.4.1.22554.5.8.1' # code point not standardized: Why? XXX - nid: '0x2FB6' - - - family: 'ML-KEM' + nid: '65041' + - family: 'ML-KEM' fips_standard: 1 name_group: 'mlkem768' # https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8 @@ -198,13 +184,13 @@ kems: # NIST kem 2 oid: '2.16.840.1.101.3.4.4.2' # code point not standardized: Why? XXX - nid_hybrid: '0x2F4C' + nid_hybrid: '65042' oqs_alg: 'OQS_KEM_alg_ml_kem_768' extra_nids: current: - hybrid_group: "x448" # code point not standardized: Why? XXX - nid: '0x2FB7' + nid: '65043' - hybrid_group: "x25519" # https://www.ietf.org/archive/id/draft-kwiatkowski-tls-ecdhe-mlkem-02.html#name-x25519mlkem768 nid: '0x11ec' @@ -213,8 +199,7 @@ kems: # https://www.ietf.org/archive/id/draft-kwiatkowski-tls-ecdhe-mlkem-02.html#name-secp256r1mlkem768 nid: '0x11eb' standard_name: "SecP256r1MLKEM768" - - - family: 'ML-KEM' + - family: 'ML-KEM' fips_standard: 1 name_group: 'mlkem1024' # https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8 @@ -222,7 +207,7 @@ kems: # NIST kem 3 oid: '2.16.840.1.101.3.4.4.3' # code point not standardized: Why? XXX - nid_hybrid: '0x2F4D' + nid_hybrid: '65044' oqs_alg: 'OQS_KEM_alg_ml_kem_1024' extra_nids: current: @@ -235,8 +220,7 @@ kems: # code point standardization proposal as per https://www.ietf.org/archive/id/draft-kwiatkowski-tls-ecdhe-mlkem-03.html nid: '0x11ED' standard_name: "SecP384r1MLKEM1024" - - - family: 'BIKE' + - family: 'BIKE' name_group: 'bike1l1fo' bit_security: 128 extra_nids: @@ -253,8 +237,7 @@ kems: hybrid_group: "x25519" nid: '0x2F28' oqs_alg: 'OQS_KEM_alg_bike1_l1_fo' - - - family: 'BIKE' + - family: 'BIKE' name_group: 'bike1l3fo' bit_security: 192 extra_nids: @@ -267,17 +250,16 @@ kems: hybrid_group: secp384_r1 nid: '0x2F24' oqs_alg: 'OQS_KEM_alg_bike1_l3_fo' - - - family: 'BIKE' + - family: 'BIKE' name_group: 'bikel1' implementation_version: '5.1' - nid: '0x0241' - nid_hybrid: '0x2F41' + nid: '65045' + nid_hybrid: '65046' oqs_alg: 'OQS_KEM_alg_bike_l1' extra_nids: current: - hybrid_group: "x25519" - nid: '0x2FAE' + nid: '65047' old: - implementation_version: NIST Round 3 submission nist-round: 3 @@ -290,17 +272,16 @@ kems: nist-round: 3 hybrid_group: secp256_r1 nid: '0x2F38' - - - family: 'BIKE' + - family: 'BIKE' name_group: 'bikel3' implementation_version: '5.1' - nid: '0x0242' - nid_hybrid: '0x2F42' + nid: '65048' + nid_hybrid: '65049' oqs_alg: 'OQS_KEM_alg_bike_l3' extra_nids: current: - hybrid_group: "x448" - nid: '0x2FAF' + nid: '65050' old: - implementation_version: NIST Round 3 submission nist-round: 3 @@ -309,15 +290,13 @@ kems: nist-round: 3 hybrid_group: secp384_r1 nid: '0x2F3B' - - - family: 'BIKE' + - family: 'BIKE' name_group: 'bikel5' implementation_version: '5.1' - nid: '0x0243' - nid_hybrid: '0x2F43' + nid: '65051' + nid_hybrid: '65052' oqs_alg: 'OQS_KEM_alg_bike_l5' - - - family: 'CRYSTALS-Kyber' + - family: 'CRYSTALS-Kyber' name_group: 'kyber90s512' extra_nids: old: @@ -340,8 +319,7 @@ kems: hybrid_group: x25519 nid: '0x2FA9' oqs_alg: 'OQS_KEM_alg_kyber_512_90s' - - - family: 'CRYSTALS-Kyber' + - family: 'CRYSTALS-Kyber' name_group: 'kyber90s768' extra_nids: old: @@ -364,8 +342,7 @@ kems: hybrid_group: x448 nid: '0x2FAA' oqs_alg: 'OQS_KEM_alg_kyber_768_90s' - - - family: 'CRYSTALS-Kyber' + - family: 'CRYSTALS-Kyber' name_group: 'kyber90s1024' extra_nids: old: @@ -384,16 +361,15 @@ kems: hybrid_group: secp521_r1 nid: '0x2F40' oqs_alg: 'OQS_KEM_alg_kyber_1024_90s' - - - family: 'HQC' + - family: 'HQC' name_group: 'hqc128' - nid: '0x0244' - nid_hybrid: '0x2F44' + nid: '65053' + nid_hybrid: '65054' oqs_alg: 'OQS_KEM_alg_hqc_128' extra_nids: current: - hybrid_group: "x25519" - nid: '0x2FB0' + nid: '65055' old: - implementation_version: NIST Round 3 submission nist-round: 3 @@ -406,16 +382,15 @@ kems: nist-round: 3 hybrid_group: x25519 nid: '0x2FAC' - - - family: 'HQC' + - family: 'HQC' name_group: 'hqc192' - nid: '0x0245' - nid_hybrid: '0x2F45' + nid: '65056' + nid_hybrid: '65057' oqs_alg: 'OQS_KEM_alg_hqc_192' extra_nids: current: - hybrid_group: "x448" - nid: '0x2FB1' + nid: '65058' old: - implementation_version: NIST Round 3 submission nist-round: 3 @@ -428,11 +403,10 @@ kems: nist-round: 3 hybrid_group: x448 nid: '0x2FAD' - - - family: 'HQC' + - family: 'HQC' name_group: 'hqc256' - nid: '0x0246' - nid_hybrid: '0x2F46' + nid: '65059' + nid_hybrid: '65060' oqs_alg: 'OQS_KEM_alg_hqc_256' extra_nids: old: @@ -444,8 +418,8 @@ kems: hybrid_group: secp521_r1 nid: '0x2F2E' -kem_nid_end: '0x0250' -kem_nid_hybrid_end: '0x2FFF' +kem_nid_end: '65279' +kem_nid_hybrid_end: '65279' # 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: 0xff0a @@ -476,7 +450,6 @@ sigs: # 'pretty_name': 'ECDSA p256', # 'security': '128', # 'oid': '2.16.840.1.114027.80.1.8'}] - - # The Composite OIDs are kept up to date by @feventura (Entrust) # These are prototype OIDs and are in line with draft-ietf-lamps-pq-composite-sigs-02 # OID scheme for composite variants: @@ -506,10 +479,9 @@ sigs: # Dilithium-r3 (7) - family: 'CRYSTALS-Dilithium' + - family: 'CRYSTALS-Dilithium' variants: - - - name: 'dilithium2' + - name: 'dilithium2' pretty_name: 'Dilithium2' oqs_meth: 'OQS_SIG_alg_dilithium_2' extra_nids: @@ -520,16 +492,10 @@ sigs: code_point: '0xfea0' supported_encodings: ['draft-uni-qsckeys-dilithium-00/sk-pk'] enable: true - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.2.7.1', - 'code_point': '0xfea1'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.2.7.2', - 'code_point': '0xfea2'}] - - - name: 'dilithium3' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.2.7.1', + 'code_point': '0xfea1'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.2.7.2', 'code_point': '0xfea2'}] + - name: 'dilithium3' pretty_name: 'Dilithium3' oqs_meth: 'OQS_SIG_alg_dilithium_3' extra_nids: @@ -540,12 +506,9 @@ sigs: code_point: '0xfea3' supported_encodings: ['draft-uni-qsckeys-dilithium-00/sk-pk'] enable: true - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.2.7.3', - 'code_point': '0xfea4'}] - - - name: 'dilithium5' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.2.7.3', + 'code_point': '0xfea4'}] + - name: 'dilithium5' pretty_name: 'Dilithium5' oqs_meth: 'OQS_SIG_alg_dilithium_5' extra_nids: @@ -556,12 +519,9 @@ sigs: code_point: '0xfea5' supported_encodings: ['draft-uni-qsckeys-dilithium-00/sk-pk'] enable: true - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.2.7.4', - 'code_point': '0xfea6'}] - - - name: 'dilithium2_aes' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.2.7.4', + 'code_point': '0xfea6'}] + - name: 'dilithium2_aes' pretty_name: 'Dilithium2_AES' oqs_meth: 'OQS_SIG_alg_dilithium_2_aes' extra_nids: @@ -571,16 +531,10 @@ sigs: oid: '1.3.6.1.4.1.2.267.11.4.4' code_point: '0xfea7' supported_encodings: ['draft-uni-qsckeys-dilithium-00/sk-pk'] - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.2.11.1', - 'code_point': '0xfea8'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.2.11.2', - 'code_point': '0xfea9'}] - - - name: 'dilithium3_aes' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.2.11.1', + 'code_point': '0xfea8'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.2.11.2', 'code_point': '0xfea9'}] + - name: 'dilithium3_aes' pretty_name: 'Dilithium3_AES' oqs_meth: 'OQS_SIG_alg_dilithium_3_aes' extra_nids: @@ -590,12 +544,9 @@ sigs: oid: '1.3.6.1.4.1.2.267.11.6.5' code_point: '0xfeaa' supported_encodings: ['draft-uni-qsckeys-dilithium-00/sk-pk'] - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.2.11.3', - 'code_point': '0xfeab'}] - - - name: 'dilithium5_aes' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.2.11.3', + 'code_point': '0xfeab'}] + - name: 'dilithium5_aes' pretty_name: 'Dilithium5_AES' oqs_meth: 'OQS_SIG_alg_dilithium_5_aes' extra_nids: @@ -605,232 +556,139 @@ sigs: oid: '1.3.6.1.4.1.2.267.11.8.7' code_point: '0xfeac' supported_encodings: ['draft-uni-qsckeys-dilithium-00/sk-pk'] - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.2.11.4', - 'code_point': '0xfead'}] + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.2.11.4', + 'code_point': '0xfead'}] # NIST OIDs see https://csrc.nist.gov/projects/computer-security-objects-register/algorithm-registration # Signature prefix 2.16.840.1.101.3.4.3. # ML-DSA code points: https://datatracker.ietf.org/doc/draft-tls-westerbaan-mldsa/00 # Composite-ML-DSA OIDs: https://datatracker.ietf.org/doc/draft-ietf-lamps-pq-composite-sigs/02/ # Composite-ML-DSA code points: https://datatracker.ietf.org/doc/draft-reddy-tls-composite-mldsa/01 - - - family: 'ML-DSA' + - family: 'ML-DSA' variants: - - - name: 'mldsa44' + - name: 'mldsa44' 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: '0x0904' enable: true - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.7.5', - 'code_point': '0xff06'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.7.6', - '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': '0x090f'}, - {'name': 'rsa2048', - 'pretty_name': 'RSA2048', - 'security': '112', - 'oid': '2.16.840.1.114027.80.8.1.2', - 'code_point': '0x090c'}, - {'name': 'ed25519', - 'pretty_name': 'ED25519', - 'security': '128', - 'oid': '2.16.840.1.114027.80.8.1.3', - 'code_point': '0x090a'}, - {'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'security': '128', - 'oid': '2.16.840.1.114027.80.8.1.4', - 'code_point': '0x0907'}, - {'name': 'bp256', - 'pretty_name': 'ECDSA brainpoolP256r1', - 'security': '256', - 'oid': '2.16.840.1.114027.80.8.1.5', - 'code_point': '0xfee5'}] - - - name: 'mldsa65' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.7.5', + 'code_point': '0xff06'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.7.6', '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': '0x090f'}, {'name': 'rsa2048', + 'pretty_name': 'RSA2048', 'security': '112', 'oid': '2.16.840.1.114027.80.8.1.2', + 'code_point': '0x090c'}, {'name': 'ed25519', 'pretty_name': 'ED25519', + 'security': '128', 'oid': '2.16.840.1.114027.80.8.1.3', 'code_point': '0x090a'}, + {'name': 'p256', 'pretty_name': 'ECDSA p256', 'security': '128', 'oid': '2.16.840.1.114027.80.8.1.4', + 'code_point': '0x0907'}, {'name': 'bp256', 'pretty_name': 'ECDSA brainpoolP256r1', + 'security': '256', 'oid': '2.16.840.1.114027.80.8.1.5', 'code_point': '0xfee5'}] + - name: 'mldsa65' 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: '0x0905' enable: true - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.7.7', - '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': '0x0910'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA 3072', - 'security': '128', - 'oid': '2.16.840.1.114027.80.8.1.7', - 'code_point': '0x090d'}, - {'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'security': '128', - 'oid': '2.16.840.1.114027.80.8.1.8', - 'code_point': '0x0908'}, - {'name': 'bp256', - 'pretty_name': 'ECDSA brainpoolP256r1', - 'security': '256', - 'oid': '2.16.840.1.114027.80.8.1.9', - 'code_point': '0xfee9'}, - {'name': 'ed25519', - 'pretty_name': 'ED25519', - 'security': '128', - 'oid': '2.16.840.1.114027.80.8.1.10', - 'code_point': '0x090b'}] - - - name: 'mldsa87' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.7.7', + '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': '0x0910'}, {'name': 'rsa3072', + 'pretty_name': 'RSA 3072', 'security': '128', 'oid': '2.16.840.1.114027.80.8.1.7', + 'code_point': '0x090d'}, {'name': 'p256', 'pretty_name': 'ECDSA p256', + 'security': '128', 'oid': '2.16.840.1.114027.80.8.1.8', 'code_point': '0x0908'}, + {'name': 'bp256', 'pretty_name': 'ECDSA brainpoolP256r1', 'security': '256', + 'oid': '2.16.840.1.114027.80.8.1.9', 'code_point': '0xfee9'}, {'name': 'ed25519', + 'pretty_name': 'ED25519', 'security': '128', 'oid': '2.16.840.1.114027.80.8.1.10', + '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: '0x0906' enable: true - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.7.8', - 'code_point': '0xff09'}] - composite: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'security': '192', - 'oid': '2.16.840.1.114027.80.8.1.11', - 'code_point': '0x0909'}, - {'name': 'bp384', - 'pretty_name': 'ECDSA brainpoolP384r1', - 'security': '384', - 'oid': '2.16.840.1.114027.80.8.1.12', - 'code_point': '0xfeec'}, - {'name': 'ed448', - 'pretty_name': 'ED448', - 'security': '192', - 'oid': '2.16.840.1.114027.80.8.1.13', - 'code_point': '0x0912'}] - - + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.7.8', + 'code_point': '0xff09'}] + composite: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'security': '192', + 'oid': '2.16.840.1.114027.80.8.1.11', 'code_point': '0x0909'}, {'name': 'bp384', + 'pretty_name': 'ECDSA brainpoolP384r1', 'security': '384', 'oid': '2.16.840.1.114027.80.8.1.12', + 'code_point': '0xfeec'}, {'name': 'ed448', 'pretty_name': 'ED448', 'security': '192', + 'oid': '2.16.840.1.114027.80.8.1.13', 'code_point': '0x0912'}] # iso (1) # identified-organization (3) # reserved (9999) # falcon (3) - family: 'Falcon' + - family: 'Falcon' variants: - - - name: 'falcon512' + - name: 'falcon512' pretty_name: 'Falcon-512' oqs_meth: 'OQS_SIG_alg_falcon_512' oid: '1.3.9999.3.11' code_point: '0xfed7' supported_encodings: ['draft-uni-qsckeys-falcon-00/sk-pk'] enable: true - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.3.12', - 'code_point': '0xfed8'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.3.13', - 'code_point': '0xfed9'}] + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.3.12', + 'code_point': '0xfed8'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.3.13', 'code_point': '0xfed9'}] extra_nids: old: - implementation_version: PQClean Round 3 version labelled 20211101 nist-round: 3 oid: '1.3.9999.3.6' code_point: '0xfeae' - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.3.7', - 'code_point': '0xfeaf'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.3.8', - 'code_point': '0xfeb0'}] + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.3.7', + 'code_point': '0xfeaf'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.3.8', 'code_point': '0xfeb0'}] - implementation_version: NIST Round 3 submission nist-round: 3 oid: '1.3.9999.3.1' code_point: '0xfe0b' - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.3.2', - 'code_point': '0xfe0c'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.3.3', - 'code_point': '0xfe0d'}] - - - name: 'falconpadded512' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.3.2', + 'code_point': '0xfe0c'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.3.3', 'code_point': '0xfe0d'}] + - name: 'falconpadded512' pretty_name: 'Falcon-padded-512' oqs_meth: 'OQS_SIG_alg_falcon_padded_512' oid: '1.3.9999.3.16' code_point: '0xfedc' supported_encodings: ['draft-uni-qsckeys-falcon-00/sk-pk'] enable: true - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.3.17', - 'code_point': '0xfedd'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.3.18', - 'code_point': '0xfede'}] - - - name: 'falcon1024' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.3.17', + 'code_point': '0xfedd'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.3.18', 'code_point': '0xfede'}] + - name: 'falcon1024' pretty_name: 'Falcon-1024' oqs_meth: 'OQS_SIG_alg_falcon_1024' oid: '1.3.9999.3.14' code_point: '0xfeda' supported_encodings: ['draft-uni-qsckeys-falcon-00/sk-pk'] enable: true - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.3.15', - 'code_point': '0xfedb'}] + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.3.15', + 'code_point': '0xfedb'}] extra_nids: old: - implementation_version: PQClean Round 3 version labelled 20211101 nist-round: 3 oid: '1.3.9999.3.9' code_point: '0xfeb1' - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.3.10', - 'code_point': '0xfeb2'}] + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.3.10', + 'code_point': '0xfeb2'}] - implementation_version: NIST Round 3 submission nist-round: 3 oid: '1.3.9999.3.4' code_point: '0xfe0e' - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.3.5', - 'code_point': '0xfe0f'}] - - - name: 'falconpadded1024' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.3.5', + 'code_point': '0xfe0f'}] + - name: 'falconpadded1024' pretty_name: 'Falcon-padded-1024' oqs_meth: 'OQS_SIG_alg_falcon_padded_1024' oid: '1.3.9999.3.19' code_point: '0xfedf' supported_encodings: ['draft-uni-qsckeys-falcon-00/sk-pk'] enable: true - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.3.20', - 'code_point': '0xfee0'}] - - - family: 'SPHINCS-Haraka' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.3.20', + 'code_point': '0xfee0'}] + - family: 'SPHINCS-Haraka' variants: - - - name: 'sphincsharaka128frobust' + - name: 'sphincsharaka128frobust' pretty_name: 'SPHINCS+-Haraka-128f-robust' oqs_meth: 'OQS_SIG_alg_sphincs_haraka_128f_robust' extra_nids: @@ -840,16 +698,10 @@ sigs: oid: '1.3.9999.6.1.1' code_point: '0xfe42' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.1.2', - 'code_point': '0xfe43'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.1.3', - 'code_point': '0xfe44'}] - - - name: 'sphincsharaka128fsimple' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.1.2', + 'code_point': '0xfe43'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.1.3', 'code_point': '0xfe44'}] + - name: 'sphincsharaka128fsimple' pretty_name: 'SPHINCS+-Haraka-128f-simple' oqs_meth: 'OQS_SIG_alg_sphincs_haraka_128f_simple' extra_nids: @@ -859,16 +711,10 @@ sigs: oid: '1.3.9999.6.1.4' code_point: '0xfe45' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.1.5', - 'code_point': '0xfe46'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.1.6', - 'code_point': '0xfe47'}] - - - name: 'sphincsharaka128srobust' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.1.5', + 'code_point': '0xfe46'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.1.6', 'code_point': '0xfe47'}] + - name: 'sphincsharaka128srobust' pretty_name: 'SPHINCS+-Haraka-128s-robust' oqs_meth: 'OQS_SIG_alg_sphincs_haraka_128s_robust' extra_nids: @@ -878,16 +724,10 @@ sigs: oid: '1.3.9999.6.1.7' code_point: '0xfe48' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.1.8', - 'code_point': '0xfe49'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.1.9', - 'code_point': '0xfe4a'}] - - - name: 'sphincsharaka128ssimple' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.1.8', + 'code_point': '0xfe49'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.1.9', 'code_point': '0xfe4a'}] + - name: 'sphincsharaka128ssimple' pretty_name: 'SPHINCS+-Haraka-128s-simple' oqs_meth: 'OQS_SIG_alg_sphincs_haraka_128s_simple' extra_nids: @@ -897,16 +737,10 @@ sigs: oid: '1.3.9999.6.1.10' code_point: '0xfe4b' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.1.11', - 'code_point': '0xfe4c'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.1.12', - 'code_point': '0xfe4d'}] - - - name: 'sphincsharaka192frobust' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.1.11', + 'code_point': '0xfe4c'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.1.12', 'code_point': '0xfe4d'}] + - name: 'sphincsharaka192frobust' pretty_name: 'SPHINCS+-Haraka-192f-robust' oqs_meth: 'OQS_SIG_alg_sphincs_haraka_192f_robust' extra_nids: @@ -916,12 +750,9 @@ sigs: oid: '1.3.9999.6.2.1' code_point: '0xfe4e' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.2.2', - 'code_point': '0xfe4f'}] - - - name: 'sphincsharaka192fsimple' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.2.2', + 'code_point': '0xfe4f'}] + - name: 'sphincsharaka192fsimple' pretty_name: 'SPHINCS+-Haraka-192f-simple' oqs_meth: 'OQS_SIG_alg_sphincs_haraka_192f_simple' extra_nids: @@ -931,12 +762,9 @@ sigs: oid: '1.3.9999.6.2.3' code_point: '0xfe50' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.2.4', - 'code_point': '0xfe51'}] - - - name: 'sphincsharaka192srobust' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.2.4', + 'code_point': '0xfe51'}] + - name: 'sphincsharaka192srobust' pretty_name: 'SPHINCS+-Haraka-192s-robust' oqs_meth: 'OQS_SIG_alg_sphincs_haraka_192s_robust' extra_nids: @@ -946,12 +774,9 @@ sigs: oid: '1.3.9999.6.2.5' code_point: '0xfe52' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.2.6', - 'code_point': '0xfe53'}] - - - name: 'sphincsharaka192ssimple' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.2.6', + 'code_point': '0xfe53'}] + - name: 'sphincsharaka192ssimple' pretty_name: 'SPHINCS+-Haraka-192s-simple' oqs_meth: 'OQS_SIG_alg_sphincs_haraka_192s_simple' extra_nids: @@ -961,12 +786,9 @@ sigs: oid: '1.3.9999.6.2.7' code_point: '0xfe54' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.2.8', - 'code_point': '0xfe55'}] - - - name: 'sphincsharaka256frobust' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.2.8', + 'code_point': '0xfe55'}] + - name: 'sphincsharaka256frobust' pretty_name: 'SPHINCS+-Haraka-256f-robust' oqs_meth: 'OQS_SIG_alg_sphincs_haraka_256f_robust' extra_nids: @@ -976,12 +798,9 @@ sigs: oid: '1.3.9999.6.3.1' code_point: '0xfe56' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.3.2', - 'code_point': '0xfe57'}] - - - name: 'sphincsharaka256fsimple' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.3.2', + 'code_point': '0xfe57'}] + - name: 'sphincsharaka256fsimple' pretty_name: 'SPHINCS+-Haraka-256f-simple' oqs_meth: 'OQS_SIG_alg_sphincs_haraka_256f_simple' extra_nids: @@ -991,12 +810,9 @@ sigs: oid: '1.3.9999.6.3.3' code_point: '0xfe58' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.3.4', - 'code_point': '0xfe59'}] - - - name: 'sphincsharaka256srobust' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.3.4', + 'code_point': '0xfe59'}] + - name: 'sphincsharaka256srobust' pretty_name: 'SPHINCS+-Haraka-256s-robust' oqs_meth: 'OQS_SIG_alg_sphincs_haraka_256s_robust' extra_nids: @@ -1006,12 +822,9 @@ sigs: oid: '1.3.9999.6.3.5' code_point: '0xfe5a' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.3.6', - 'code_point': '0xfe5b'}] - - - name: 'sphincsharaka256ssimple' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.3.6', + 'code_point': '0xfe5b'}] + - name: 'sphincsharaka256ssimple' pretty_name: 'SPHINCS+-Haraka-256s-simple' oqs_meth: 'OQS_SIG_alg_sphincs_haraka_256s_simple' extra_nids: @@ -1021,15 +834,11 @@ sigs: oid: '1.3.9999.6.3.7' code_point: '0xfe5c' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.3.8', - 'code_point': '0xfe5d'}] - - - family: 'SPHINCS-SHA2' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.3.8', + 'code_point': '0xfe5d'}] + - family: 'SPHINCS-SHA2' variants: - - - name: 'sphincssha26128frobust' + - name: 'sphincssha26128frobust' pretty_name: 'SPHINCS+-SHA256-128f-robust' oqs_meth: 'OQS_SIG_alg_sphincs_sha256_128f_robust' extra_nids: @@ -1039,30 +848,19 @@ sigs: oid: '1.3.9999.6.4.1' code_point: '0xfe5e' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.4.2', - 'code_point': '0xfe5f'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.4.3', - 'code_point': '0xfe60'}] - - - name: 'sphincssha2128fsimple' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.4.2', + 'code_point': '0xfe5f'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.4.3', 'code_point': '0xfe60'}] + - name: 'sphincssha2128fsimple' pretty_name: 'SPHINCS+-SHA2-128f-simple' oqs_meth: 'OQS_SIG_alg_sphincs_sha2_128f_simple' oid: '1.3.9999.6.4.13' code_point: '0xfeb3' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] enable: true - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.4.14', - 'code_point': '0xfeb4'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.4.15', - 'code_point': '0xfeb5'}] + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.4.14', + 'code_point': '0xfeb4'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.4.15', 'code_point': '0xfeb5'}] extra_nids: old: - implementation_version: NIST Round 3 submission @@ -1070,16 +868,10 @@ sigs: oid: '1.3.9999.6.4.4' code_point: '0xfe61' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.4.5', - 'code_point': '0xfe62'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.4.6', - 'code_point': '0xfe63'}] - - - name: 'sphincssha256128srobust' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.4.5', + 'code_point': '0xfe62'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.4.6', 'code_point': '0xfe63'}] + - name: 'sphincssha256128srobust' pretty_name: 'SPHINCS+-SHA256-128s-robust' oqs_meth: 'OQS_SIG_alg_sphincs_sha256_128s_robust' extra_nids: @@ -1089,30 +881,19 @@ sigs: oid: '1.3.9999.6.4.7' code_point: '0xfe64' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.4.8', - 'code_point': '0xfe65'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.4.9', - 'code_point': '0xfe66'}] - - - name: 'sphincssha2128ssimple' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.4.8', + 'code_point': '0xfe65'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.4.9', 'code_point': '0xfe66'}] + - name: 'sphincssha2128ssimple' pretty_name: 'SPHINCS+-SHA2-128s-simple' oqs_meth: 'OQS_SIG_alg_sphincs_sha2_128s_simple' oid: '1.3.9999.6.4.16' code_point: '0xfeb6' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] enable: true - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.4.17', - 'code_point': '0xfeb7'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.4.18', - 'code_point': '0xfeb8'}] + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.4.17', + 'code_point': '0xfeb7'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.4.18', 'code_point': '0xfeb8'}] extra_nids: old: - implementation_version: NIST Round 3 submission @@ -1120,16 +901,10 @@ sigs: oid: '1.3.9999.6.4.10' code_point: '0xfe67' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.4.11', - 'code_point': '0xfe68'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.4.12', - 'code_point': '0xfe69'}] - - - name: 'sphincssha256192frobust' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.4.11', + 'code_point': '0xfe68'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.4.12', 'code_point': '0xfe69'}] + - name: 'sphincssha256192frobust' pretty_name: 'SPHINCS+-SHA256-192f-robust' oqs_meth: 'OQS_SIG_alg_sphincs_sha256_192f_robust' extra_nids: @@ -1139,22 +914,17 @@ sigs: oid: '1.3.9999.6.5.1' code_point: '0xfe6a' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.5.2', - 'code_point': '0xfe6b'}] - - - name: 'sphincssha2192fsimple' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.5.2', + 'code_point': '0xfe6b'}] + - name: 'sphincssha2192fsimple' pretty_name: 'SPHINCS+-SHA2-192f-simple' oqs_meth: 'OQS_SIG_alg_sphincs_sha2_192f_simple' oid: '1.3.9999.6.5.10' code_point: '0xfeb9' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] enable: true - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.5.11', - 'code_point': '0xfeba'}] + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.5.11', + 'code_point': '0xfeba'}] extra_nids: old: - implementation_version: NIST Round 3 submission @@ -1162,12 +932,9 @@ sigs: oid: '1.3.9999.6.5.3' code_point: '0xfe6c' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.5.4', - 'code_point': '0xfe6d'}] - - - name: 'sphincssha256192srobust' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.5.4', + 'code_point': '0xfe6d'}] + - name: 'sphincssha256192srobust' pretty_name: 'SPHINCS+-SHA256-192s-robust' oqs_meth: 'OQS_SIG_alg_sphincs_sha256_192s_robust' extra_nids: @@ -1177,22 +944,17 @@ sigs: oid: '1.3.9999.6.5.5' code_point: '0xfe6e' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.5.6', - 'code_point': '0xfe6f'}] - - - name: 'sphincssha2192ssimple' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.5.6', + 'code_point': '0xfe6f'}] + - name: 'sphincssha2192ssimple' pretty_name: 'SPHINCS+-SHA2-192s-simple' oqs_meth: 'OQS_SIG_alg_sphincs_sha2_192s_simple' oid: '1.3.9999.6.5.12' code_point: '0xfebb' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] enable: false - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.5.13', - 'code_point': '0xfebc'}] + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.5.13', + 'code_point': '0xfebc'}] extra_nids: old: - implementation_version: NIST Round 3 submission @@ -1200,12 +962,9 @@ sigs: oid: '1.3.9999.6.5.7' code_point: '0xfe70' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.5.8', - 'code_point': '0xfe71'}] - - - name: 'sphincssha256256frobust' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.5.8', + 'code_point': '0xfe71'}] + - name: 'sphincssha256256frobust' pretty_name: 'SPHINCS+-SHA256-256f-robust' oqs_meth: 'OQS_SIG_alg_sphincs_sha256_256f_robust' extra_nids: @@ -1215,22 +974,17 @@ sigs: oid: '1.3.9999.6.6.1' code_point: '0xfe72' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.6.2', - 'code_point': '0xfe73'}] - - - name: 'sphincssha2256fsimple' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.6.2', + 'code_point': '0xfe73'}] + - name: 'sphincssha2256fsimple' pretty_name: 'SPHINCS+-SHA2-256f-simple' oqs_meth: 'OQS_SIG_alg_sphincs_sha2_256f_simple' oid: '1.3.9999.6.6.10' code_point: '0xfebd' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] enable: false - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.6.11', - 'code_point': '0xfebe'}] + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.6.11', + 'code_point': '0xfebe'}] extra_nids: old: - implementation_version: NIST Round 3 submission @@ -1238,12 +992,9 @@ sigs: oid: '1.3.9999.6.6.3' code_point: '0xfe74' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.6.4', - 'code_point': '0xfe75'}] - - - name: 'sphincssha256256srobust' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.6.4', + 'code_point': '0xfe75'}] + - name: 'sphincssha256256srobust' pretty_name: 'SPHINCS+-SHA256-256s-robust' oqs_meth: 'OQS_SIG_alg_sphincs_sha256_256s_robust' extra_nids: @@ -1253,22 +1004,17 @@ sigs: oid: '1.3.9999.6.6.5' code_point: '0xfe76' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.6.6', - 'code_point': '0xfe77'}] - - - name: 'sphincssha2256ssimple' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.6.6', + 'code_point': '0xfe77'}] + - name: 'sphincssha2256ssimple' pretty_name: 'SPHINCS+-SHA2-256s-simple' oqs_meth: 'OQS_SIG_alg_sphincs_sha2_256s_simple' oid: '1.3.9999.6.6.12' code_point: '0xfec0' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] enable: false - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.6.13', - 'code_point': '0xfec1'}] + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.6.13', + 'code_point': '0xfec1'}] extra_nids: old: - implementation_version: NIST Round 3 submission @@ -1276,15 +1022,11 @@ sigs: oid: '1.3.9999.6.6.7' code_point: '0xfe78' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.6.8', - 'code_point': '0xfe79'}] - - - family: 'SPHINCS-SHAKE' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.6.8', + 'code_point': '0xfe79'}] + - family: 'SPHINCS-SHAKE' variants: - - - name: 'sphincsshake256128frobust' + - name: 'sphincsshake256128frobust' pretty_name: 'SPHINCS+-SHAKE256-128f-robust' oqs_meth: 'OQS_SIG_alg_sphincs_shake256_128f_robust' extra_nids: @@ -1294,30 +1036,19 @@ sigs: oid: '1.3.9999.6.7.1' code_point: '0xfe7a' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.7.2', - 'code_point': '0xfe7b'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.7.3', - 'code_point': '0xfe7c'}] - - - name: 'sphincsshake128fsimple' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.7.2', + 'code_point': '0xfe7b'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.7.3', 'code_point': '0xfe7c'}] + - name: 'sphincsshake128fsimple' pretty_name: 'SPHINCS+-SHAKE-128f-simple' oqs_meth: 'OQS_SIG_alg_sphincs_shake_128f_simple' oid: '1.3.9999.6.7.13' code_point: '0xfec2' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] enable: true - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.7.14', - 'code_point': '0xfec3'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.7.15', - 'code_point': '0xfec4'}] + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.7.14', + 'code_point': '0xfec3'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.7.15', 'code_point': '0xfec4'}] extra_nids: old: - implementation_version: NIST Round 3 submission @@ -1325,16 +1056,10 @@ sigs: oid: '1.3.9999.6.7.4' code_point: '0xfe7d' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.7.5', - 'code_point': '0xfe7e'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.7.6', - 'code_point': '0xfe7f'}] - - - name: 'sphincsshake256128srobust' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.7.5', + 'code_point': '0xfe7e'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.7.6', 'code_point': '0xfe7f'}] + - name: 'sphincsshake256128srobust' pretty_name: 'SPHINCS+-SHAKE256-128s-robust' oqs_meth: 'OQS_SIG_alg_sphincs_shake256_128s_robust' extra_nids: @@ -1344,30 +1069,19 @@ sigs: oid: '1.3.9999.6.7.7' code_point: '0xfe80' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.7.8', - 'code_point': '0xfe81'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.7.9', - 'code_point': '0xfe82'}] - - - name: 'sphincsshake128ssimple' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.7.8', + 'code_point': '0xfe81'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.7.9', 'code_point': '0xfe82'}] + - name: 'sphincsshake128ssimple' pretty_name: 'SPHINCS+-SHAKE-128s-simple' oqs_meth: 'OQS_SIG_alg_sphincs_shake_128s_simple' oid: '1.3.9999.6.7.16' code_point: '0xfec5' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] enable: false - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.7.17', - 'code_point': '0xfec6'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.7.18', - 'code_point': '0xfec7'}] + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.7.17', + 'code_point': '0xfec6'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.7.18', 'code_point': '0xfec7'}] extra_nids: old: - implementation_version: NIST Round 3 submission @@ -1375,16 +1089,10 @@ sigs: oid: '1.3.9999.6.7.10' code_point: '0xfe83' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.6.7.11', - 'code_point': '0xfe84'}, - {'name': 'rsa3072', - 'pretty_name': 'RSA3072', - 'oid': '1.3.9999.6.7.12', - 'code_point': '0xfe85'}] - - - name: 'sphincsshake256192frobust' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.6.7.11', + 'code_point': '0xfe84'}, {'name': 'rsa3072', 'pretty_name': 'RSA3072', + 'oid': '1.3.9999.6.7.12', 'code_point': '0xfe85'}] + - name: 'sphincsshake256192frobust' pretty_name: 'SPHINCS+-SHAKE256-192f-robust' oqs_meth: 'OQS_SIG_alg_sphincs_shake256_192f_robust' extra_nids: @@ -1394,22 +1102,17 @@ sigs: oid: '1.3.9999.6.8.1' code_point: '0xfe86' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.8.2', - 'code_point': '0xfe87'}] - - - name: 'sphincsshake192fsimple' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.8.2', + 'code_point': '0xfe87'}] + - name: 'sphincsshake192fsimple' pretty_name: 'SPHINCS+-SHAKE-192f-simple' oqs_meth: 'OQS_SIG_alg_sphincs_shake_192f_simple' oid: '1.3.9999.6.8.10' code_point: '0xfec8' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] enable: false - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.8.11', - 'code_point': '0xfec9'}] + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.8.11', + 'code_point': '0xfec9'}] extra_nids: old: - implementation_version: NIST Round 3 submission @@ -1417,12 +1120,9 @@ sigs: oid: '1.3.9999.6.8.3' code_point: '0xfe88' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.8.4', - 'code_point': '0xfe89'}] - - - name: 'sphincsshake256192srobust' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.8.4', + 'code_point': '0xfe89'}] + - name: 'sphincsshake256192srobust' pretty_name: 'SPHINCS+-SHAKE256-192s-robust' oqs_meth: 'OQS_SIG_alg_sphincs_shake256_192s_robust' extra_nids: @@ -1432,22 +1132,17 @@ sigs: oid: '1.3.9999.6.8.5' code_point: '0xfe8a' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.8.6', - 'code_point': '0xfe8b'}] - - - name: 'sphincsshake192ssimple' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.8.6', + 'code_point': '0xfe8b'}] + - name: 'sphincsshake192ssimple' pretty_name: 'SPHINCS+-SHAKE-192s-simple' oqs_meth: 'OQS_SIG_alg_sphincs_shake_192s_simple' oid: '1.3.9999.6.8.12' code_point: '0xfeca' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] enable: false - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.8.13', - 'code_point': '0xfecb'}] + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.8.13', + 'code_point': '0xfecb'}] extra_nids: old: - implementation_version: NIST Round 3 submission @@ -1455,12 +1150,9 @@ sigs: oid: '1.3.9999.6.8.7' code_point: '0xfe8c' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.6.8.8', - 'code_point': '0xfe8d'}] - - - name: 'sphincsshake256256frobust' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.6.8.8', + 'code_point': '0xfe8d'}] + - name: 'sphincsshake256256frobust' pretty_name: 'SPHINCS+-SHAKE256-256f-robust' oqs_meth: 'OQS_SIG_alg_sphincs_shake256_256f_robust' extra_nids: @@ -1470,22 +1162,17 @@ sigs: oid: '1.3.9999.6.9.1' code_point: '0xfe8e' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.9.2', - 'code_point': '0xfe8f'}] - - - name: 'sphincsshake256fsimple' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.9.2', + 'code_point': '0xfe8f'}] + - name: 'sphincsshake256fsimple' pretty_name: 'SPHINCS+-SHAKE-256f-simple' oqs_meth: 'OQS_SIG_alg_sphincs_shake_256f_simple' oid: '1.3.9999.6.9.10' code_point: '0xfecc' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] enable: false - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.9.11', - 'code_point': '0xfecd'}] + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.9.11', + 'code_point': '0xfecd'}] extra_nids: old: - implementation_version: NIST Round 3 submission @@ -1493,12 +1180,9 @@ sigs: oid: '1.3.9999.6.9.3' code_point: '0xfe90' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.9.4', - 'code_point': '0xfe91'}] - - - name: 'sphincsshake256256srobust' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.9.4', + 'code_point': '0xfe91'}] + - name: 'sphincsshake256256srobust' pretty_name: 'SPHINCS+-SHAKE256-256s-robust' oqs_meth: 'OQS_SIG_alg_sphincs_shake256_256s_robust' extra_nids: @@ -1508,22 +1192,17 @@ sigs: oid: '1.3.9999.6.9.5' code_point: '0xfe92' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.9.6', - 'code_point': '0xfe93'}] - - - name: 'sphincsshake256ssimple' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.9.6', + 'code_point': '0xfe93'}] + - name: 'sphincsshake256ssimple' pretty_name: 'SPHINCS+-SHAKE-256s-simple' oqs_meth: 'OQS_SIG_alg_sphincs_shake_256s_simple' oid: '1.3.9999.6.9.12' code_point: '0xfece' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] enable: false - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.9.13', - 'code_point': '0xfecf'}] + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.9.13', + 'code_point': '0xfecf'}] extra_nids: old: - implementation_version: NIST Round 3 submission @@ -1531,99 +1210,77 @@ sigs: oid: '1.3.9999.6.9.7' code_point: '0xfe94' supported_encodings: ['draft-uni-qsckeys-sphincsplus-00/sk-pk'] - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.6.9.8', - 'code_point': '0xfe95'}] - - - family: 'MAYO' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.6.9.8', + 'code_point': '0xfe95'}] + - family: 'MAYO' variants: - - - name: 'mayo1' + - name: 'mayo1' pretty_name: 'MAYO-1' oqs_meth: 'OQS_SIG_alg_mayo_1' oid: '1.3.9999.8.1.1' code_point: '0xfeee' enable: true - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.8.1.2', - 'code_point': '0xfef2'}] - - - name: 'mayo2' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.8.1.2', + 'code_point': '0xfef2'}] + - name: 'mayo2' pretty_name: 'MAYO-2' oqs_meth: 'OQS_SIG_alg_mayo_2' oid: '1.3.9999.8.2.1' code_point: '0xfeef' enable: true - mix_with: [{'name': 'p256', - 'pretty_name': 'ECDSA p256', - 'oid': '1.3.9999.8.2.2', - 'code_point': '0xfef3'}] - - - name: 'mayo3' + mix_with: [{'name': 'p256', 'pretty_name': 'ECDSA p256', 'oid': '1.3.9999.8.2.2', + 'code_point': '0xfef3'}] + - name: 'mayo3' pretty_name: 'MAYO-3' oqs_meth: 'OQS_SIG_alg_mayo_3' oid: '1.3.9999.8.3.1' code_point: '0xfef0' enable: true - mix_with: [{'name': 'p384', - 'pretty_name': 'ECDSA p384', - 'oid': '1.3.9999.8.3.2', - 'code_point': '0xfef4'}] - - - name: 'mayo5' + mix_with: [{'name': 'p384', 'pretty_name': 'ECDSA p384', 'oid': '1.3.9999.8.3.2', + 'code_point': '0xfef4'}] + - name: 'mayo5' pretty_name: 'MAYO-5' oqs_meth: 'OQS_SIG_alg_mayo_5' oid: '1.3.9999.8.5.1' code_point: '0xfef1' enable: true - mix_with: [{'name': 'p521', - 'pretty_name': 'ECDSA p521', - 'oid': '1.3.9999.8.5.2', - 'code_point': '0xfef5'}] - - - family: 'CROSS' + mix_with: [{'name': 'p521', 'pretty_name': 'ECDSA p521', 'oid': '1.3.9999.8.5.2', + 'code_point': '0xfef5'}] + - family: 'CROSS' variants: # RSDP 128 - - - name: 'CROSSrsdp128balanced' + - name: 'CROSSrsdp128balanced' pretty_name: 'CROSS-rsdp-128-balanced' oqs_meth: 'OQS_SIG_alg_cross_rsdp_128_balanced' oid: '1.3.6.1.4.1.62245.2.1.1' code_point: '0xfef6' enable: true - - - name: 'CROSSrsdp128fast' + - name: 'CROSSrsdp128fast' pretty_name: 'CROSS-rsdp-128-fast' oqs_meth: 'OQS_SIG_alg_cross_rsdp_128_fast' oid: '1.3.6.1.4.1.62245.2.1.2' code_point: '0xfef7' enable: false - - - name: 'CROSSrsdp128small' + - name: 'CROSSrsdp128small' pretty_name: 'CROSS-rsdp-128-small' oqs_meth: 'OQS_SIG_alg_cross_rsdp_128_small' oid: '1.3.6.1.4.1.62245.2.1.3' code_point: '0xfef8' enable: false # RSDP 192 - - - name: 'CROSSrsdp192balanced' + - name: 'CROSSrsdp192balanced' pretty_name: 'CROSS-rsdp-192-balanced' oqs_meth: 'OQS_SIG_alg_cross_rsdp_192_balanced' oid: '1.3.6.1.4.1.62245.2.1.4' code_point: '0xfef9' enable: false - - - name: 'CROSSrsdp192fast' + - name: 'CROSSrsdp192fast' pretty_name: 'CROSS-rsdp-192-fast' oqs_meth: 'OQS_SIG_alg_cross_rsdp_192_fast' oid: '1.3.6.1.4.1.62245.2.1.5' code_point: '0xfefa' enable: false - - - name: 'CROSSrsdp192small' + - name: 'CROSSrsdp192small' pretty_name: 'CROSS-rsdp-192-small' oqs_meth: 'OQS_SIG_alg_cross_rsdp_192_small' oid: '1.3.6.1.4.1.62245.2.1.6' @@ -1633,74 +1290,64 @@ sigs: # CROSS variants rsdp-256-balanced and rsdp-256-fast are missing because # they produce certificates that are larger than the maximum size allowed # by TLS 1.3 (RFC 8446 section B.3.3) - - - name: 'CROSSrsdp256small' + - name: 'CROSSrsdp256small' pretty_name: 'CROSS-rsdp-256-small' oqs_meth: 'OQS_SIG_alg_cross_rsdp_256_small' oid: '1.3.6.1.4.1.62245.2.1.9' code_point: '0xfefc' enable: false # RSDPG 128 - - - name: 'CROSSrsdpg128balanced' + - name: 'CROSSrsdpg128balanced' pretty_name: 'CROSS-rsdpg-128-balanced' oqs_meth: 'OQS_SIG_alg_cross_rsdpg_128_balanced' oid: '1.3.6.1.4.1.62245.2.1.10' code_point: '0xfefd' enable: false - - - name: 'CROSSrsdpg128fast' + - name: 'CROSSrsdpg128fast' pretty_name: 'CROSS-rsdpg-128-fast' oqs_meth: 'OQS_SIG_alg_cross_rsdpg_128_fast' oid: '1.3.6.1.4.1.62245.2.1.11' code_point: '0xfefe' enable: false - - - name: 'CROSSrsdpg128small' + - name: 'CROSSrsdpg128small' pretty_name: 'CROSS-rsdpg-128-small' oqs_meth: 'OQS_SIG_alg_cross_rsdpg_128_small' oid: '1.3.6.1.4.1.62245.2.1.12' code_point: '0xfeff' enable: false # RSDPG 192 - - - name: 'CROSSrsdpg192balanced' + - name: 'CROSSrsdpg192balanced' pretty_name: 'CROSS-rsdpg-192-balanced' oqs_meth: 'OQS_SIG_alg_cross_rsdpg_192_balanced' oid: '1.3.6.1.4.1.62245.2.1.13' code_point: '0xff00' enable: false - - - name: 'CROSSrsdpg192fast' + - name: 'CROSSrsdpg192fast' pretty_name: 'CROSS-rsdpg-192-fast' oqs_meth: 'OQS_SIG_alg_cross_rsdpg_192_fast' oid: '1.3.6.1.4.1.62245.2.1.14' code_point: '0xff01' enable: false - - - name: 'CROSSrsdpg192small' + - name: 'CROSSrsdpg192small' pretty_name: 'CROSS-rsdpg-192-small' oqs_meth: 'OQS_SIG_alg_cross_rsdpg_192_small' oid: '1.3.6.1.4.1.62245.2.1.15' code_point: '0xff02' enable: false # RSDPG 256 - - - name: 'CROSSrsdpg256balanced' + - name: 'CROSSrsdpg256balanced' pretty_name: 'CROSS-rsdpg-256-balanced' oqs_meth: 'OQS_SIG_alg_cross_rsdpg_256_balanced' oid: '1.3.6.1.4.1.62245.2.1.16' code_point: '0xff03' enable: false - - - name: 'CROSSrsdpg256fast' + - name: 'CROSSrsdpg256fast' pretty_name: 'CROSS-rsdpg-256-fast' oqs_meth: 'OQS_SIG_alg_cross_rsdpg_256_fast' oid: '1.3.6.1.4.1.62245.2.1.17' code_point: '0xff04' enable: false - - - name: 'CROSSrsdpg256small' + - name: 'CROSSrsdpg256small' pretty_name: 'CROSS-rsdpg-256-small' oqs_meth: 'OQS_SIG_alg_cross_rsdpg_256_small' oid: '1.3.6.1.4.1.62245.2.1.18' diff --git a/oqs-template/oqs-kem-info.md b/oqs-template/oqs-kem-info.md index 93aba939..98e59698 100644 --- a/oqs-template/oqs-kem-info.md +++ b/oqs-template/oqs-kem-info.md @@ -1,13 +1,13 @@ | Family | Implementation Version | Variant | NIST round | Claimed NIST Level | Code Point | Hybrid Elliptic Curve (if any) | |:---------------|:-------------------------|:---------------|:-------------|---------------------:|:-------------|:---------------------------------| -| BIKE | 5.1 | bikel1 | 4 | 1 | 0x0241 | | -| BIKE | 5.1 | bikel1 | 4 | 1 | 0x2F41 | secp256_r1 | -| BIKE | 5.1 | bikel1 | 4 | 1 | 0x2FAE | x25519 | -| BIKE | 5.1 | bikel3 | 4 | 3 | 0x0242 | | -| BIKE | 5.1 | bikel3 | 4 | 3 | 0x2F42 | secp384_r1 | -| BIKE | 5.1 | bikel3 | 4 | 3 | 0x2FAF | x448 | -| BIKE | 5.1 | bikel5 | 4 | 5 | 0x0243 | | -| BIKE | 5.1 | bikel5 | 4 | 5 | 0x2F43 | secp521_r1 | +| BIKE | 5.1 | bikel1 | 4 | 1 | 65045 | | +| BIKE | 5.1 | bikel1 | 4 | 1 | 65046 | secp256_r1 | +| BIKE | 5.1 | bikel1 | 4 | 1 | 65047 | x25519 | +| BIKE | 5.1 | bikel3 | 4 | 3 | 65048 | | +| BIKE | 5.1 | bikel3 | 4 | 3 | 65049 | secp384_r1 | +| BIKE | 5.1 | bikel3 | 4 | 3 | 65050 | x448 | +| BIKE | 5.1 | bikel5 | 4 | 5 | 65051 | | +| BIKE | 5.1 | bikel5 | 4 | 5 | 65052 | secp521_r1 | | BIKE | NIST Round 2 submission | bike1l1cpa | 2 | 1 | 0x0206 | | | BIKE | NIST Round 2 submission | bike1l1cpa | 2 | 1 | 0x2F06 | secp256_r1 | | BIKE | NIST Round 2 submission | bike1l1fo | 2 | 1 | 0x0223 | | @@ -53,22 +53,22 @@ | CRYSTALS-Kyber | NIST Round 3 submission | kyber90s768 | 3 | 3 | 0x023F | | | CRYSTALS-Kyber | NIST Round 3 submission | kyber90s768 | 3 | 3 | 0x2F3F | secp384_r1 | | CRYSTALS-Kyber | NIST Round 3 submission | kyber90s768 | 3 | 3 | 0x2FAA | x448 | -| FrodoKEM | NIST Round 3 submission | frodo1344aes | 3 | 5 | 0x0204 | | -| FrodoKEM | NIST Round 3 submission | frodo1344aes | 3 | 5 | 0x2F04 | secp521_r1 | -| FrodoKEM | NIST Round 3 submission | frodo1344shake | 3 | 5 | 0x0205 | | -| FrodoKEM | NIST Round 3 submission | frodo1344shake | 3 | 5 | 0x2F05 | secp521_r1 | -| FrodoKEM | NIST Round 3 submission | frodo640aes | 3 | 1 | 0x2F00 | secp256_r1 | -| FrodoKEM | NIST Round 3 submission | frodo640aes | 3 | 1 | 0x2F80 | x25519 | +| FrodoKEM | NIST Round 3 submission | frodo1344aes | 3 | 5 | 65036 | | +| FrodoKEM | NIST Round 3 submission | frodo1344aes | 3 | 5 | 65037 | secp521_r1 | +| FrodoKEM | NIST Round 3 submission | frodo1344shake | 3 | 5 | 65038 | | +| FrodoKEM | NIST Round 3 submission | frodo1344shake | 3 | 5 | 65039 | secp521_r1 | | FrodoKEM | NIST Round 3 submission | frodo640aes | 3 | 1 | 65024 | | -| FrodoKEM | NIST Round 3 submission | frodo640shake | 3 | 1 | 0x2F01 | secp256_r1 | -| FrodoKEM | NIST Round 3 submission | frodo640shake | 3 | 1 | 0x2F81 | x25519 | +| FrodoKEM | NIST Round 3 submission | frodo640aes | 3 | 1 | 65027 | secp256_r1 | +| FrodoKEM | NIST Round 3 submission | frodo640aes | 3 | 1 | 65028 | x25519 | | FrodoKEM | NIST Round 3 submission | frodo640shake | 3 | 1 | 65025 | | -| FrodoKEM | NIST Round 3 submission | frodo976aes | 3 | 3 | 0x2F02 | secp384_r1 | -| FrodoKEM | NIST Round 3 submission | frodo976aes | 3 | 3 | 0x2F82 | x448 | +| FrodoKEM | NIST Round 3 submission | frodo640shake | 3 | 1 | 65029 | secp256_r1 | +| FrodoKEM | NIST Round 3 submission | frodo640shake | 3 | 1 | 65030 | x25519 | | FrodoKEM | NIST Round 3 submission | frodo976aes | 3 | 3 | 65026 | | -| FrodoKEM | NIST Round 3 submission | frodo976shake | 3 | 3 | 0x0203 | | -| FrodoKEM | NIST Round 3 submission | frodo976shake | 3 | 3 | 0x2F03 | secp384_r1 | -| FrodoKEM | NIST Round 3 submission | frodo976shake | 3 | 3 | 0x2F83 | x448 | +| FrodoKEM | NIST Round 3 submission | frodo976aes | 3 | 3 | 65031 | secp384_r1 | +| FrodoKEM | NIST Round 3 submission | frodo976aes | 3 | 3 | 65032 | x448 | +| FrodoKEM | NIST Round 3 submission | frodo976shake | 3 | 3 | 65033 | | +| FrodoKEM | NIST Round 3 submission | frodo976shake | 3 | 3 | 65034 | secp384_r1 | +| FrodoKEM | NIST Round 3 submission | frodo976shake | 3 | 3 | 65035 | x448 | | HQC | NIST Round 3 submission | hqc128 | 3 | 1 | 0x022C | | | HQC | NIST Round 3 submission | hqc128 | 3 | 1 | 0x2F2C | secp256_r1 | | HQC | NIST Round 3 submission | hqc128 | 3 | 1 | 0x2FAC | x25519 | @@ -77,22 +77,22 @@ | HQC | NIST Round 3 submission | hqc192 | 3 | 3 | 0x2FAD | x448 | | HQC | NIST Round 3 submission | hqc256 | 3 | 5 | 0x022E | | | HQC | NIST Round 3 submission | hqc256 | 3 | 5 | 0x2F2E | secp521_r1 | -| HQC | 2023-04-30 | hqc128 | 4 | 1 | 0x0244 | | -| HQC | 2023-04-30 | hqc128 | 4 | 1 | 0x2F44 | secp256_r1 | -| HQC | 2023-04-30 | hqc128 | 4 | 1 | 0x2FB0 | x25519 | -| HQC | 2023-04-30 | hqc192 | 4 | 3 | 0x0245 | | -| HQC | 2023-04-30 | hqc192 | 4 | 3 | 0x2F45 | secp384_r1 | -| 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 | +| HQC | 2023-04-30 | hqc128 | 4 | 1 | 65053 | | +| HQC | 2023-04-30 | hqc128 | 4 | 1 | 65054 | secp256_r1 | +| HQC | 2023-04-30 | hqc128 | 4 | 1 | 65055 | x25519 | +| HQC | 2023-04-30 | hqc192 | 4 | 3 | 65056 | | +| HQC | 2023-04-30 | hqc192 | 4 | 3 | 65057 | secp384_r1 | +| HQC | 2023-04-30 | hqc192 | 4 | 3 | 65058 | x448 | +| HQC | 2023-04-30 | hqc256 | 4 | 5 | 65059 | | +| HQC | 2023-04-30 | hqc256 | 4 | 5 | 65060 | secp521_r1 | | ML-KEM | ML-KEM | mlkem1024 | FIPS203 | 5 | 0x11ED | secp384_r1 | -| ML-KEM | ML-KEM | mlkem1024 | FIPS203 | 5 | 0x2F4D | secp521_r1 | | ML-KEM | ML-KEM | mlkem1024 | FIPS203 | 5 | 514 | | -| ML-KEM | ML-KEM | mlkem512 | FIPS203 | 1 | 0x2F4B | secp256_r1 | -| ML-KEM | ML-KEM | mlkem512 | FIPS203 | 1 | 0x2FB6 | x25519 | +| ML-KEM | ML-KEM | mlkem1024 | FIPS203 | 5 | 65044 | secp521_r1 | | ML-KEM | ML-KEM | mlkem512 | FIPS203 | 1 | 512 | | +| ML-KEM | ML-KEM | mlkem512 | FIPS203 | 1 | 65040 | secp256_r1 | +| ML-KEM | ML-KEM | mlkem512 | FIPS203 | 1 | 65041 | x25519 | | ML-KEM | ML-KEM | mlkem768 | FIPS203 | 3 | 0x11eb | secp256_r1 | | 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 | 513 | | +| ML-KEM | ML-KEM | mlkem768 | FIPS203 | 3 | 65042 | secp384_r1 | +| ML-KEM | ML-KEM | mlkem768 | FIPS203 | 3 | 65043 | x448 | diff --git a/oqs-template/requirements.txt b/oqs-template/requirements.txt index 36dcac15..88fb8969 100644 --- a/oqs-template/requirements.txt +++ b/oqs-template/requirements.txt @@ -2,3 +2,4 @@ Jinja2==3.1.5 MarkupSafe==2.1.3 PyYAML==6.0 tabulate==0.9.0 +ruamel.yaml=0.18.0 \ No newline at end of file diff --git a/oqsprov/oqsprov_capabilities.c b/oqsprov/oqsprov_capabilities.c index 1349035d..a9c5bd65 100644 --- a/oqsprov/oqsprov_capabilities.c +++ b/oqsprov/oqsprov_capabilities.c @@ -42,62 +42,62 @@ static OQS_GROUP_CONSTANTS oqs_group_list[] = { ///// OQS_TEMPLATE_FRAGMENT_GROUP_ASSIGNMENTS_START {65024, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F00, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F80, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65027, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65028, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, {65025, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F01, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F81, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65029, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65030, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, {65026, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F02, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F82, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x0203, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65031, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65032, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65033, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F03, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F83, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x0204, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65034, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65035, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65036, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F04, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x0205, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65037, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65038, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F05, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65039, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, {512, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F4B, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2FB6, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65040, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65041, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, {513, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F4C, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2FB7, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65042, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65043, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, {0x11ec, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, {0x11eb, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, {514, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F4D, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65044, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, {0x11ED, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x0241, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65045, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F41, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2FAE, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x0242, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65046, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65047, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65048, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F42, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2FAF, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x0243, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65049, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65050, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65051, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F43, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x0244, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65052, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65053, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F44, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2FB0, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x0245, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65054, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65055, 128, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65056, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F45, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2FB1, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x0246, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65057, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65058, 192, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65059, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, - {0x2F46, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, + {65060, 256, TLS1_3_VERSION, 0, DTLS1_3_VERSION, 0, 1}, ///// OQS_TEMPLATE_FRAGMENT_GROUP_ASSIGNMENTS_END };