Skip to content

Commit

Permalink
Update generate.yml and run generate.py
Browse files Browse the repository at this point in the history 
Signed-off-by: Pravek Sharma <[email protected]>
  • Loading branch information
@praveksharma
praveksharma committed Dec 7, 2024
1 parent 4c6f3ca commit f63421f
Show file tree
Hide file tree
Showing 11 changed files with 371 additions and 487 deletions.
79 changes: 34 additions & 45 deletions oqs-template/generate.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# 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, composite: 0x030B
# Composite KEM IDs arbitrarily chosen to start from 0x0300 arbitrarily; to be changed if non-conformant with existing conventions.
kems:
-
family: 'FrodoKEM'
Expand Down Expand Up @@ -167,31 +166,6 @@ kems:
hybrid_oid: '1.3.6.1.4.1.22554.5.8.1'
# code point not standardized: Why? XXX
nid: '0x2FB6'
composite: [{'name': 'p256',
'pretty_name': 'ECDH p256',
'oid': '2.16.840.1.114027.80.8.1.1',
'nid': '0x0300',
'bit_security': 128},
{'name': 'bp256',
'pretty_name': 'ECDH brainpoolP256r1',
'oid': '2.16.840.1.114027.80.8.1.2',
'nid': '0x0301',
'bit_security': 128},
{'name': 'x25519',
'pretty_name': 'X25519',
'oid': '2.16.840.1.114027.80.8.1.3',
'nid': '0x0302',
'bit_security': 128},
{'name': 'rsa2048',
'pretty_name': 'RSA2048 OAEP',
'oid': '2.16.840.1.114027.80.8.1.13',
'nid': '0x0303',
'bit_security': 112},
{'name': 'rsa3072',
'pretty_name': 'RSA3072 OAEP',
'oid': '2.16.840.1.114027.80.8.1.4',
'nid': '0x0304',
'bit_security': 128}]
-
family: 'ML-KEM'
fips_standard: 1
Expand All @@ -216,21 +190,36 @@ kems:
# https://www.ietf.org/archive/id/draft-kwiatkowski-tls-ecdhe-mlkem-02.html#name-secp256r1mlkem768
nid: '0x11eb'
standard_name: "SecP256r1MLKEM768"
composite: [{'name': 'p256',
'pretty_name': 'ECDH p256',
'oid': '2.16.840.1.114027.80.8.1.5',
'nid': '0x0305',
composite: [{'name': 'rsa2048',
'pretty_name': 'RSA2048 OAEP',
'oid': '2.16.840.1.114027.80.5.2.1.21',
'nid': '0x0300',
'bit_security': 112},
{'name': 'rsa3072',
'pretty_name': 'RSA3072 OAEP',
'oid': '2.16.840.1.114027.80.5.2.1.22',
'nid': '0x0301',
'bit_security': 128},
{'name': 'bp256',
'pretty_name': 'ECDH brainpoolP256r1',
'oid': '2.16.840.1.114027.80.8.1.6',
'nid': '0x0306',
'bit_security': 192},
{'name': 'x25519',
{'name': 'rsa4096',
'pretty_name': 'RSA4096 OAEP',
'oid': '2.16.840.1.114027.80.5.2.1.23',
'nid': '0x0302',
'bit_security': 140},
{'name': 'x25519',
'pretty_name': 'X25519',
'oid': '2.16.840.1.114027.80.8.1.7',
'nid': '0x0307',
'bit_security': 128}]
'oid': '2.16.840.1.114027.80.5.2.1.24',
'nid': '0x0303',
'bit_security': 128},
{'name': 'p384',
'pretty_name': 'ECDH p384',
'oid': '2.16.840.1.114027.80.5.2.1.25',
'nid': '0x0304',
'bit_security': 192},
{'name': 'bp256',
'pretty_name': 'ECDH brainpoolP256r1',
'oid': '2.16.840.1.114027.80.5.2.1.26',
'nid': '0x0305',
'bit_security': 128},]
-
family: 'ML-KEM'
fips_standard: 1
Expand All @@ -254,18 +243,18 @@ kems:
nid: '0x2F4E'
composite: [{'name': 'p384',
'pretty_name': 'ECDH p384',
'oid': '2.16.840.1.114027.80.8.1.8',
'nid': '0x0308',
'oid': '2.16.840.1.114027.80.5.2.1.27',
'nid': '0x0306',
'bit_security': 192},
{'name': 'bp384',
'pretty_name': 'ECDH brainpoolP384r1',
'oid': '2.16.840.1.114027.80.8.1.9',
'nid': '0x0309',
'oid': '2.16.840.1.114027.80.5.2.1.28',
'nid': '0x0307',
'bit_security': 256},
{'name': 'x448',
'pretty_name': 'X448',
'oid': '2.16.840.1.114027.80.8.1.10',
'nid': '0x030A',
'oid': '2.16.840.1.114027.80.5.2.1.29',
'nid': '0x0308',
'bit_security': 192}]
-
family: 'BIKE'
Expand Down
31 changes: 13 additions & 18 deletions oqsprov/oqs_decode_der2key.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -615,20 +615,6 @@ MAKE_DECODER(_ecp, "p256_mlkem512", p256_mlkem512, oqsx, SubjectPublicKeyInfo);
MAKE_DECODER(_ecx, "x25519_mlkem512", x25519_mlkem512, oqsx, PrivateKeyInfo);
MAKE_DECODER(_ecx, "x25519_mlkem512", x25519_mlkem512, oqsx,
SubjectPublicKeyInfo);
MAKE_DECODER(_cmp, "mlkem512_p256", mlkem512_p256, oqsx, PrivateKeyInfo);
MAKE_DECODER(_cmp, "mlkem512_p256", mlkem512_p256, oqsx, SubjectPublicKeyInfo);
MAKE_DECODER(_cmp, "mlkem512_bp256", mlkem512_bp256, oqsx, PrivateKeyInfo);
MAKE_DECODER(_cmp, "mlkem512_bp256", mlkem512_bp256, oqsx,
SubjectPublicKeyInfo);
MAKE_DECODER(_cmp, "mlkem512_x25519", mlkem512_x25519, oqsx, PrivateKeyInfo);
MAKE_DECODER(_cmp, "mlkem512_x25519", mlkem512_x25519, oqsx,
SubjectPublicKeyInfo);
MAKE_DECODER(_cmp, "mlkem512_rsa2048", mlkem512_rsa2048, oqsx, PrivateKeyInfo);
MAKE_DECODER(_cmp, "mlkem512_rsa2048", mlkem512_rsa2048, oqsx,
SubjectPublicKeyInfo);
MAKE_DECODER(_cmp, "mlkem512_rsa3072", mlkem512_rsa3072, oqsx, PrivateKeyInfo);
MAKE_DECODER(_cmp, "mlkem512_rsa3072", mlkem512_rsa3072, oqsx,
SubjectPublicKeyInfo);
MAKE_DECODER(, "mlkem768", mlkem768, oqsx, PrivateKeyInfo);
MAKE_DECODER(, "mlkem768", mlkem768, oqsx, SubjectPublicKeyInfo);

Expand All @@ -643,14 +629,23 @@ MAKE_DECODER(_ecp, "SecP256r1MLKEM768", SecP256r1MLKEM768, oqsx,
PrivateKeyInfo);
MAKE_DECODER(_ecp, "SecP256r1MLKEM768", SecP256r1MLKEM768, oqsx,
SubjectPublicKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_p256", mlkem768_p256, oqsx, PrivateKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_p256", mlkem768_p256, oqsx, SubjectPublicKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_bp256", mlkem768_bp256, oqsx, PrivateKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_bp256", mlkem768_bp256, oqsx,
MAKE_DECODER(_cmp, "mlkem768_rsa2048", mlkem768_rsa2048, oqsx, PrivateKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_rsa2048", mlkem768_rsa2048, oqsx,
SubjectPublicKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_rsa3072", mlkem768_rsa3072, oqsx, PrivateKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_rsa3072", mlkem768_rsa3072, oqsx,
SubjectPublicKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_rsa4096", mlkem768_rsa4096, oqsx, PrivateKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_rsa4096", mlkem768_rsa4096, oqsx,
SubjectPublicKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_x25519", mlkem768_x25519, oqsx, PrivateKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_x25519", mlkem768_x25519, oqsx,
SubjectPublicKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_p384", mlkem768_p384, oqsx, PrivateKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_p384", mlkem768_p384, oqsx, SubjectPublicKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_bp256", mlkem768_bp256, oqsx, PrivateKeyInfo);
MAKE_DECODER(_cmp, "mlkem768_bp256", mlkem768_bp256, oqsx,
SubjectPublicKeyInfo);
MAKE_DECODER(, "mlkem1024", mlkem1024, oqsx, PrivateKeyInfo);
MAKE_DECODER(, "mlkem1024", mlkem1024, oqsx, SubjectPublicKeyInfo);

Expand Down
120 changes: 50 additions & 70 deletions oqsprov/oqs_encode_key2any.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1002,21 +1002,6 @@ static int oqsx_pki_priv_to_der(const void *vxkey, unsigned char **pder) {
#define x25519_mlkem512_input_type "x25519_mlkem512"
#define x25519_mlkem512_pem_type "x25519_mlkem512"

#define mlkem512_p256_evp_type 0
#define mlkem512_p256_input_type "mlkem512_p256"
#define mlkem512_p256_pem_type "mlkem512_p256"
#define mlkem512_bp256_evp_type 0
#define mlkem512_bp256_input_type "mlkem512_bp256"
#define mlkem512_bp256_pem_type "mlkem512_bp256"
#define mlkem512_x25519_evp_type 0
#define mlkem512_x25519_input_type "mlkem512_x25519"
#define mlkem512_x25519_pem_type "mlkem512_x25519"
#define mlkem512_rsa2048_evp_type 0
#define mlkem512_rsa2048_input_type "mlkem512_rsa2048"
#define mlkem512_rsa2048_pem_type "mlkem512_rsa2048"
#define mlkem512_rsa3072_evp_type 0
#define mlkem512_rsa3072_input_type "mlkem512_rsa3072"
#define mlkem512_rsa3072_pem_type "mlkem512_rsa3072"
#define mlkem768_evp_type 0
#define mlkem768_input_type "mlkem768"
#define mlkem768_pem_type "mlkem768"
Expand All @@ -1034,15 +1019,24 @@ static int oqsx_pki_priv_to_der(const void *vxkey, unsigned char **pder) {
#define SecP256r1MLKEM768_input_type "SecP256r1MLKEM768"
#define SecP256r1MLKEM768_pem_type "SecP256r1MLKEM768"

#define mlkem768_p256_evp_type 0
#define mlkem768_p256_input_type "mlkem768_p256"
#define mlkem768_p256_pem_type "mlkem768_p256"
#define mlkem768_bp256_evp_type 0
#define mlkem768_bp256_input_type "mlkem768_bp256"
#define mlkem768_bp256_pem_type "mlkem768_bp256"
#define mlkem768_rsa2048_evp_type 0
#define mlkem768_rsa2048_input_type "mlkem768_rsa2048"
#define mlkem768_rsa2048_pem_type "mlkem768_rsa2048"
#define mlkem768_rsa3072_evp_type 0
#define mlkem768_rsa3072_input_type "mlkem768_rsa3072"
#define mlkem768_rsa3072_pem_type "mlkem768_rsa3072"
#define mlkem768_rsa4096_evp_type 0
#define mlkem768_rsa4096_input_type "mlkem768_rsa4096"
#define mlkem768_rsa4096_pem_type "mlkem768_rsa4096"
#define mlkem768_x25519_evp_type 0
#define mlkem768_x25519_input_type "mlkem768_x25519"
#define mlkem768_x25519_pem_type "mlkem768_x25519"
#define mlkem768_p384_evp_type 0
#define mlkem768_p384_input_type "mlkem768_p384"
#define mlkem768_p384_pem_type "mlkem768_p384"
#define mlkem768_bp256_evp_type 0
#define mlkem768_bp256_input_type "mlkem768_bp256"
#define mlkem768_bp256_pem_type "mlkem768_bp256"
#define mlkem1024_evp_type 0
#define mlkem1024_input_type "mlkem1024"
#define mlkem1024_pem_type "mlkem1024"
Expand Down Expand Up @@ -2158,41 +2152,6 @@ MAKE_ENCODER(_ecx, x25519_mlkem512, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_ecx, x25519_mlkem512, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_ecx, x25519_mlkem512, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_ecx, x25519_mlkem512);
MAKE_ENCODER(_cmp, mlkem512_p256, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_p256, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem512_p256, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_p256, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem512_p256, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_p256, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_cmp, mlkem512_p256);
MAKE_ENCODER(_cmp, mlkem512_bp256, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_bp256, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem512_bp256, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_bp256, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem512_bp256, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_bp256, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_cmp, mlkem512_bp256);
MAKE_ENCODER(_cmp, mlkem512_x25519, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_x25519, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem512_x25519, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_x25519, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem512_x25519, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_x25519, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_cmp, mlkem512_x25519);
MAKE_ENCODER(_cmp, mlkem512_rsa2048, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_rsa2048, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem512_rsa2048, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_rsa2048, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem512_rsa2048, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_rsa2048, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_cmp, mlkem512_rsa2048);
MAKE_ENCODER(_cmp, mlkem512_rsa3072, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_rsa3072, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem512_rsa3072, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_rsa3072, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem512_rsa3072, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem512_rsa3072, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_cmp, mlkem512_rsa3072);
MAKE_ENCODER(, mlkem768, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(, mlkem768, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(, mlkem768, oqsx, PrivateKeyInfo, der);
Expand Down Expand Up @@ -2229,27 +2188,48 @@ MAKE_ENCODER(_ecp, SecP256r1MLKEM768, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_ecp, SecP256r1MLKEM768, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_ecp, SecP256r1MLKEM768, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_ecp, SecP256r1MLKEM768);
MAKE_ENCODER(_cmp, mlkem768_p256, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_p256, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_p256, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_p256, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_p256, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_p256, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_cmp, mlkem768_p256);
MAKE_ENCODER(_cmp, mlkem768_bp256, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_bp256, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_bp256, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_bp256, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_bp256, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_bp256, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_cmp, mlkem768_bp256);
MAKE_ENCODER(_cmp, mlkem768_rsa2048, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_rsa2048, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_rsa2048, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_rsa2048, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_rsa2048, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_rsa2048, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_cmp, mlkem768_rsa2048);
MAKE_ENCODER(_cmp, mlkem768_rsa3072, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_rsa3072, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_rsa3072, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_rsa3072, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_rsa3072, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_rsa3072, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_cmp, mlkem768_rsa3072);
MAKE_ENCODER(_cmp, mlkem768_rsa4096, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_rsa4096, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_rsa4096, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_rsa4096, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_rsa4096, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_rsa4096, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_cmp, mlkem768_rsa4096);
MAKE_ENCODER(_cmp, mlkem768_x25519, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_x25519, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_x25519, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_x25519, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_x25519, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_x25519, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_cmp, mlkem768_x25519);
MAKE_ENCODER(_cmp, mlkem768_p384, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_p384, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_p384, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_p384, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_p384, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_p384, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_cmp, mlkem768_p384);
MAKE_ENCODER(_cmp, mlkem768_bp256, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_bp256, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_bp256, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_bp256, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_cmp, mlkem768_bp256, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_cmp, mlkem768_bp256, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_cmp, mlkem768_bp256);
MAKE_ENCODER(, mlkem1024, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(, mlkem1024, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(, mlkem1024, oqsx, PrivateKeyInfo, der);
Expand Down
12 changes: 5 additions & 7 deletions oqsprov/oqs_kmgmt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1547,11 +1547,6 @@ MAKE_KEM_KEYMGMT_FUNCTIONS(mlkem512, OQS_KEM_alg_ml_kem_512, 128)
MAKE_KEM_ECP_KEYMGMT_FUNCTIONS(p256_mlkem512, OQS_KEM_alg_ml_kem_512, 128)

MAKE_KEM_ECX_KEYMGMT_FUNCTIONS(x25519_mlkem512, OQS_KEM_alg_ml_kem_512, 128, 1)
MAKE_KEM_CMP_KEYMGMT_FUNCTIONS(mlkem512_p256, OQS_KEM_alg_ml_kem_512, 128)
MAKE_KEM_CMP_KEYMGMT_FUNCTIONS(mlkem512_bp256, OQS_KEM_alg_ml_kem_512, 128)
MAKE_KEM_CMP_KEYMGMT_FUNCTIONS(mlkem512_x25519, OQS_KEM_alg_ml_kem_512, 128)
MAKE_KEM_CMP_KEYMGMT_FUNCTIONS(mlkem512_rsa2048, OQS_KEM_alg_ml_kem_512, 112)
MAKE_KEM_CMP_KEYMGMT_FUNCTIONS(mlkem512_rsa3072, OQS_KEM_alg_ml_kem_512, 128)
MAKE_KEM_KEYMGMT_FUNCTIONS(mlkem768, OQS_KEM_alg_ml_kem_768, 192)

MAKE_KEM_ECP_KEYMGMT_FUNCTIONS(p384_mlkem768, OQS_KEM_alg_ml_kem_768, 192)
Expand All @@ -1560,9 +1555,12 @@ MAKE_KEM_ECX_KEYMGMT_FUNCTIONS(x448_mlkem768, OQS_KEM_alg_ml_kem_768, 192, 1)

MAKE_KEM_ECX_KEYMGMT_FUNCTIONS(X25519MLKEM768, OQS_KEM_alg_ml_kem_768, 128, 1)
MAKE_KEM_ECP_KEYMGMT_FUNCTIONS(SecP256r1MLKEM768, OQS_KEM_alg_ml_kem_768, 128)
MAKE_KEM_CMP_KEYMGMT_FUNCTIONS(mlkem768_p256, OQS_KEM_alg_ml_kem_768, 128)
MAKE_KEM_CMP_KEYMGMT_FUNCTIONS(mlkem768_bp256, OQS_KEM_alg_ml_kem_768, 192)
MAKE_KEM_CMP_KEYMGMT_FUNCTIONS(mlkem768_rsa2048, OQS_KEM_alg_ml_kem_768, 112)
MAKE_KEM_CMP_KEYMGMT_FUNCTIONS(mlkem768_rsa3072, OQS_KEM_alg_ml_kem_768, 128)
MAKE_KEM_CMP_KEYMGMT_FUNCTIONS(mlkem768_rsa4096, OQS_KEM_alg_ml_kem_768, 140)
MAKE_KEM_CMP_KEYMGMT_FUNCTIONS(mlkem768_x25519, OQS_KEM_alg_ml_kem_768, 128)
MAKE_KEM_CMP_KEYMGMT_FUNCTIONS(mlkem768_p384, OQS_KEM_alg_ml_kem_768, 192)
MAKE_KEM_CMP_KEYMGMT_FUNCTIONS(mlkem768_bp256, OQS_KEM_alg_ml_kem_768, 128)
MAKE_KEM_KEYMGMT_FUNCTIONS(mlkem1024, OQS_KEM_alg_ml_kem_1024, 256)

MAKE_KEM_ECP_KEYMGMT_FUNCTIONS(p521_mlkem1024, OQS_KEM_alg_ml_kem_1024, 256)
Expand Down
Loading

0 comments on commit f63421f

Please sign in to comment.