Skip to content

Commit

Permalink
Ran ./oqs-template/generate.sh
Browse files Browse the repository at this point in the history 
Signed-off-by: Pravek Sharma <sharmapravek@gmail.com>
  • Loading branch information
@praveksharma
praveksharma committed Sep 20, 2024
1 parent 3f8eadc commit ae5251b
Show file tree
Hide file tree
Showing 11 changed files with 1,616 additions and 1,039 deletions.
4 changes: 2 additions & 2 deletions ALGORITHMS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ As standardization for these algorithms within TLS is not done, all TLS code poi
| mlkem768 | 0x0768 | Yes | OQS_CODEPOINT_MLKEM768 |
| p384_mlkem768 | 0x2F4C | Yes | OQS_CODEPOINT_P384_MLKEM768 |
| x448_mlkem768 | 0x2FB7 | Yes | OQS_CODEPOINT_X448_MLKEM768 |
| x25519_mlkem768 | 0x11ec | Yes | OQS_CODEPOINT_X25519_MLKEM768 |
| X25519MLKEM768 | 0x11ec | Yes | OQS_CODEPOINT_X25519MLKEM768 |
| p256_mlkem768 | 4587 | Yes | OQS_CODEPOINT_P256_MLKEM768 |
| mlkem1024 | 0x1024 | Yes | OQS_CODEPOINT_MLKEM1024 |
| p521_mlkem1024 | 0x2F4D | Yes | OQS_CODEPOINT_P521_MLKEM1024 |
Expand Down Expand Up @@ -260,7 +260,7 @@ If [OQS_KEM_ENCODERS](CONFIGURE.md#OQS_KEM_ENCODERS) is enabled the following li
| mlkem768 | 2.16.840.1.101.3.4.4.2 | OQS_OID_MLKEM768
| p384_mlkem768 | 1.3.9999.99.75 | OQS_OID_P384_MLKEM768
| x448_mlkem768 | 1.3.9999.99.53 | OQS_OID_X448_MLKEM768
| x25519_mlkem768 | 1.3.9999.99.54 | OQS_OID_X25519_MLKEM768
| X25519MLKEM768 | 1.3.9999.99.54 | OQS_OID_X25519MLKEM768
| p256_mlkem768 | 1.3.9999.99.55 | OQS_OID_P256_MLKEM768
| mlkem1024 | 2.16.840.1.101.3.4.4.3 | OQS_OID_MLKEM1024
| p521_mlkem1024 | 1.3.9999.99.76 | OQS_OID_P521_MLKEM1024
Expand Down
4 changes: 2 additions & 2 deletions oqsprov/oqs_decode_der2key.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,8 +622,8 @@ MAKE_DECODER(_ecp, "p384_mlkem768", p384_mlkem768, oqsx, PrivateKeyInfo);
MAKE_DECODER(_ecp, "p384_mlkem768", p384_mlkem768, oqsx, SubjectPublicKeyInfo);
MAKE_DECODER(_ecx, "x448_mlkem768", x448_mlkem768, oqsx, PrivateKeyInfo);
MAKE_DECODER(_ecx, "x448_mlkem768", x448_mlkem768, oqsx, SubjectPublicKeyInfo);
MAKE_DECODER(_ecx, "x25519_mlkem768", x25519_mlkem768, oqsx, PrivateKeyInfo);
MAKE_DECODER(_ecx, "x25519_mlkem768", x25519_mlkem768, oqsx,
MAKE_DECODER(_ecx, "X25519MLKEM768", X25519MLKEM768, oqsx, PrivateKeyInfo);
MAKE_DECODER(_ecx, "X25519MLKEM768", X25519MLKEM768, oqsx,
SubjectPublicKeyInfo);
MAKE_DECODER(_ecp, "p256_mlkem768", p256_mlkem768, oqsx, PrivateKeyInfo);
MAKE_DECODER(_ecp, "p256_mlkem768", p256_mlkem768, oqsx, SubjectPublicKeyInfo);
Expand Down
20 changes: 10 additions & 10 deletions oqsprov/oqs_encode_key2any.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -995,9 +995,9 @@ static int oqsx_pki_priv_to_der(const void *vxkey, unsigned char **pder) {
#define x448_mlkem768_evp_type 0
#define x448_mlkem768_input_type "x448_mlkem768"
#define x448_mlkem768_pem_type "x448_mlkem768"
#define x25519_mlkem768_evp_type 0
#define x25519_mlkem768_input_type "x25519_mlkem768"
#define x25519_mlkem768_pem_type "x25519_mlkem768"
#define X25519MLKEM768_evp_type 0
#define X25519MLKEM768_input_type "X25519MLKEM768"
#define X25519MLKEM768_pem_type "X25519MLKEM768"
#define p256_mlkem768_evp_type 0
#define p256_mlkem768_input_type "p256_mlkem768"
#define p256_mlkem768_pem_type "p256_mlkem768"
Expand Down Expand Up @@ -2116,13 +2116,13 @@ MAKE_ENCODER(_ecx, x448_mlkem768, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_ecx, x448_mlkem768, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_ecx, x448_mlkem768, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_ecx, x448_mlkem768);
MAKE_ENCODER(_ecx, x25519_mlkem768, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_ecx, x25519_mlkem768, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_ecx, x25519_mlkem768, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_ecx, x25519_mlkem768, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_ecx, x25519_mlkem768, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_ecx, x25519_mlkem768, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_ecx, x25519_mlkem768);
MAKE_ENCODER(_ecx, X25519MLKEM768, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_ecx, X25519MLKEM768, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_ecx, X25519MLKEM768, oqsx, PrivateKeyInfo, der);
MAKE_ENCODER(_ecx, X25519MLKEM768, oqsx, PrivateKeyInfo, pem);
MAKE_ENCODER(_ecx, X25519MLKEM768, oqsx, SubjectPublicKeyInfo, der);
MAKE_ENCODER(_ecx, X25519MLKEM768, oqsx, SubjectPublicKeyInfo, pem);
MAKE_TEXT_ENCODER(_ecx, X25519MLKEM768);
MAKE_ENCODER(_ecp, p256_mlkem768, oqsx, EncryptedPrivateKeyInfo, der);
MAKE_ENCODER(_ecp, p256_mlkem768, oqsx, EncryptedPrivateKeyInfo, pem);
MAKE_ENCODER(_ecp, p256_mlkem768, oqsx, PrivateKeyInfo, der);
Expand Down
2 changes: 1 addition & 1 deletion oqsprov/oqs_kmgmt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1503,7 +1503,7 @@ MAKE_KEM_ECP_KEYMGMT_FUNCTIONS(p384_mlkem768, OQS_KEM_alg_ml_kem_768, 192)

MAKE_KEM_ECX_KEYMGMT_FUNCTIONS(x448_mlkem768, OQS_KEM_alg_ml_kem_768, 192, 1)

MAKE_KEM_ECX_KEYMGMT_FUNCTIONS(x25519_mlkem768, OQS_KEM_alg_ml_kem_768, 128, 1)
MAKE_KEM_ECX_KEYMGMT_FUNCTIONS(X25519MLKEM768, OQS_KEM_alg_ml_kem_768, 128, 1)
MAKE_KEM_ECP_KEYMGMT_FUNCTIONS(p256_mlkem768, OQS_KEM_alg_ml_kem_768, 128)
MAKE_KEM_KEYMGMT_FUNCTIONS(mlkem1024, OQS_KEM_alg_ml_kem_1024, 256)

Expand Down
20 changes: 10 additions & 10 deletions oqsprov/oqs_prov.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -807,22 +807,22 @@ extern const OSSL_DISPATCH
extern const OSSL_DISPATCH
oqs_SubjectPublicKeyInfo_der_to_x448_mlkem768_decoder_functions[];
extern const OSSL_DISPATCH
oqs_x25519_mlkem768_to_PrivateKeyInfo_der_encoder_functions[];
oqs_X25519MLKEM768_to_PrivateKeyInfo_der_encoder_functions[];
extern const OSSL_DISPATCH
oqs_x25519_mlkem768_to_PrivateKeyInfo_pem_encoder_functions[];
oqs_X25519MLKEM768_to_PrivateKeyInfo_pem_encoder_functions[];
extern const OSSL_DISPATCH
oqs_x25519_mlkem768_to_EncryptedPrivateKeyInfo_der_encoder_functions[];
oqs_X25519MLKEM768_to_EncryptedPrivateKeyInfo_der_encoder_functions[];
extern const OSSL_DISPATCH
oqs_x25519_mlkem768_to_EncryptedPrivateKeyInfo_pem_encoder_functions[];
oqs_X25519MLKEM768_to_EncryptedPrivateKeyInfo_pem_encoder_functions[];
extern const OSSL_DISPATCH
oqs_x25519_mlkem768_to_SubjectPublicKeyInfo_der_encoder_functions[];
oqs_X25519MLKEM768_to_SubjectPublicKeyInfo_der_encoder_functions[];
extern const OSSL_DISPATCH
oqs_x25519_mlkem768_to_SubjectPublicKeyInfo_pem_encoder_functions[];
extern const OSSL_DISPATCH oqs_x25519_mlkem768_to_text_encoder_functions[];
oqs_X25519MLKEM768_to_SubjectPublicKeyInfo_pem_encoder_functions[];
extern const OSSL_DISPATCH oqs_X25519MLKEM768_to_text_encoder_functions[];
extern const OSSL_DISPATCH
oqs_PrivateKeyInfo_der_to_x25519_mlkem768_decoder_functions[];
oqs_PrivateKeyInfo_der_to_X25519MLKEM768_decoder_functions[];
extern const OSSL_DISPATCH
oqs_SubjectPublicKeyInfo_der_to_x25519_mlkem768_decoder_functions[];
oqs_SubjectPublicKeyInfo_der_to_X25519MLKEM768_decoder_functions[];
extern const OSSL_DISPATCH
oqs_p256_mlkem768_to_PrivateKeyInfo_der_encoder_functions[];
extern const OSSL_DISPATCH
Expand Down Expand Up @@ -2257,7 +2257,7 @@ extern const OSSL_DISPATCH oqs_mlkem768_keymgmt_functions[];

extern const OSSL_DISPATCH oqs_ecp_p384_mlkem768_keymgmt_functions[];
extern const OSSL_DISPATCH oqs_ecx_x448_mlkem768_keymgmt_functions[];
extern const OSSL_DISPATCH oqs_ecx_x25519_mlkem768_keymgmt_functions[];
extern const OSSL_DISPATCH oqs_ecx_X25519MLKEM768_keymgmt_functions[];
extern const OSSL_DISPATCH oqs_ecp_p256_mlkem768_keymgmt_functions[];
extern const OSSL_DISPATCH oqs_mlkem1024_keymgmt_functions[];

Expand Down
Loading

0 comments on commit ae5251b

Please sign in to comment.