Skip to content

Commit

Permalink
naming update
Browse files Browse the repository at this point in the history 
Signed-off-by: Basil Hess <[email protected]>
  • Loading branch information
@bhess
bhess committed Jul 12, 2024
1 parent 6c33846 commit 24a1842
Show file tree
Hide file tree
Showing 16 changed files with 311 additions and 321 deletions.
24 changes: 12 additions & 12 deletions ALGORITHMS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
<!--- OQS_TEMPLATE_FRAGMENT_IDS_END -->

Changing code points
Expand Down Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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`\*

<!--- OQS_TEMPLATE_FRAGMENT_ALGS_END -->

Expand Down
12 changes: 6 additions & 6 deletions oqs-template/generate.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand Down
12 changes: 6 additions & 6 deletions oqs-template/oqs-sig-info.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
24 changes: 12 additions & 12 deletions oqsprov/oqs_decode_der2key.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
120 changes: 60 additions & 60 deletions oqsprov/oqs_encode_key2any.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

/* ---------------------------------------------------------------------- */
Expand Down Expand Up @@ -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
Loading

0 comments on commit 24a1842

Please sign in to comment.