From 3002ff5b2a640ef1015a40d0cd2db8e567c4f098 Mon Sep 17 00:00:00 2001 From: Basil Hess Date: Thu, 11 Jul 2024 16:32:44 +0200 Subject: [PATCH] naming update Signed-off-by: Basil Hess --- ALGORITHMS.md | 24 +++---- README.md | 2 +- oqs-template/generate.yml | 12 ++-- oqs-template/oqs-sig-info.md | 12 ++-- oqsprov/oqs_decode_der2key.c | 24 +++---- oqsprov/oqs_encode_key2any.c | 120 ++++++++++++++++---------------- oqsprov/oqs_kmgmt.c | 60 ++++++++-------- oqsprov/oqs_prov.h | 120 ++++++++++++++++---------------- oqsprov/oqsdecoders.inc | 24 +++---- oqsprov/oqsencoders.inc | 90 +++++++++++------------- oqsprov/oqsprov.c | 72 +++++++++---------- oqsprov/oqsprov_capabilities.c | 39 +++++------ oqsprov/oqsprov_keys.c | 12 ++-- scripts/common.py | 4 +- scripts/fullbuild.sh | 2 +- test/oqs_test_evp_pkey_params.c | 6 +- 16 files changed, 307 insertions(+), 316 deletions(-) diff --git a/ALGORITHMS.md b/ALGORITHMS.md index bfb7a84d..40fcef89 100644 --- a/ALGORITHMS.md +++ b/ALGORITHMS.md @@ -117,12 +117,12 @@ As standardization for these algorithms within TLS is not done, all TLS code poi | p521_sphincsshake256fsimple | 0xfecd |No| OQS_CODEPOINT_P521_SPHINCSSHAKE256FSIMPLE | sphincsshake256ssimple | 0xfece |No| OQS_CODEPOINT_SPHINCSSHAKE256SSIMPLE | p521_sphincsshake256ssimple | 0xfecf |No| OQS_CODEPOINT_P521_SPHINCSSHAKE256SSIMPLE -| mayo_1 | 0xfeee |Yes| OQS_CODEPOINT_MAYO_1 -| p256_mayo_1 | 0xfef1 |Yes| OQS_CODEPOINT_P256_MAYO_1 -| mayo_2 | 0xfeef |Yes| OQS_CODEPOINT_MAYO_2 -| p256_mayo_2 | 0xfef2 |Yes| OQS_CODEPOINT_P256_MAYO_2 -| mayo_3 | 0xfef0 |Yes| OQS_CODEPOINT_MAYO_3 -| p384_mayo_3 | 0xfef3 |Yes| OQS_CODEPOINT_P384_MAYO_3 +| mayo1 | 0xfeee |Yes| OQS_CODEPOINT_MAYO1 +| p256_mayo1 | 0xfef1 |Yes| OQS_CODEPOINT_P256_MAYO1 +| mayo2 | 0xfeef |Yes| OQS_CODEPOINT_MAYO2 +| p256_mayo2 | 0xfef2 |Yes| OQS_CODEPOINT_P256_MAYO2 +| mayo3 | 0xfef0 |Yes| OQS_CODEPOINT_MAYO3 +| p384_mayo3 | 0xfef3 |Yes| OQS_CODEPOINT_P384_MAYO3 Changing code points @@ -213,12 +213,12 @@ adapting the OIDs of all supported signature algorithms as per the table below. | p521_sphincsshake256fsimple | 1.3.9999.6.9.11 |No| OQS_OID_P521_SPHINCSSHAKE256FSIMPLE | sphincsshake256ssimple | 1.3.9999.6.9.12 |No| OQS_OID_SPHINCSSHAKE256SSIMPLE | p521_sphincsshake256ssimple | 1.3.9999.6.9.13 |No| OQS_OID_P521_SPHINCSSHAKE256SSIMPLE -| mayo_1 | 1.3.9999.8.1.1 |Yes| OQS_OID_MAYO_1 -| p256_mayo_1 | 1.3.9999.8.1.2 |Yes| OQS_OID_P256_MAYO_1 -| mayo_2 | 1.3.9999.8.2.1 |Yes| OQS_OID_MAYO_2 -| p256_mayo_2 | 1.3.9999.8.2.2 |Yes| OQS_OID_P256_MAYO_2 -| mayo_3 | 1.3.9999.8.3.1 |Yes| OQS_OID_MAYO_3 -| p384_mayo_3 | 1.3.9999.8.3.2 |Yes| OQS_OID_P384_MAYO_3 +| mayo1 | 1.3.9999.8.1.1 |Yes| OQS_OID_MAYO1 +| p256_mayo1 | 1.3.9999.8.1.2 |Yes| OQS_OID_P256_MAYO1 +| mayo2 | 1.3.9999.8.2.1 |Yes| OQS_OID_MAYO2 +| p256_mayo2 | 1.3.9999.8.2.2 |Yes| OQS_OID_P256_MAYO2 +| mayo3 | 1.3.9999.8.3.1 |Yes| OQS_OID_MAYO3 +| p384_mayo3 | 1.3.9999.8.3.2 |Yes| OQS_OID_P384_MAYO3 If [OQS_KEM_ENCODERS](CONFIGURE.md#OQS_KEM_ENCODERS) is enabled the following list is also available: diff --git a/README.md b/README.md index e178da1a..ac435c7a 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ This implementation makes available the following quantum safe algorithms: - **SPHINCS-SHA2**:`sphincssha2128fsimple`\*, `p256_sphincssha2128fsimple`\*, `rsa3072_sphincssha2128fsimple`\*, `sphincssha2128ssimple`\*, `p256_sphincssha2128ssimple`\*, `rsa3072_sphincssha2128ssimple`\*, `sphincssha2192fsimple`\*, `p384_sphincssha2192fsimple`\*, `sphincssha2192ssimple`, `p384_sphincssha2192ssimple`, `sphincssha2256fsimple`, `p521_sphincssha2256fsimple`, `sphincssha2256ssimple`, `p521_sphincssha2256ssimple` - **SPHINCS-SHAKE**:`sphincsshake128fsimple`\*, `p256_sphincsshake128fsimple`\*, `rsa3072_sphincsshake128fsimple`\*, `sphincsshake128ssimple`, `p256_sphincsshake128ssimple`, `rsa3072_sphincsshake128ssimple`, `sphincsshake192fsimple`, `p384_sphincsshake192fsimple`, `sphincsshake192ssimple`, `p384_sphincsshake192ssimple`, `sphincsshake256fsimple`, `p521_sphincsshake256fsimple`, `sphincsshake256ssimple`, `p521_sphincsshake256ssimple` -- **MAYO**:`mayo_1`\*, `p256_mayo_1`\*, `mayo_2`\*, `p256_mayo_2`\*, `mayo_3`\*, `p384_mayo_3`\* +- **MAYO**:`mayo1`\*, `p256_mayo1`\*, `mayo2`\*, `p256_mayo2`\*, `mayo3`\*, `p384_mayo3`\* diff --git a/oqs-template/generate.yml b/oqs-template/generate.yml index 5cc74df9..790d3885 100644 --- a/oqs-template/generate.yml +++ b/oqs-template/generate.yml @@ -1473,8 +1473,8 @@ sigs: family: 'MAYO' variants: - - name: 'mayo_1' - pretty_name: 'MAYO_1' + name: 'mayo1' + pretty_name: 'MAYO-1' oqs_meth: 'OQS_SIG_alg_mayo_1' oid: '1.3.9999.8.1.1' code_point: '0xfeee' @@ -1484,8 +1484,8 @@ sigs: 'oid': '1.3.9999.8.1.2', 'code_point': '0xfef1'}] - - name: 'mayo_2' - pretty_name: 'MAYO_2' + name: 'mayo2' + pretty_name: 'MAYO-2' oqs_meth: 'OQS_SIG_alg_mayo_2' oid: '1.3.9999.8.2.1' code_point: '0xfeef' @@ -1495,8 +1495,8 @@ sigs: 'oid': '1.3.9999.8.2.2', 'code_point': '0xfef2'}] - - name: 'mayo_3' - pretty_name: 'MAYO_3' + name: 'mayo3' + pretty_name: 'MAYO-3' oqs_meth: 'OQS_SIG_alg_mayo_3' oid: '1.3.9999.8.3.1' code_point: '0xfef0' diff --git a/oqs-template/oqs-sig-info.md b/oqs-template/oqs-sig-info.md index 04c56512..f1a6f461 100644 --- a/oqs-template/oqs-sig-info.md +++ b/oqs-template/oqs-sig-info.md @@ -34,12 +34,12 @@ | falcon1024 **hybrid with** p521 | NIST Round 3 submission | 3 | 5 | 0xfe0f | 1.3.9999.3.5 | | falconpadded1024 | 20211101 | 3 | 5 | 0xfedf | 1.3.9999.3.19 | | falconpadded1024 **hybrid with** p521 | 20211101 | 3 | 5 | 0xfee0 | 1.3.9999.3.20 | -| mayo_1 | https://eprint.iacr.org/2023/1683 | 1 | 1 | 0xfeee | 1.3.9999.8.1.1 | -| mayo_1 **hybrid with** p256 | https://eprint.iacr.org/2023/1683 | 1 | 1 | 0xfef1 | 1.3.9999.8.1.2 | -| mayo_2 | https://eprint.iacr.org/2023/1683 | 1 | 1 | 0xfeef | 1.3.9999.8.2.1 | -| mayo_2 **hybrid with** p256 | https://eprint.iacr.org/2023/1683 | 1 | 1 | 0xfef2 | 1.3.9999.8.2.2 | -| mayo_3 | https://eprint.iacr.org/2023/1683 | 1 | 3 | 0xfef0 | 1.3.9999.8.3.1 | -| mayo_3 **hybrid with** p384 | https://eprint.iacr.org/2023/1683 | 1 | 3 | 0xfef3 | 1.3.9999.8.3.2 | +| mayo1 | https://eprint.iacr.org/2023/1683 | 1 | 1 | 0xfeee | 1.3.9999.8.1.1 | +| mayo1 **hybrid with** p256 | https://eprint.iacr.org/2023/1683 | 1 | 1 | 0xfef1 | 1.3.9999.8.1.2 | +| mayo2 | https://eprint.iacr.org/2023/1683 | 1 | 1 | 0xfeef | 1.3.9999.8.2.1 | +| mayo2 **hybrid with** p256 | https://eprint.iacr.org/2023/1683 | 1 | 1 | 0xfef2 | 1.3.9999.8.2.2 | +| mayo3 | https://eprint.iacr.org/2023/1683 | 1 | 3 | 0xfef0 | 1.3.9999.8.3.1 | +| mayo3 **hybrid with** p384 | https://eprint.iacr.org/2023/1683 | 1 | 3 | 0xfef3 | 1.3.9999.8.3.2 | | 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/oqs_decode_der2key.c b/oqsprov/oqs_decode_der2key.c index a1de9df8..d025b753 100644 --- a/oqsprov/oqs_decode_der2key.c +++ b/oqsprov/oqs_decode_der2key.c @@ -816,16 +816,16 @@ MAKE_DECODER(, "rsa3072_sphincsshake128fsimple", rsa3072_sphincsshake128fsimple, oqsx, PrivateKeyInfo); MAKE_DECODER(, "rsa3072_sphincsshake128fsimple", rsa3072_sphincsshake128fsimple, oqsx, SubjectPublicKeyInfo); -MAKE_DECODER(, "mayo_1", mayo_1, oqsx, PrivateKeyInfo); -MAKE_DECODER(, "mayo_1", mayo_1, oqsx, SubjectPublicKeyInfo); -MAKE_DECODER(, "p256_mayo_1", p256_mayo_1, oqsx, PrivateKeyInfo); -MAKE_DECODER(, "p256_mayo_1", p256_mayo_1, oqsx, SubjectPublicKeyInfo); -MAKE_DECODER(, "mayo_2", mayo_2, oqsx, PrivateKeyInfo); -MAKE_DECODER(, "mayo_2", mayo_2, oqsx, SubjectPublicKeyInfo); -MAKE_DECODER(, "p256_mayo_2", p256_mayo_2, oqsx, PrivateKeyInfo); -MAKE_DECODER(, "p256_mayo_2", p256_mayo_2, oqsx, SubjectPublicKeyInfo); -MAKE_DECODER(, "mayo_3", mayo_3, oqsx, PrivateKeyInfo); -MAKE_DECODER(, "mayo_3", mayo_3, oqsx, SubjectPublicKeyInfo); -MAKE_DECODER(, "p384_mayo_3", p384_mayo_3, oqsx, PrivateKeyInfo); -MAKE_DECODER(, "p384_mayo_3", p384_mayo_3, oqsx, SubjectPublicKeyInfo); +MAKE_DECODER(, "mayo1", mayo1, oqsx, PrivateKeyInfo); +MAKE_DECODER(, "mayo1", mayo1, oqsx, SubjectPublicKeyInfo); +MAKE_DECODER(, "p256_mayo1", p256_mayo1, oqsx, PrivateKeyInfo); +MAKE_DECODER(, "p256_mayo1", p256_mayo1, oqsx, SubjectPublicKeyInfo); +MAKE_DECODER(, "mayo2", mayo2, oqsx, PrivateKeyInfo); +MAKE_DECODER(, "mayo2", mayo2, oqsx, SubjectPublicKeyInfo); +MAKE_DECODER(, "p256_mayo2", p256_mayo2, oqsx, PrivateKeyInfo); +MAKE_DECODER(, "p256_mayo2", p256_mayo2, oqsx, SubjectPublicKeyInfo); +MAKE_DECODER(, "mayo3", mayo3, oqsx, PrivateKeyInfo); +MAKE_DECODER(, "mayo3", mayo3, oqsx, SubjectPublicKeyInfo); +MAKE_DECODER(, "p384_mayo3", p384_mayo3, oqsx, PrivateKeyInfo); +MAKE_DECODER(, "p384_mayo3", p384_mayo3, oqsx, SubjectPublicKeyInfo); ///// OQS_TEMPLATE_FRAGMENT_DECODER_MAKE_END diff --git a/oqsprov/oqs_encode_key2any.c b/oqsprov/oqs_encode_key2any.c index 2098b512..fdd47f77 100644 --- a/oqsprov/oqs_encode_key2any.c +++ b/oqsprov/oqs_encode_key2any.c @@ -1276,24 +1276,24 @@ static int oqsx_pki_priv_to_der(const void *vxkey, unsigned char **pder) #define rsa3072_sphincsshake128fsimple_input_type \ "rsa3072_sphincsshake128fsimple" #define rsa3072_sphincsshake128fsimple_pem_type "rsa3072_sphincsshake128fsimple" -#define mayo_1_evp_type 0 -#define mayo_1_input_type "mayo_1" -#define mayo_1_pem_type "mayo_1" -#define p256_mayo_1_evp_type 0 -#define p256_mayo_1_input_type "p256_mayo_1" -#define p256_mayo_1_pem_type "p256_mayo_1" -#define mayo_2_evp_type 0 -#define mayo_2_input_type "mayo_2" -#define mayo_2_pem_type "mayo_2" -#define p256_mayo_2_evp_type 0 -#define p256_mayo_2_input_type "p256_mayo_2" -#define p256_mayo_2_pem_type "p256_mayo_2" -#define mayo_3_evp_type 0 -#define mayo_3_input_type "mayo_3" -#define mayo_3_pem_type "mayo_3" -#define p384_mayo_3_evp_type 0 -#define p384_mayo_3_input_type "p384_mayo_3" -#define p384_mayo_3_pem_type "p384_mayo_3" +#define mayo1_evp_type 0 +#define mayo1_input_type "mayo1" +#define mayo1_pem_type "mayo1" +#define p256_mayo1_evp_type 0 +#define p256_mayo1_input_type "p256_mayo1" +#define p256_mayo1_pem_type "p256_mayo1" +#define mayo2_evp_type 0 +#define mayo2_input_type "mayo2" +#define mayo2_pem_type "mayo2" +#define p256_mayo2_evp_type 0 +#define p256_mayo2_input_type "p256_mayo2" +#define p256_mayo2_pem_type "p256_mayo2" +#define mayo3_evp_type 0 +#define mayo3_input_type "mayo3" +#define mayo3_pem_type "mayo3" +#define p384_mayo3_evp_type 0 +#define p384_mayo3_input_type "p384_mayo3" +#define p384_mayo3_pem_type "p384_mayo3" ///// OQS_TEMPLATE_FRAGMENT_ENCODER_DEFINES_END /* ---------------------------------------------------------------------- */ @@ -2694,46 +2694,46 @@ MAKE_ENCODER(, rsa3072_sphincsshake128fsimple, oqsx, PrivateKeyInfo, pem); MAKE_ENCODER(, rsa3072_sphincsshake128fsimple, oqsx, SubjectPublicKeyInfo, der); MAKE_ENCODER(, rsa3072_sphincsshake128fsimple, oqsx, SubjectPublicKeyInfo, pem); MAKE_TEXT_ENCODER(, rsa3072_sphincsshake128fsimple); -MAKE_ENCODER(, mayo_1, oqsx, EncryptedPrivateKeyInfo, der); -MAKE_ENCODER(, mayo_1, oqsx, EncryptedPrivateKeyInfo, pem); -MAKE_ENCODER(, mayo_1, oqsx, PrivateKeyInfo, der); -MAKE_ENCODER(, mayo_1, oqsx, PrivateKeyInfo, pem); -MAKE_ENCODER(, mayo_1, oqsx, SubjectPublicKeyInfo, der); -MAKE_ENCODER(, mayo_1, oqsx, SubjectPublicKeyInfo, pem); -MAKE_TEXT_ENCODER(, mayo_1); -MAKE_ENCODER(, p256_mayo_1, oqsx, EncryptedPrivateKeyInfo, der); -MAKE_ENCODER(, p256_mayo_1, oqsx, EncryptedPrivateKeyInfo, pem); -MAKE_ENCODER(, p256_mayo_1, oqsx, PrivateKeyInfo, der); -MAKE_ENCODER(, p256_mayo_1, oqsx, PrivateKeyInfo, pem); -MAKE_ENCODER(, p256_mayo_1, oqsx, SubjectPublicKeyInfo, der); -MAKE_ENCODER(, p256_mayo_1, oqsx, SubjectPublicKeyInfo, pem); -MAKE_TEXT_ENCODER(, p256_mayo_1); -MAKE_ENCODER(, mayo_2, oqsx, EncryptedPrivateKeyInfo, der); -MAKE_ENCODER(, mayo_2, oqsx, EncryptedPrivateKeyInfo, pem); -MAKE_ENCODER(, mayo_2, oqsx, PrivateKeyInfo, der); -MAKE_ENCODER(, mayo_2, oqsx, PrivateKeyInfo, pem); -MAKE_ENCODER(, mayo_2, oqsx, SubjectPublicKeyInfo, der); -MAKE_ENCODER(, mayo_2, oqsx, SubjectPublicKeyInfo, pem); -MAKE_TEXT_ENCODER(, mayo_2); -MAKE_ENCODER(, p256_mayo_2, oqsx, EncryptedPrivateKeyInfo, der); -MAKE_ENCODER(, p256_mayo_2, oqsx, EncryptedPrivateKeyInfo, pem); -MAKE_ENCODER(, p256_mayo_2, oqsx, PrivateKeyInfo, der); -MAKE_ENCODER(, p256_mayo_2, oqsx, PrivateKeyInfo, pem); -MAKE_ENCODER(, p256_mayo_2, oqsx, SubjectPublicKeyInfo, der); -MAKE_ENCODER(, p256_mayo_2, oqsx, SubjectPublicKeyInfo, pem); -MAKE_TEXT_ENCODER(, p256_mayo_2); -MAKE_ENCODER(, mayo_3, oqsx, EncryptedPrivateKeyInfo, der); -MAKE_ENCODER(, mayo_3, oqsx, EncryptedPrivateKeyInfo, pem); -MAKE_ENCODER(, mayo_3, oqsx, PrivateKeyInfo, der); -MAKE_ENCODER(, mayo_3, oqsx, PrivateKeyInfo, pem); -MAKE_ENCODER(, mayo_3, oqsx, SubjectPublicKeyInfo, der); -MAKE_ENCODER(, mayo_3, oqsx, SubjectPublicKeyInfo, pem); -MAKE_TEXT_ENCODER(, mayo_3); -MAKE_ENCODER(, p384_mayo_3, oqsx, EncryptedPrivateKeyInfo, der); -MAKE_ENCODER(, p384_mayo_3, oqsx, EncryptedPrivateKeyInfo, pem); -MAKE_ENCODER(, p384_mayo_3, oqsx, PrivateKeyInfo, der); -MAKE_ENCODER(, p384_mayo_3, oqsx, PrivateKeyInfo, pem); -MAKE_ENCODER(, p384_mayo_3, oqsx, SubjectPublicKeyInfo, der); -MAKE_ENCODER(, p384_mayo_3, oqsx, SubjectPublicKeyInfo, pem); -MAKE_TEXT_ENCODER(, p384_mayo_3); +MAKE_ENCODER(, mayo1, oqsx, EncryptedPrivateKeyInfo, der); +MAKE_ENCODER(, mayo1, oqsx, EncryptedPrivateKeyInfo, pem); +MAKE_ENCODER(, mayo1, oqsx, PrivateKeyInfo, der); +MAKE_ENCODER(, mayo1, oqsx, PrivateKeyInfo, pem); +MAKE_ENCODER(, mayo1, oqsx, SubjectPublicKeyInfo, der); +MAKE_ENCODER(, mayo1, oqsx, SubjectPublicKeyInfo, pem); +MAKE_TEXT_ENCODER(, mayo1); +MAKE_ENCODER(, p256_mayo1, oqsx, EncryptedPrivateKeyInfo, der); +MAKE_ENCODER(, p256_mayo1, oqsx, EncryptedPrivateKeyInfo, pem); +MAKE_ENCODER(, p256_mayo1, oqsx, PrivateKeyInfo, der); +MAKE_ENCODER(, p256_mayo1, oqsx, PrivateKeyInfo, pem); +MAKE_ENCODER(, p256_mayo1, oqsx, SubjectPublicKeyInfo, der); +MAKE_ENCODER(, p256_mayo1, oqsx, SubjectPublicKeyInfo, pem); +MAKE_TEXT_ENCODER(, p256_mayo1); +MAKE_ENCODER(, mayo2, oqsx, EncryptedPrivateKeyInfo, der); +MAKE_ENCODER(, mayo2, oqsx, EncryptedPrivateKeyInfo, pem); +MAKE_ENCODER(, mayo2, oqsx, PrivateKeyInfo, der); +MAKE_ENCODER(, mayo2, oqsx, PrivateKeyInfo, pem); +MAKE_ENCODER(, mayo2, oqsx, SubjectPublicKeyInfo, der); +MAKE_ENCODER(, mayo2, oqsx, SubjectPublicKeyInfo, pem); +MAKE_TEXT_ENCODER(, mayo2); +MAKE_ENCODER(, p256_mayo2, oqsx, EncryptedPrivateKeyInfo, der); +MAKE_ENCODER(, p256_mayo2, oqsx, EncryptedPrivateKeyInfo, pem); +MAKE_ENCODER(, p256_mayo2, oqsx, PrivateKeyInfo, der); +MAKE_ENCODER(, p256_mayo2, oqsx, PrivateKeyInfo, pem); +MAKE_ENCODER(, p256_mayo2, oqsx, SubjectPublicKeyInfo, der); +MAKE_ENCODER(, p256_mayo2, oqsx, SubjectPublicKeyInfo, pem); +MAKE_TEXT_ENCODER(, p256_mayo2); +MAKE_ENCODER(, mayo3, oqsx, EncryptedPrivateKeyInfo, der); +MAKE_ENCODER(, mayo3, oqsx, EncryptedPrivateKeyInfo, pem); +MAKE_ENCODER(, mayo3, oqsx, PrivateKeyInfo, der); +MAKE_ENCODER(, mayo3, oqsx, PrivateKeyInfo, pem); +MAKE_ENCODER(, mayo3, oqsx, SubjectPublicKeyInfo, der); +MAKE_ENCODER(, mayo3, oqsx, SubjectPublicKeyInfo, pem); +MAKE_TEXT_ENCODER(, mayo3); +MAKE_ENCODER(, p384_mayo3, oqsx, EncryptedPrivateKeyInfo, der); +MAKE_ENCODER(, p384_mayo3, oqsx, EncryptedPrivateKeyInfo, pem); +MAKE_ENCODER(, p384_mayo3, oqsx, PrivateKeyInfo, der); +MAKE_ENCODER(, p384_mayo3, oqsx, PrivateKeyInfo, pem); +MAKE_ENCODER(, p384_mayo3, oqsx, SubjectPublicKeyInfo, der); +MAKE_ENCODER(, p384_mayo3, oqsx, SubjectPublicKeyInfo, pem); +MAKE_TEXT_ENCODER(, p384_mayo3); ///// OQS_TEMPLATE_FRAGMENT_ENCODER_MAKE_END diff --git a/oqsprov/oqs_kmgmt.c b/oqsprov/oqs_kmgmt.c index 3e495e5a..50e85338 100644 --- a/oqsprov/oqs_kmgmt.c +++ b/oqsprov/oqs_kmgmt.c @@ -1254,70 +1254,70 @@ static void *rsa3072_sphincsshake128fsimple_gen_init(void *provctx, "rsa3072_sphincsshake128fsimple", KEY_TYPE_HYB_SIG, 128, 47); } -static void *mayo_1_new_key(void *provctx) +static void *mayo1_new_key(void *provctx) { return oqsx_key_new(PROV_OQS_LIBCTX_OF(provctx), OQS_SIG_alg_mayo_1, - "mayo_1", KEY_TYPE_SIG, NULL, 128, 48); + "mayo1", KEY_TYPE_SIG, NULL, 128, 48); } -static void *mayo_1_gen_init(void *provctx, int selection) +static void *mayo1_gen_init(void *provctx, int selection) { - return oqsx_gen_init(provctx, selection, OQS_SIG_alg_mayo_1, "mayo_1", 0, + return oqsx_gen_init(provctx, selection, OQS_SIG_alg_mayo_1, "mayo1", 0, 128, 48); } -static void *p256_mayo_1_new_key(void *provctx) +static void *p256_mayo1_new_key(void *provctx) { return oqsx_key_new(PROV_OQS_LIBCTX_OF(provctx), OQS_SIG_alg_mayo_1, - "p256_mayo_1", KEY_TYPE_HYB_SIG, NULL, 128, 49); + "p256_mayo1", KEY_TYPE_HYB_SIG, NULL, 128, 49); } -static void *p256_mayo_1_gen_init(void *provctx, int selection) +static void *p256_mayo1_gen_init(void *provctx, int selection) { - return oqsx_gen_init(provctx, selection, OQS_SIG_alg_mayo_1, "p256_mayo_1", + return oqsx_gen_init(provctx, selection, OQS_SIG_alg_mayo_1, "p256_mayo1", KEY_TYPE_HYB_SIG, 128, 49); } -static void *mayo_2_new_key(void *provctx) +static void *mayo2_new_key(void *provctx) { return oqsx_key_new(PROV_OQS_LIBCTX_OF(provctx), OQS_SIG_alg_mayo_2, - "mayo_2", KEY_TYPE_SIG, NULL, 128, 50); + "mayo2", KEY_TYPE_SIG, NULL, 128, 50); } -static void *mayo_2_gen_init(void *provctx, int selection) +static void *mayo2_gen_init(void *provctx, int selection) { - return oqsx_gen_init(provctx, selection, OQS_SIG_alg_mayo_2, "mayo_2", 0, + return oqsx_gen_init(provctx, selection, OQS_SIG_alg_mayo_2, "mayo2", 0, 128, 50); } -static void *p256_mayo_2_new_key(void *provctx) +static void *p256_mayo2_new_key(void *provctx) { return oqsx_key_new(PROV_OQS_LIBCTX_OF(provctx), OQS_SIG_alg_mayo_2, - "p256_mayo_2", KEY_TYPE_HYB_SIG, NULL, 128, 51); + "p256_mayo2", KEY_TYPE_HYB_SIG, NULL, 128, 51); } -static void *p256_mayo_2_gen_init(void *provctx, int selection) +static void *p256_mayo2_gen_init(void *provctx, int selection) { - return oqsx_gen_init(provctx, selection, OQS_SIG_alg_mayo_2, "p256_mayo_2", + return oqsx_gen_init(provctx, selection, OQS_SIG_alg_mayo_2, "p256_mayo2", KEY_TYPE_HYB_SIG, 128, 51); } -static void *mayo_3_new_key(void *provctx) +static void *mayo3_new_key(void *provctx) { return oqsx_key_new(PROV_OQS_LIBCTX_OF(provctx), OQS_SIG_alg_mayo_3, - "mayo_3", KEY_TYPE_SIG, NULL, 192, 52); + "mayo3", KEY_TYPE_SIG, NULL, 192, 52); } -static void *mayo_3_gen_init(void *provctx, int selection) +static void *mayo3_gen_init(void *provctx, int selection) { - return oqsx_gen_init(provctx, selection, OQS_SIG_alg_mayo_3, "mayo_3", 0, + return oqsx_gen_init(provctx, selection, OQS_SIG_alg_mayo_3, "mayo3", 0, 192, 52); } -static void *p384_mayo_3_new_key(void *provctx) +static void *p384_mayo3_new_key(void *provctx) { return oqsx_key_new(PROV_OQS_LIBCTX_OF(provctx), OQS_SIG_alg_mayo_3, - "p384_mayo_3", KEY_TYPE_HYB_SIG, NULL, 192, 53); + "p384_mayo3", KEY_TYPE_HYB_SIG, NULL, 192, 53); } -static void *p384_mayo_3_gen_init(void *provctx, int selection) +static void *p384_mayo3_gen_init(void *provctx, int selection) { - return oqsx_gen_init(provctx, selection, OQS_SIG_alg_mayo_3, "p384_mayo_3", + return oqsx_gen_init(provctx, selection, OQS_SIG_alg_mayo_3, "p384_mayo3", KEY_TYPE_HYB_SIG, 192, 53); } @@ -1518,12 +1518,12 @@ MAKE_SIG_KEYMGMT_FUNCTIONS(p384_sphincssha2192fsimple) MAKE_SIG_KEYMGMT_FUNCTIONS(sphincsshake128fsimple) MAKE_SIG_KEYMGMT_FUNCTIONS(p256_sphincsshake128fsimple) MAKE_SIG_KEYMGMT_FUNCTIONS(rsa3072_sphincsshake128fsimple) -MAKE_SIG_KEYMGMT_FUNCTIONS(mayo_1) -MAKE_SIG_KEYMGMT_FUNCTIONS(p256_mayo_1) -MAKE_SIG_KEYMGMT_FUNCTIONS(mayo_2) -MAKE_SIG_KEYMGMT_FUNCTIONS(p256_mayo_2) -MAKE_SIG_KEYMGMT_FUNCTIONS(mayo_3) -MAKE_SIG_KEYMGMT_FUNCTIONS(p384_mayo_3) +MAKE_SIG_KEYMGMT_FUNCTIONS(mayo1) +MAKE_SIG_KEYMGMT_FUNCTIONS(p256_mayo1) +MAKE_SIG_KEYMGMT_FUNCTIONS(mayo2) +MAKE_SIG_KEYMGMT_FUNCTIONS(p256_mayo2) +MAKE_SIG_KEYMGMT_FUNCTIONS(mayo3) +MAKE_SIG_KEYMGMT_FUNCTIONS(p384_mayo3) MAKE_KEM_KEYMGMT_FUNCTIONS(frodo640aes, OQS_KEM_alg_frodokem_640_aes, 128) diff --git a/oqsprov/oqs_prov.h b/oqsprov/oqs_prov.h index aae2d444..b3039ae1 100644 --- a/oqsprov/oqs_prov.h +++ b/oqsprov/oqs_prov.h @@ -2039,99 +2039,99 @@ extern const OSSL_DISPATCH extern const OSSL_DISPATCH oqs_SubjectPublicKeyInfo_der_to_rsa3072_sphincsshake128fsimple_decoder_functions []; -extern const OSSL_DISPATCH oqs_mayo_1_to_PrivateKeyInfo_der_encoder_functions[]; -extern const OSSL_DISPATCH oqs_mayo_1_to_PrivateKeyInfo_pem_encoder_functions[]; +extern const OSSL_DISPATCH oqs_mayo1_to_PrivateKeyInfo_der_encoder_functions[]; +extern const OSSL_DISPATCH oqs_mayo1_to_PrivateKeyInfo_pem_encoder_functions[]; extern const OSSL_DISPATCH - oqs_mayo_1_to_EncryptedPrivateKeyInfo_der_encoder_functions[]; + oqs_mayo1_to_EncryptedPrivateKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_mayo_1_to_EncryptedPrivateKeyInfo_pem_encoder_functions[]; + oqs_mayo1_to_EncryptedPrivateKeyInfo_pem_encoder_functions[]; extern const OSSL_DISPATCH - oqs_mayo_1_to_SubjectPublicKeyInfo_der_encoder_functions[]; + oqs_mayo1_to_SubjectPublicKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_mayo_1_to_SubjectPublicKeyInfo_pem_encoder_functions[]; -extern const OSSL_DISPATCH oqs_mayo_1_to_text_encoder_functions[]; -extern const OSSL_DISPATCH oqs_PrivateKeyInfo_der_to_mayo_1_decoder_functions[]; + oqs_mayo1_to_SubjectPublicKeyInfo_pem_encoder_functions[]; +extern const OSSL_DISPATCH oqs_mayo1_to_text_encoder_functions[]; +extern const OSSL_DISPATCH oqs_PrivateKeyInfo_der_to_mayo1_decoder_functions[]; extern const OSSL_DISPATCH - oqs_SubjectPublicKeyInfo_der_to_mayo_1_decoder_functions[]; + oqs_SubjectPublicKeyInfo_der_to_mayo1_decoder_functions[]; extern const OSSL_DISPATCH - oqs_p256_mayo_1_to_PrivateKeyInfo_der_encoder_functions[]; + oqs_p256_mayo1_to_PrivateKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p256_mayo_1_to_PrivateKeyInfo_pem_encoder_functions[]; + oqs_p256_mayo1_to_PrivateKeyInfo_pem_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p256_mayo_1_to_EncryptedPrivateKeyInfo_der_encoder_functions[]; + oqs_p256_mayo1_to_EncryptedPrivateKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p256_mayo_1_to_EncryptedPrivateKeyInfo_pem_encoder_functions[]; + oqs_p256_mayo1_to_EncryptedPrivateKeyInfo_pem_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p256_mayo_1_to_SubjectPublicKeyInfo_der_encoder_functions[]; + oqs_p256_mayo1_to_SubjectPublicKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p256_mayo_1_to_SubjectPublicKeyInfo_pem_encoder_functions[]; -extern const OSSL_DISPATCH oqs_p256_mayo_1_to_text_encoder_functions[]; + oqs_p256_mayo1_to_SubjectPublicKeyInfo_pem_encoder_functions[]; +extern const OSSL_DISPATCH oqs_p256_mayo1_to_text_encoder_functions[]; extern const OSSL_DISPATCH - oqs_PrivateKeyInfo_der_to_p256_mayo_1_decoder_functions[]; + oqs_PrivateKeyInfo_der_to_p256_mayo1_decoder_functions[]; extern const OSSL_DISPATCH - oqs_SubjectPublicKeyInfo_der_to_p256_mayo_1_decoder_functions[]; -extern const OSSL_DISPATCH oqs_mayo_2_to_PrivateKeyInfo_der_encoder_functions[]; -extern const OSSL_DISPATCH oqs_mayo_2_to_PrivateKeyInfo_pem_encoder_functions[]; + oqs_SubjectPublicKeyInfo_der_to_p256_mayo1_decoder_functions[]; +extern const OSSL_DISPATCH oqs_mayo2_to_PrivateKeyInfo_der_encoder_functions[]; +extern const OSSL_DISPATCH oqs_mayo2_to_PrivateKeyInfo_pem_encoder_functions[]; extern const OSSL_DISPATCH - oqs_mayo_2_to_EncryptedPrivateKeyInfo_der_encoder_functions[]; + oqs_mayo2_to_EncryptedPrivateKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_mayo_2_to_EncryptedPrivateKeyInfo_pem_encoder_functions[]; + oqs_mayo2_to_EncryptedPrivateKeyInfo_pem_encoder_functions[]; extern const OSSL_DISPATCH - oqs_mayo_2_to_SubjectPublicKeyInfo_der_encoder_functions[]; + oqs_mayo2_to_SubjectPublicKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_mayo_2_to_SubjectPublicKeyInfo_pem_encoder_functions[]; -extern const OSSL_DISPATCH oqs_mayo_2_to_text_encoder_functions[]; -extern const OSSL_DISPATCH oqs_PrivateKeyInfo_der_to_mayo_2_decoder_functions[]; + oqs_mayo2_to_SubjectPublicKeyInfo_pem_encoder_functions[]; +extern const OSSL_DISPATCH oqs_mayo2_to_text_encoder_functions[]; +extern const OSSL_DISPATCH oqs_PrivateKeyInfo_der_to_mayo2_decoder_functions[]; extern const OSSL_DISPATCH - oqs_SubjectPublicKeyInfo_der_to_mayo_2_decoder_functions[]; + oqs_SubjectPublicKeyInfo_der_to_mayo2_decoder_functions[]; extern const OSSL_DISPATCH - oqs_p256_mayo_2_to_PrivateKeyInfo_der_encoder_functions[]; + oqs_p256_mayo2_to_PrivateKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p256_mayo_2_to_PrivateKeyInfo_pem_encoder_functions[]; + oqs_p256_mayo2_to_PrivateKeyInfo_pem_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p256_mayo_2_to_EncryptedPrivateKeyInfo_der_encoder_functions[]; + oqs_p256_mayo2_to_EncryptedPrivateKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p256_mayo_2_to_EncryptedPrivateKeyInfo_pem_encoder_functions[]; + oqs_p256_mayo2_to_EncryptedPrivateKeyInfo_pem_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p256_mayo_2_to_SubjectPublicKeyInfo_der_encoder_functions[]; + oqs_p256_mayo2_to_SubjectPublicKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p256_mayo_2_to_SubjectPublicKeyInfo_pem_encoder_functions[]; -extern const OSSL_DISPATCH oqs_p256_mayo_2_to_text_encoder_functions[]; + oqs_p256_mayo2_to_SubjectPublicKeyInfo_pem_encoder_functions[]; +extern const OSSL_DISPATCH oqs_p256_mayo2_to_text_encoder_functions[]; extern const OSSL_DISPATCH - oqs_PrivateKeyInfo_der_to_p256_mayo_2_decoder_functions[]; + oqs_PrivateKeyInfo_der_to_p256_mayo2_decoder_functions[]; extern const OSSL_DISPATCH - oqs_SubjectPublicKeyInfo_der_to_p256_mayo_2_decoder_functions[]; -extern const OSSL_DISPATCH oqs_mayo_3_to_PrivateKeyInfo_der_encoder_functions[]; -extern const OSSL_DISPATCH oqs_mayo_3_to_PrivateKeyInfo_pem_encoder_functions[]; + oqs_SubjectPublicKeyInfo_der_to_p256_mayo2_decoder_functions[]; +extern const OSSL_DISPATCH oqs_mayo3_to_PrivateKeyInfo_der_encoder_functions[]; +extern const OSSL_DISPATCH oqs_mayo3_to_PrivateKeyInfo_pem_encoder_functions[]; extern const OSSL_DISPATCH - oqs_mayo_3_to_EncryptedPrivateKeyInfo_der_encoder_functions[]; + oqs_mayo3_to_EncryptedPrivateKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_mayo_3_to_EncryptedPrivateKeyInfo_pem_encoder_functions[]; + oqs_mayo3_to_EncryptedPrivateKeyInfo_pem_encoder_functions[]; extern const OSSL_DISPATCH - oqs_mayo_3_to_SubjectPublicKeyInfo_der_encoder_functions[]; + oqs_mayo3_to_SubjectPublicKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_mayo_3_to_SubjectPublicKeyInfo_pem_encoder_functions[]; -extern const OSSL_DISPATCH oqs_mayo_3_to_text_encoder_functions[]; -extern const OSSL_DISPATCH oqs_PrivateKeyInfo_der_to_mayo_3_decoder_functions[]; + oqs_mayo3_to_SubjectPublicKeyInfo_pem_encoder_functions[]; +extern const OSSL_DISPATCH oqs_mayo3_to_text_encoder_functions[]; +extern const OSSL_DISPATCH oqs_PrivateKeyInfo_der_to_mayo3_decoder_functions[]; extern const OSSL_DISPATCH - oqs_SubjectPublicKeyInfo_der_to_mayo_3_decoder_functions[]; + oqs_SubjectPublicKeyInfo_der_to_mayo3_decoder_functions[]; extern const OSSL_DISPATCH - oqs_p384_mayo_3_to_PrivateKeyInfo_der_encoder_functions[]; + oqs_p384_mayo3_to_PrivateKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p384_mayo_3_to_PrivateKeyInfo_pem_encoder_functions[]; + oqs_p384_mayo3_to_PrivateKeyInfo_pem_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p384_mayo_3_to_EncryptedPrivateKeyInfo_der_encoder_functions[]; + oqs_p384_mayo3_to_EncryptedPrivateKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p384_mayo_3_to_EncryptedPrivateKeyInfo_pem_encoder_functions[]; + oqs_p384_mayo3_to_EncryptedPrivateKeyInfo_pem_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p384_mayo_3_to_SubjectPublicKeyInfo_der_encoder_functions[]; + oqs_p384_mayo3_to_SubjectPublicKeyInfo_der_encoder_functions[]; extern const OSSL_DISPATCH - oqs_p384_mayo_3_to_SubjectPublicKeyInfo_pem_encoder_functions[]; -extern const OSSL_DISPATCH oqs_p384_mayo_3_to_text_encoder_functions[]; + oqs_p384_mayo3_to_SubjectPublicKeyInfo_pem_encoder_functions[]; +extern const OSSL_DISPATCH oqs_p384_mayo3_to_text_encoder_functions[]; extern const OSSL_DISPATCH - oqs_PrivateKeyInfo_der_to_p384_mayo_3_decoder_functions[]; + oqs_PrivateKeyInfo_der_to_p384_mayo3_decoder_functions[]; extern const OSSL_DISPATCH - oqs_SubjectPublicKeyInfo_der_to_p384_mayo_3_decoder_functions[]; + oqs_SubjectPublicKeyInfo_der_to_p384_mayo3_decoder_functions[]; ///// OQS_TEMPLATE_FRAGMENT_ENDECODER_FUNCTIONS_END ///// OQS_TEMPLATE_FRAGMENT_ALG_FUNCTIONS_START @@ -2186,12 +2186,12 @@ extern const OSSL_DISPATCH oqs_sphincsshake128fsimple_keymgmt_functions[]; extern const OSSL_DISPATCH oqs_p256_sphincsshake128fsimple_keymgmt_functions[]; extern const OSSL_DISPATCH oqs_rsa3072_sphincsshake128fsimple_keymgmt_functions[]; -extern const OSSL_DISPATCH oqs_mayo_1_keymgmt_functions[]; -extern const OSSL_DISPATCH oqs_p256_mayo_1_keymgmt_functions[]; -extern const OSSL_DISPATCH oqs_mayo_2_keymgmt_functions[]; -extern const OSSL_DISPATCH oqs_p256_mayo_2_keymgmt_functions[]; -extern const OSSL_DISPATCH oqs_mayo_3_keymgmt_functions[]; -extern const OSSL_DISPATCH oqs_p384_mayo_3_keymgmt_functions[]; +extern const OSSL_DISPATCH oqs_mayo1_keymgmt_functions[]; +extern const OSSL_DISPATCH oqs_p256_mayo1_keymgmt_functions[]; +extern const OSSL_DISPATCH oqs_mayo2_keymgmt_functions[]; +extern const OSSL_DISPATCH oqs_p256_mayo2_keymgmt_functions[]; +extern const OSSL_DISPATCH oqs_mayo3_keymgmt_functions[]; +extern const OSSL_DISPATCH oqs_p384_mayo3_keymgmt_functions[]; extern const OSSL_DISPATCH oqs_frodo640aes_keymgmt_functions[]; diff --git a/oqsprov/oqsdecoders.inc b/oqsprov/oqsdecoders.inc index ea29d31e..503a2487 100644 --- a/oqsprov/oqsdecoders.inc +++ b/oqsprov/oqsdecoders.inc @@ -420,21 +420,21 @@ DECODER_w_structure("frodo640aes", der, PrivateKeyInfo, frodo640aes), SubjectPublicKeyInfo, rsa3072_sphincsshake128fsimple), #endif #ifdef OQS_ENABLE_SIG_mayo_1 - DECODER_w_structure("mayo_1", der, PrivateKeyInfo, mayo_1), - DECODER_w_structure("mayo_1", der, SubjectPublicKeyInfo, mayo_1), - DECODER_w_structure("p256_mayo_1", der, PrivateKeyInfo, p256_mayo_1), - DECODER_w_structure("p256_mayo_1", der, SubjectPublicKeyInfo, p256_mayo_1), + DECODER_w_structure("mayo1", der, PrivateKeyInfo, mayo1), + DECODER_w_structure("mayo1", der, SubjectPublicKeyInfo, mayo1), + DECODER_w_structure("p256_mayo1", der, PrivateKeyInfo, p256_mayo1), + DECODER_w_structure("p256_mayo1", der, SubjectPublicKeyInfo, p256_mayo1), #endif #ifdef OQS_ENABLE_SIG_mayo_2 - DECODER_w_structure("mayo_2", der, PrivateKeyInfo, mayo_2), - DECODER_w_structure("mayo_2", der, SubjectPublicKeyInfo, mayo_2), - DECODER_w_structure("p256_mayo_2", der, PrivateKeyInfo, p256_mayo_2), - DECODER_w_structure("p256_mayo_2", der, SubjectPublicKeyInfo, p256_mayo_2), + DECODER_w_structure("mayo2", der, PrivateKeyInfo, mayo2), + DECODER_w_structure("mayo2", der, SubjectPublicKeyInfo, mayo2), + DECODER_w_structure("p256_mayo2", der, PrivateKeyInfo, p256_mayo2), + DECODER_w_structure("p256_mayo2", der, SubjectPublicKeyInfo, p256_mayo2), #endif #ifdef OQS_ENABLE_SIG_mayo_3 - DECODER_w_structure("mayo_3", der, PrivateKeyInfo, mayo_3), - DECODER_w_structure("mayo_3", der, SubjectPublicKeyInfo, mayo_3), - DECODER_w_structure("p384_mayo_3", der, PrivateKeyInfo, p384_mayo_3), - DECODER_w_structure("p384_mayo_3", der, SubjectPublicKeyInfo, p384_mayo_3), + DECODER_w_structure("mayo3", der, PrivateKeyInfo, mayo3), + DECODER_w_structure("mayo3", der, SubjectPublicKeyInfo, mayo3), + DECODER_w_structure("p384_mayo3", der, PrivateKeyInfo, p384_mayo3), + DECODER_w_structure("p384_mayo3", der, SubjectPublicKeyInfo, p384_mayo3), #endif ///// OQS_TEMPLATE_FRAGMENT_MAKE_END diff --git a/oqsprov/oqsencoders.inc b/oqsprov/oqsencoders.inc index 3cfe3e52..b48d02e5 100644 --- a/oqsprov/oqsencoders.inc +++ b/oqsprov/oqsencoders.inc @@ -1269,57 +1269,51 @@ ENCODER_w_structure("frodo640aes", frodo640aes, der, PrivateKeyInfo), rsa3072_sphincsshake128fsimple), #endif #ifdef OQS_ENABLE_SIG_mayo_1 - ENCODER_w_structure("mayo_1", mayo_1, der, PrivateKeyInfo), - ENCODER_w_structure("mayo_1", mayo_1, pem, PrivateKeyInfo), - ENCODER_w_structure("mayo_1", mayo_1, der, EncryptedPrivateKeyInfo), - ENCODER_w_structure("mayo_1", mayo_1, pem, EncryptedPrivateKeyInfo), - ENCODER_w_structure("mayo_1", mayo_1, der, SubjectPublicKeyInfo), - ENCODER_w_structure("mayo_1", mayo_1, pem, SubjectPublicKeyInfo), - ENCODER_TEXT("mayo_1", mayo_1), - ENCODER_w_structure("p256_mayo_1", p256_mayo_1, der, PrivateKeyInfo), - ENCODER_w_structure("p256_mayo_1", p256_mayo_1, pem, PrivateKeyInfo), - ENCODER_w_structure("p256_mayo_1", p256_mayo_1, der, - EncryptedPrivateKeyInfo), - ENCODER_w_structure("p256_mayo_1", p256_mayo_1, pem, - EncryptedPrivateKeyInfo), - ENCODER_w_structure("p256_mayo_1", p256_mayo_1, der, SubjectPublicKeyInfo), - ENCODER_w_structure("p256_mayo_1", p256_mayo_1, pem, SubjectPublicKeyInfo), - ENCODER_TEXT("p256_mayo_1", p256_mayo_1), + ENCODER_w_structure("mayo1", mayo1, der, PrivateKeyInfo), + ENCODER_w_structure("mayo1", mayo1, pem, PrivateKeyInfo), + ENCODER_w_structure("mayo1", mayo1, der, EncryptedPrivateKeyInfo), + ENCODER_w_structure("mayo1", mayo1, pem, EncryptedPrivateKeyInfo), + ENCODER_w_structure("mayo1", mayo1, der, SubjectPublicKeyInfo), + ENCODER_w_structure("mayo1", mayo1, pem, SubjectPublicKeyInfo), + ENCODER_TEXT("mayo1", mayo1), + ENCODER_w_structure("p256_mayo1", p256_mayo1, der, PrivateKeyInfo), + ENCODER_w_structure("p256_mayo1", p256_mayo1, pem, PrivateKeyInfo), + ENCODER_w_structure("p256_mayo1", p256_mayo1, der, EncryptedPrivateKeyInfo), + ENCODER_w_structure("p256_mayo1", p256_mayo1, pem, EncryptedPrivateKeyInfo), + ENCODER_w_structure("p256_mayo1", p256_mayo1, der, SubjectPublicKeyInfo), + ENCODER_w_structure("p256_mayo1", p256_mayo1, pem, SubjectPublicKeyInfo), + ENCODER_TEXT("p256_mayo1", p256_mayo1), #endif #ifdef OQS_ENABLE_SIG_mayo_2 - ENCODER_w_structure("mayo_2", mayo_2, der, PrivateKeyInfo), - ENCODER_w_structure("mayo_2", mayo_2, pem, PrivateKeyInfo), - ENCODER_w_structure("mayo_2", mayo_2, der, EncryptedPrivateKeyInfo), - ENCODER_w_structure("mayo_2", mayo_2, pem, EncryptedPrivateKeyInfo), - ENCODER_w_structure("mayo_2", mayo_2, der, SubjectPublicKeyInfo), - ENCODER_w_structure("mayo_2", mayo_2, pem, SubjectPublicKeyInfo), - ENCODER_TEXT("mayo_2", mayo_2), - ENCODER_w_structure("p256_mayo_2", p256_mayo_2, der, PrivateKeyInfo), - ENCODER_w_structure("p256_mayo_2", p256_mayo_2, pem, PrivateKeyInfo), - ENCODER_w_structure("p256_mayo_2", p256_mayo_2, der, - EncryptedPrivateKeyInfo), - ENCODER_w_structure("p256_mayo_2", p256_mayo_2, pem, - EncryptedPrivateKeyInfo), - ENCODER_w_structure("p256_mayo_2", p256_mayo_2, der, SubjectPublicKeyInfo), - ENCODER_w_structure("p256_mayo_2", p256_mayo_2, pem, SubjectPublicKeyInfo), - ENCODER_TEXT("p256_mayo_2", p256_mayo_2), + ENCODER_w_structure("mayo2", mayo2, der, PrivateKeyInfo), + ENCODER_w_structure("mayo2", mayo2, pem, PrivateKeyInfo), + ENCODER_w_structure("mayo2", mayo2, der, EncryptedPrivateKeyInfo), + ENCODER_w_structure("mayo2", mayo2, pem, EncryptedPrivateKeyInfo), + ENCODER_w_structure("mayo2", mayo2, der, SubjectPublicKeyInfo), + ENCODER_w_structure("mayo2", mayo2, pem, SubjectPublicKeyInfo), + ENCODER_TEXT("mayo2", mayo2), + ENCODER_w_structure("p256_mayo2", p256_mayo2, der, PrivateKeyInfo), + ENCODER_w_structure("p256_mayo2", p256_mayo2, pem, PrivateKeyInfo), + ENCODER_w_structure("p256_mayo2", p256_mayo2, der, EncryptedPrivateKeyInfo), + ENCODER_w_structure("p256_mayo2", p256_mayo2, pem, EncryptedPrivateKeyInfo), + ENCODER_w_structure("p256_mayo2", p256_mayo2, der, SubjectPublicKeyInfo), + ENCODER_w_structure("p256_mayo2", p256_mayo2, pem, SubjectPublicKeyInfo), + ENCODER_TEXT("p256_mayo2", p256_mayo2), #endif #ifdef OQS_ENABLE_SIG_mayo_3 - ENCODER_w_structure("mayo_3", mayo_3, der, PrivateKeyInfo), - ENCODER_w_structure("mayo_3", mayo_3, pem, PrivateKeyInfo), - ENCODER_w_structure("mayo_3", mayo_3, der, EncryptedPrivateKeyInfo), - ENCODER_w_structure("mayo_3", mayo_3, pem, EncryptedPrivateKeyInfo), - ENCODER_w_structure("mayo_3", mayo_3, der, SubjectPublicKeyInfo), - ENCODER_w_structure("mayo_3", mayo_3, pem, SubjectPublicKeyInfo), - ENCODER_TEXT("mayo_3", mayo_3), - ENCODER_w_structure("p384_mayo_3", p384_mayo_3, der, PrivateKeyInfo), - ENCODER_w_structure("p384_mayo_3", p384_mayo_3, pem, PrivateKeyInfo), - ENCODER_w_structure("p384_mayo_3", p384_mayo_3, der, - EncryptedPrivateKeyInfo), - ENCODER_w_structure("p384_mayo_3", p384_mayo_3, pem, - EncryptedPrivateKeyInfo), - ENCODER_w_structure("p384_mayo_3", p384_mayo_3, der, SubjectPublicKeyInfo), - ENCODER_w_structure("p384_mayo_3", p384_mayo_3, pem, SubjectPublicKeyInfo), - ENCODER_TEXT("p384_mayo_3", p384_mayo_3), + ENCODER_w_structure("mayo3", mayo3, der, PrivateKeyInfo), + ENCODER_w_structure("mayo3", mayo3, pem, PrivateKeyInfo), + ENCODER_w_structure("mayo3", mayo3, der, EncryptedPrivateKeyInfo), + ENCODER_w_structure("mayo3", mayo3, pem, EncryptedPrivateKeyInfo), + ENCODER_w_structure("mayo3", mayo3, der, SubjectPublicKeyInfo), + ENCODER_w_structure("mayo3", mayo3, pem, SubjectPublicKeyInfo), + ENCODER_TEXT("mayo3", mayo3), + ENCODER_w_structure("p384_mayo3", p384_mayo3, der, PrivateKeyInfo), + ENCODER_w_structure("p384_mayo3", p384_mayo3, pem, PrivateKeyInfo), + ENCODER_w_structure("p384_mayo3", p384_mayo3, der, EncryptedPrivateKeyInfo), + ENCODER_w_structure("p384_mayo3", p384_mayo3, pem, EncryptedPrivateKeyInfo), + ENCODER_w_structure("p384_mayo3", p384_mayo3, der, SubjectPublicKeyInfo), + ENCODER_w_structure("p384_mayo3", p384_mayo3, pem, SubjectPublicKeyInfo), + ENCODER_TEXT("p384_mayo3", p384_mayo3), #endif ///// OQS_TEMPLATE_FRAGMENT_MAKE_END diff --git a/oqsprov/oqsprov.c b/oqsprov/oqsprov.c index 33e6ff14..d05aae4c 100644 --- a/oqsprov/oqsprov.c +++ b/oqsprov/oqsprov.c @@ -264,17 +264,17 @@ const char *oqs_oid_alg_list[OQS_OID_CNT] = { "1.3.9999.6.7.15", "rsa3072_sphincsshake128fsimple", "1.3.9999.8.1.1", - "mayo_1", + "mayo1", "1.3.9999.8.1.2", - "p256_mayo_1", + "p256_mayo1", "1.3.9999.8.2.1", - "mayo_2", + "mayo2", "1.3.9999.8.2.2", - "p256_mayo_2", + "p256_mayo2", "1.3.9999.8.3.1", - "mayo_3", + "mayo3", "1.3.9999.8.3.2", - "p384_mayo_3", + "p384_mayo3", ///// OQS_TEMPLATE_FRAGMENT_ASSIGN_SIG_OIDS_END }; @@ -511,17 +511,17 @@ int oqs_patch_oids(void) oqs_oid_alg_list[92 + OQS_KEMOID_CNT] = envval; if ((envval = getenv("OQS_OID_RSA3072_SPHINCSSHAKE128FSIMPLE"))) oqs_oid_alg_list[94 + OQS_KEMOID_CNT] = envval; - if ((envval = getenv("OQS_OID_MAYO_1"))) + if ((envval = getenv("OQS_OID_MAYO1"))) oqs_oid_alg_list[96 + OQS_KEMOID_CNT] = envval; - if ((envval = getenv("OQS_OID_P256_MAYO_1"))) + if ((envval = getenv("OQS_OID_P256_MAYO1"))) oqs_oid_alg_list[98 + OQS_KEMOID_CNT] = envval; - if ((envval = getenv("OQS_OID_MAYO_2"))) + if ((envval = getenv("OQS_OID_MAYO2"))) oqs_oid_alg_list[100 + OQS_KEMOID_CNT] = envval; - if ((envval = getenv("OQS_OID_P256_MAYO_2"))) + if ((envval = getenv("OQS_OID_P256_MAYO2"))) oqs_oid_alg_list[102 + OQS_KEMOID_CNT] = envval; - if ((envval = getenv("OQS_OID_MAYO_3"))) + if ((envval = getenv("OQS_OID_MAYO3"))) oqs_oid_alg_list[104 + OQS_KEMOID_CNT] = envval; - if ((envval = getenv("OQS_OID_P384_MAYO_3"))) + if ((envval = getenv("OQS_OID_P384_MAYO3"))) oqs_oid_alg_list[106 + OQS_KEMOID_CNT] = envval; } ///// OQS_TEMPLATE_FRAGMENT_OID_PATCHING_END return 1; @@ -747,29 +747,29 @@ int oqs_patch_encodings(void) if ((envval = getenv("OQS_ENCODING_RSA3072_SPHINCSSHAKE128FSIMPLE_ALGNAME"))) oqs_alg_encoding_list[95] = envval; - if ((envval = getenv("OQS_ENCODING_MAYO_1"))) + if ((envval = getenv("OQS_ENCODING_MAYO1"))) oqs_alg_encoding_list[96] = envval; - if ((envval = getenv("OQS_ENCODING_MAYO_1_ALGNAME"))) + if ((envval = getenv("OQS_ENCODING_MAYO1_ALGNAME"))) oqs_alg_encoding_list[97] = envval; - if ((envval = getenv("OQS_ENCODING_P256_MAYO_1"))) + if ((envval = getenv("OQS_ENCODING_P256_MAYO1"))) oqs_alg_encoding_list[98] = envval; - if ((envval = getenv("OQS_ENCODING_P256_MAYO_1_ALGNAME"))) + if ((envval = getenv("OQS_ENCODING_P256_MAYO1_ALGNAME"))) oqs_alg_encoding_list[99] = envval; - if ((envval = getenv("OQS_ENCODING_MAYO_2"))) + if ((envval = getenv("OQS_ENCODING_MAYO2"))) oqs_alg_encoding_list[100] = envval; - if ((envval = getenv("OQS_ENCODING_MAYO_2_ALGNAME"))) + if ((envval = getenv("OQS_ENCODING_MAYO2_ALGNAME"))) oqs_alg_encoding_list[101] = envval; - if ((envval = getenv("OQS_ENCODING_P256_MAYO_2"))) + if ((envval = getenv("OQS_ENCODING_P256_MAYO2"))) oqs_alg_encoding_list[102] = envval; - if ((envval = getenv("OQS_ENCODING_P256_MAYO_2_ALGNAME"))) + if ((envval = getenv("OQS_ENCODING_P256_MAYO2_ALGNAME"))) oqs_alg_encoding_list[103] = envval; - if ((envval = getenv("OQS_ENCODING_MAYO_3"))) + if ((envval = getenv("OQS_ENCODING_MAYO3"))) oqs_alg_encoding_list[104] = envval; - if ((envval = getenv("OQS_ENCODING_MAYO_3_ALGNAME"))) + if ((envval = getenv("OQS_ENCODING_MAYO3_ALGNAME"))) oqs_alg_encoding_list[105] = envval; - if ((envval = getenv("OQS_ENCODING_P384_MAYO_3"))) + if ((envval = getenv("OQS_ENCODING_P384_MAYO3"))) oqs_alg_encoding_list[106] = envval; - if ((envval = getenv("OQS_ENCODING_P384_MAYO_3_ALGNAME"))) + if ((envval = getenv("OQS_ENCODING_P384_MAYO3_ALGNAME"))) oqs_alg_encoding_list[107] = envval; } ///// OQS_TEMPLATE_FRAGMENT_ENCODING_PATCHING_END @@ -893,16 +893,16 @@ static const OSSL_ALGORITHM oqsprovider_signatures[] = { SIGALG("rsa3072_sphincsshake128fsimple", 128, oqs_signature_functions), #endif #ifdef OQS_ENABLE_SIG_mayo_1 - SIGALG("mayo_1", 128, oqs_signature_functions), - SIGALG("p256_mayo_1", 128, oqs_signature_functions), + SIGALG("mayo1", 128, oqs_signature_functions), + SIGALG("p256_mayo1", 128, oqs_signature_functions), #endif #ifdef OQS_ENABLE_SIG_mayo_2 - SIGALG("mayo_2", 128, oqs_signature_functions), - SIGALG("p256_mayo_2", 128, oqs_signature_functions), + SIGALG("mayo2", 128, oqs_signature_functions), + SIGALG("p256_mayo2", 128, oqs_signature_functions), #endif #ifdef OQS_ENABLE_SIG_mayo_3 - SIGALG("mayo_3", 192, oqs_signature_functions), - SIGALG("p384_mayo_3", 192, oqs_signature_functions), + SIGALG("mayo3", 192, oqs_signature_functions), + SIGALG("p384_mayo3", 192, oqs_signature_functions), #endif ///// OQS_TEMPLATE_FRAGMENT_SIG_FUNCTIONS_END {NULL, NULL, NULL}}; @@ -1085,16 +1085,16 @@ static const OSSL_ALGORITHM oqsprovider_keymgmt[] SIGALG("rsa3072_sphincsshake128fsimple", 128, oqs_rsa3072_sphincsshake128fsimple_keymgmt_functions), #endif #ifdef OQS_ENABLE_SIG_mayo_1 - SIGALG("mayo_1", 128, oqs_mayo_1_keymgmt_functions), - SIGALG("p256_mayo_1", 128, oqs_p256_mayo_1_keymgmt_functions), + SIGALG("mayo1", 128, oqs_mayo1_keymgmt_functions), + SIGALG("p256_mayo1", 128, oqs_p256_mayo1_keymgmt_functions), #endif #ifdef OQS_ENABLE_SIG_mayo_2 - SIGALG("mayo_2", 128, oqs_mayo_2_keymgmt_functions), - SIGALG("p256_mayo_2", 128, oqs_p256_mayo_2_keymgmt_functions), + SIGALG("mayo2", 128, oqs_mayo2_keymgmt_functions), + SIGALG("p256_mayo2", 128, oqs_p256_mayo2_keymgmt_functions), #endif #ifdef OQS_ENABLE_SIG_mayo_3 - SIGALG("mayo_3", 192, oqs_mayo_3_keymgmt_functions), - SIGALG("p384_mayo_3", 192, oqs_p384_mayo_3_keymgmt_functions), + SIGALG("mayo3", 192, oqs_mayo3_keymgmt_functions), + SIGALG("p384_mayo3", 192, oqs_p384_mayo3_keymgmt_functions), #endif #ifdef OQS_ENABLE_KEM_frodokem_640_aes diff --git a/oqsprov/oqsprov_capabilities.c b/oqsprov/oqsprov_capabilities.c index 035dfe1e..9aebcd30 100644 --- a/oqsprov/oqsprov_capabilities.c +++ b/oqsprov/oqsprov_capabilities.c @@ -578,21 +578,21 @@ int oqs_patch_codepoints() if (getenv("OQS_CODEPOINT_RSA3072_SPHINCSSHAKE128FSIMPLE")) oqs_sigalg_list[47].code_point = atoi(getenv("OQS_CODEPOINT_RSA3072_SPHINCSSHAKE128FSIMPLE")); - if (getenv("OQS_CODEPOINT_MAYO_1")) - oqs_sigalg_list[48].code_point = atoi(getenv("OQS_CODEPOINT_MAYO_1")); - if (getenv("OQS_CODEPOINT_P256_MAYO_1")) + if (getenv("OQS_CODEPOINT_MAYO1")) + oqs_sigalg_list[48].code_point = atoi(getenv("OQS_CODEPOINT_MAYO1")); + if (getenv("OQS_CODEPOINT_P256_MAYO1")) oqs_sigalg_list[49].code_point - = atoi(getenv("OQS_CODEPOINT_P256_MAYO_1")); - if (getenv("OQS_CODEPOINT_MAYO_2")) - oqs_sigalg_list[50].code_point = atoi(getenv("OQS_CODEPOINT_MAYO_2")); - if (getenv("OQS_CODEPOINT_P256_MAYO_2")) + = atoi(getenv("OQS_CODEPOINT_P256_MAYO1")); + if (getenv("OQS_CODEPOINT_MAYO2")) + oqs_sigalg_list[50].code_point = atoi(getenv("OQS_CODEPOINT_MAYO2")); + if (getenv("OQS_CODEPOINT_P256_MAYO2")) oqs_sigalg_list[51].code_point - = atoi(getenv("OQS_CODEPOINT_P256_MAYO_2")); - if (getenv("OQS_CODEPOINT_MAYO_3")) - oqs_sigalg_list[52].code_point = atoi(getenv("OQS_CODEPOINT_MAYO_3")); - if (getenv("OQS_CODEPOINT_P384_MAYO_3")) + = atoi(getenv("OQS_CODEPOINT_P256_MAYO2")); + if (getenv("OQS_CODEPOINT_MAYO3")) + oqs_sigalg_list[52].code_point = atoi(getenv("OQS_CODEPOINT_MAYO3")); + if (getenv("OQS_CODEPOINT_P384_MAYO3")) oqs_sigalg_list[53].code_point - = atoi(getenv("OQS_CODEPOINT_P384_MAYO_3")); + = atoi(getenv("OQS_CODEPOINT_P384_MAYO3")); ///// OQS_TEMPLATE_FRAGMENT_CODEPOINT_PATCHING_END return 1; } @@ -756,19 +756,16 @@ static const OSSL_PARAM oqs_param_sigalg_list[][12] = { rsa3072_sphincsshake128fsimple, "1.3.9999.6.7.15", 47), # endif # ifdef OQS_ENABLE_SIG_mayo_1 - OQS_SIGALG_ENTRY(mayo_1, mayo_1, mayo_1, "1.3.9999.8.1.1", 48), - OQS_SIGALG_ENTRY(p256_mayo_1, p256_mayo_1, p256_mayo_1, "1.3.9999.8.1.2", - 49), + OQS_SIGALG_ENTRY(mayo1, mayo1, mayo1, "1.3.9999.8.1.1", 48), + OQS_SIGALG_ENTRY(p256_mayo1, p256_mayo1, p256_mayo1, "1.3.9999.8.1.2", 49), # endif # ifdef OQS_ENABLE_SIG_mayo_2 - OQS_SIGALG_ENTRY(mayo_2, mayo_2, mayo_2, "1.3.9999.8.2.1", 50), - OQS_SIGALG_ENTRY(p256_mayo_2, p256_mayo_2, p256_mayo_2, "1.3.9999.8.2.2", - 51), + OQS_SIGALG_ENTRY(mayo2, mayo2, mayo2, "1.3.9999.8.2.1", 50), + OQS_SIGALG_ENTRY(p256_mayo2, p256_mayo2, p256_mayo2, "1.3.9999.8.2.2", 51), # endif # ifdef OQS_ENABLE_SIG_mayo_3 - OQS_SIGALG_ENTRY(mayo_3, mayo_3, mayo_3, "1.3.9999.8.3.1", 52), - OQS_SIGALG_ENTRY(p384_mayo_3, p384_mayo_3, p384_mayo_3, "1.3.9999.8.3.2", - 53), + OQS_SIGALG_ENTRY(mayo3, mayo3, mayo3, "1.3.9999.8.3.1", 52), + OQS_SIGALG_ENTRY(p384_mayo3, p384_mayo3, p384_mayo3, "1.3.9999.8.3.2", 53), # endif ///// OQS_TEMPLATE_FRAGMENT_SIGALG_NAMES_END }; diff --git a/oqsprov/oqsprov_keys.c b/oqsprov/oqsprov_keys.c index 3f5a31b0..8efdcb51 100644 --- a/oqsprov/oqsprov_keys.c +++ b/oqsprov/oqsprov_keys.c @@ -190,12 +190,12 @@ static oqs_nid_name_t nid_names[NID_TABLE_LEN] = { KEY_TYPE_HYB_SIG, 128}, {0, "rsa3072_sphincsshake128fsimple", OQS_SIG_alg_sphincs_shake_128f_simple, KEY_TYPE_HYB_SIG, 128}, - {0, "mayo_1", OQS_SIG_alg_mayo_1, KEY_TYPE_SIG, 128}, - {0, "p256_mayo_1", OQS_SIG_alg_mayo_1, KEY_TYPE_HYB_SIG, 128}, - {0, "mayo_2", OQS_SIG_alg_mayo_2, KEY_TYPE_SIG, 128}, - {0, "p256_mayo_2", OQS_SIG_alg_mayo_2, KEY_TYPE_HYB_SIG, 128}, - {0, "mayo_3", OQS_SIG_alg_mayo_3, KEY_TYPE_SIG, 192}, - {0, "p384_mayo_3", OQS_SIG_alg_mayo_3, KEY_TYPE_HYB_SIG, 192}, + {0, "mayo1", OQS_SIG_alg_mayo_1, KEY_TYPE_SIG, 128}, + {0, "p256_mayo1", OQS_SIG_alg_mayo_1, KEY_TYPE_HYB_SIG, 128}, + {0, "mayo2", OQS_SIG_alg_mayo_2, KEY_TYPE_SIG, 128}, + {0, "p256_mayo2", OQS_SIG_alg_mayo_2, KEY_TYPE_HYB_SIG, 128}, + {0, "mayo3", OQS_SIG_alg_mayo_3, KEY_TYPE_SIG, 192}, + {0, "p384_mayo3", OQS_SIG_alg_mayo_3, KEY_TYPE_HYB_SIG, 192}, ///// OQS_TEMPLATE_FRAGMENT_OQSNAMES_END }; diff --git a/scripts/common.py b/scripts/common.py index c2b2065b..f79354d2 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -16,9 +16,9 @@ 'ecdsap256', 'rsa3072', ##### OQS_TEMPLATE_FRAGMENT_SIG_ALGS_START # post-quantum signatures - 'dilithium2','dilithium3','dilithium5','mldsa44','mldsa65','mldsa87','falcon512','falconpadded512','falcon1024','falconpadded1024','sphincssha2128fsimple','sphincssha2128ssimple','sphincssha2192fsimple','sphincsshake128fsimple','mayo_1','mayo_2','mayo_3', + 'dilithium2','dilithium3','dilithium5','mldsa44','mldsa65','mldsa87','falcon512','falconpadded512','falcon1024','falconpadded1024','sphincssha2128fsimple','sphincssha2128ssimple','sphincssha2192fsimple','sphincsshake128fsimple','mayo1','mayo2','mayo3', # post-quantum + classical signatures - 'p256_dilithium2','rsa3072_dilithium2','p384_dilithium3','p521_dilithium5','p256_mldsa44','rsa3072_mldsa44','p384_mldsa65','p521_mldsa87','p256_falcon512','rsa3072_falcon512','p256_falconpadded512','rsa3072_falconpadded512','p521_falcon1024','p521_falconpadded1024','p256_sphincssha2128fsimple','rsa3072_sphincssha2128fsimple','p256_sphincssha2128ssimple','rsa3072_sphincssha2128ssimple','p384_sphincssha2192fsimple','p256_sphincsshake128fsimple','rsa3072_sphincsshake128fsimple','p256_mayo_1','p256_mayo_2','p384_mayo_3', + 'p256_dilithium2','rsa3072_dilithium2','p384_dilithium3','p521_dilithium5','p256_mldsa44','rsa3072_mldsa44','p384_mldsa65','p521_mldsa87','p256_falcon512','rsa3072_falcon512','p256_falconpadded512','rsa3072_falconpadded512','p521_falcon1024','p521_falconpadded1024','p256_sphincssha2128fsimple','rsa3072_sphincssha2128fsimple','p256_sphincssha2128ssimple','rsa3072_sphincssha2128ssimple','p384_sphincssha2192fsimple','p256_sphincsshake128fsimple','rsa3072_sphincsshake128fsimple','p256_mayo1','p256_mayo2','p384_mayo3', # post-quantum + classical signatures (COMPOSITE) 'mldsa44_pss2048','mldsa44_rsa2048','mldsa44_ed25519','mldsa44_p256','mldsa44_bp256','mldsa65_pss3072','mldsa65_rsa3072','mldsa65_p256','mldsa65_bp256','mldsa65_ed25519','mldsa87_p384','mldsa87_bp384','mldsa87_ed448', ##### OQS_TEMPLATE_FRAGMENT_SIG_ALGS_END diff --git a/scripts/fullbuild.sh b/scripts/fullbuild.sh index 4640b575..3d1be975 100755 --- a/scripts/fullbuild.sh +++ b/scripts/fullbuild.sh @@ -29,7 +29,7 @@ if [ $# -gt 0 ]; then fi if [ -z "$LIBOQS_BRANCH" ]; then - export LIBOQS_BRANCH=main + export LIBOQS_BRANCH=bhe-nibbling-mayo fi if [ -z "$OQS_ALGS_ENABLED" ]; then diff --git a/test/oqs_test_evp_pkey_params.c b/test/oqs_test_evp_pkey_params.c index bc5ac6e8..ca05b88f 100644 --- a/test/oqs_test_evp_pkey_params.c +++ b/test/oqs_test_evp_pkey_params.c @@ -40,9 +40,9 @@ const char *kHybridSignatureAlgorithms[] = { "p384_sphincssha2192fsimple", "p256_sphincsshake128fsimple", "rsa3072_sphincsshake128fsimple", - "p256_mayo_1", - "p256_mayo_2", - "p384_mayo_3", + "p256_mayo1", + "p256_mayo2", + "p384_mayo3", NULL, }; ///// OQS_TEMPLATE_FRAGMENT_HYBRID_SIG_ALGS_END