Skip to content

All combinations #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
feventura wants to merge 30 commits into
base: upstream
Choose a base branch
from
Open

All combinations #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0dd3c0b
Attempt to use the autogeneration scripts
feventura Aug 15, 2025
37262ed
Merge branch 'master' of github.com:feventura/openssl
feventura Aug 15, 2025
1b16dcb
Merge branch 'openssl:master' into master
feventura Aug 19, 2025
18938bb
Merge branch 'openssl:master' into master
feventura Aug 20, 2025
bd0e7f2
Merge branch 'openssl:master' into master
feventura Aug 21, 2025
25c0521
Merge branch 'openssl:master' into master
feventura Sep 12, 2025
872497b
Merge branch 'openssl:master' into master
feventura May 26, 2026
d80cab6
add implementation for composite keys (kmgmt and encoding/decoding
feventura May 29, 2026
30f62af
Merge branch 'openssl:master' into master
feventura May 29, 2026
bc471f3
Adding composite signatures
feventura Jun 4, 2026
665b8eb
Merge branch 'openssl:master' into master
feventura Jun 4, 2026
82ad38a
fixed wrong label implementation
feventura Jun 4, 2026
51ceaaf
Merge branch 'master' of github.com:feventura/openssl
feventura Jun 4, 2026
ab64ed0
Fixed Signature Implementation
feventura Jun 5, 2026
0901351
removed unused param_names
feventura Jun 5, 2026
e1863ff
Merge branch 'openssl:master' into main
feventura Jun 9, 2026
ccbd5f7
Used the pre-commit to utilize openssl's clang-format
feventura Jun 12, 2026
adef6d6
Merge branch 'main' of github.com:feventura/openssl
feventura Jun 12, 2026
8257867
Fixed clang format
feventura Jun 12, 2026
fa83314
fixed more compiler errors and removed file that was auto-generated
feventura Jun 12, 2026
b47b958
added composite.h dependencies in build.info
feventura Jun 12, 2026
94ba1ff
Merge pull request #2 from feventura/upstream
feventura Jun 12, 2026
b1ac65f
Added missing wiring for composites
feventura Jun 15, 2026
8a324bd
Removed auto-generated files
feventura Jun 15, 2026
5eb7b89
Fixed casting issue
feventura Jun 16, 2026
884d416
Merge pull request #3 from feventura/upstream
feventura Jun 16, 2026
bfefc89
Added checks for composite decode to ensure only composites are used …
feventura Jun 16, 2026
1417eff
Removed trailing space
feventura Jun 16, 2026
314e5b3
Added better description to CHANGES.md and fixed copyright comment at…
feventura Jun 16, 2026
c2593a3
Merge branch 'upstream' into main
feventura Jul 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ providers/common/der/der_rsa_gen.c
providers/common/der/der_wrap_gen.c
providers/common/der/der_sm2_gen.c
providers/common/der/der_ml_dsa_gen.c
providers/common/der/der_composite_gen.c
providers/common/der/der_hkdf_gen.c
providers/common/include/prov/der_slh_dsa.h
providers/common/include/prov/der_dsa.h
Expand Down Expand Up @@ -137,7 +138,9 @@ providers/implementations/keymgmt/ml_dsa_kmgmt.inc
providers/implementations/keymgmt/ml_kem_kmgmt.inc
providers/implementations/keymgmt/mlx_kmgmt.inc
providers/implementations/keymgmt/slh_dsa_kmgmt.inc
providers/implementations/keymgmt/composite_kmgmt.inc
providers/implementations/keymgmt/template_kmgmt.inc
providers/implementations/signature/composite_sig.inc
providers/implementations/signature/eddsa_sig.inc
providers/implementations/signature/mac_legacy_sig.inc
providers/implementations/signature/ml_dsa_sig.inc
Expand Down
15 changes: 15 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,21 @@ OpenSSL Releases

### Changes between 4.0 and 4.1 [xx XXX xxxx]

* Added 18 composite post-quantum signature algorithms combining ML-DSA with a
classical algorithm (RSA, ECDSA, or EdDSA), as defined in
[draft-ietf-lamps-pq-composite-sigs](https://datatracker.ietf.org/doc/draft-ietf-lamps-pq-composite-sigs):
id-MLDSA44-RSA2048-PSS-SHA256, id-MLDSA44-RSA2048-PKCS15-SHA256,
id-MLDSA44-Ed25519-SHA512, id-MLDSA44-ECDSA-P256-SHA256,
id-MLDSA65-RSA3072-PSS-SHA512, id-MLDSA65-RSA3072-PKCS15-SHA512,
id-MLDSA65-RSA4096-PSS-SHA512, id-MLDSA65-RSA4096-PKCS15-SHA512,
id-MLDSA65-ECDSA-P256-SHA512, id-MLDSA65-ECDSA-P384-SHA512,
id-MLDSA65-ECDSA-brainpoolP256r1-SHA512, id-MLDSA65-Ed25519-SHA512,
id-MLDSA87-ECDSA-P384-SHA512, id-MLDSA87-ECDSA-brainpoolP384r1-SHA512,
id-MLDSA87-Ed448-SHAKE256, id-MLDSA87-RSA3072-PSS-SHA512,
id-MLDSA87-RSA4096-PSS-SHA512, id-MLDSA87-ECDSA-P521-SHA512.
These algorithms are available in the default provider only.

*Felipe Ventura*
* Added AVX512 optimized SHAKE x4 operations for ML-DSA on x86_64.

*Marcel Cornu and Tomasz Kantecki*
Expand Down
4 changes: 3 additions & 1 deletion Configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@ my @disablables_algorithms = (
"mdc2",
"ml-dsa",
"ml-kem",
"composite",
"lms",
"ocb",
"poly1305",
Expand Down Expand Up @@ -674,7 +675,7 @@ my @disable_cascades = (
"ec", "ech",
"filenames", "hmac-drbg-kdf",
"idea", "ikev2kdf", "kbkdf", "krb5kdf", "ktls", "lms",
"md4", "ml-dsa", "ml-kem", "multiblock",
"md4", "ml-dsa", "ml-kem", "composite", "multiblock",
"nextprotoneg", "ocsp", "ocb", "poly1305", "psk",
"pvkkdf", "rc2", "rc4", "rmd160",
"scrypt", "seed", "siphash", "siv",
Expand All @@ -691,6 +692,7 @@ my @disable_cascades = (
"brotli" => [ "brotli-dynamic" ],
"zstd" => [ "zstd-dynamic" ],
"des" => [ "mdc2" ],
"ml-dsa" => [ "composite" ],
"deprecated" => [ "tls-deprecated-ec" ],
"ec" => [ qw(ec2m ec_explicit_curves sm2 gost ecx tls-deprecated-ec) ],
"dgram" => [ "dtls", "quic", "sctp" ],
Expand Down
8 changes: 8 additions & 0 deletions build.info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ DEPEND[]=include/openssl/asn1.h \
providers/implementations/keymgmt/ecx_kmgmt.inc \
providers/implementations/keymgmt/lms_kmgmt.inc \
providers/implementations/keymgmt/mac_legacy_kmgmt.inc \
providers/implementations/keymgmt/composite_kmgmt.inc \
providers/implementations/keymgmt/ml_dsa_kmgmt.inc \
providers/implementations/keymgmt/ml_kem_kmgmt.inc \
providers/implementations/keymgmt/mlx_kmgmt.inc \
Expand All @@ -94,6 +95,7 @@ DEPEND[]=include/openssl/asn1.h \
providers/implementations/signature/eddsa_sig.inc \
providers/implementations/signature/mac_legacy_sig.inc \
providers/implementations/signature/ml_dsa_sig.inc \
providers/implementations/signature/composite_sig.inc \
providers/implementations/signature/rsa_sig.inc \
providers/implementations/signature/slh_dsa_sig.inc \
providers/implementations/signature/sm2_sig.inc \
Expand Down Expand Up @@ -209,6 +211,7 @@ DEPEND[providers/implementations/asymciphers/rsa_enc.inc \
providers/implementations/keymgmt/ecx_kmgmt.inc \
providers/implementations/keymgmt/lms_kmgmt.inc \
providers/implementations/keymgmt/mac_legacy_kmgmt.inc \
providers/implementations/keymgmt/composite_kmgmt.inc \
providers/implementations/keymgmt/ml_dsa_kmgmt.inc \
providers/implementations/keymgmt/ml_kem_kmgmt.inc \
providers/implementations/keymgmt/mlx_kmgmt.inc \
Expand All @@ -219,6 +222,7 @@ DEPEND[providers/implementations/asymciphers/rsa_enc.inc \
providers/implementations/signature/eddsa_sig.inc \
providers/implementations/signature/mac_legacy_sig.inc \
providers/implementations/signature/ml_dsa_sig.inc \
providers/implementations/signature/composite_sig.inc \
providers/implementations/signature/rsa_sig.inc \
providers/implementations/signature/slh_dsa_sig.inc \
providers/implementations/signature/sm2_sig.inc \
Expand Down Expand Up @@ -342,6 +346,8 @@ GENERATE[providers/implementations/keymgmt/lms_kmgmt.inc]=\
providers/implementations/keymgmt/lms_kmgmt.inc.in
GENERATE[providers/implementations/keymgmt/mac_legacy_kmgmt.inc]=\
providers/implementations/keymgmt/mac_legacy_kmgmt.inc.in
GENERATE[providers/implementations/keymgmt/composite_kmgmt.inc]=\
providers/implementations/keymgmt/composite_kmgmt.inc.in
GENERATE[providers/implementations/keymgmt/ml_dsa_kmgmt.inc]=\
providers/implementations/keymgmt/ml_dsa_kmgmt.inc.in
GENERATE[providers/implementations/keymgmt/ml_kem_kmgmt.inc]=\
Expand All @@ -362,6 +368,8 @@ GENERATE[providers/implementations/signature/mac_legacy_sig.inc]=\
providers/implementations/signature/mac_legacy_sig.inc.in
GENERATE[providers/implementations/signature/ml_dsa_sig.inc]=\
providers/implementations/signature/ml_dsa_sig.inc.in
GENERATE[providers/implementations/signature/composite_sig.inc]=\
providers/implementations/signature/composite_sig.inc.in
GENERATE[providers/implementations/signature/rsa_sig.inc]=\
providers/implementations/signature/rsa_sig.inc.in
GENERATE[providers/implementations/signature/slh_dsa_sig.inc]=\
Expand Down
100 changes: 95 additions & 5 deletions crypto/objects/obj_dat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <crypto/asn1.h>

/* Serialized OID's */
static const unsigned char so[9582] = {
static const unsigned char so[9726] = {
0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 0] OBJ_rsadsi */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 6] OBJ_pkcs */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x02, /* [ 13] OBJ_md2 */
Expand Down Expand Up @@ -1364,9 +1364,27 @@ static const unsigned char so[9582] = {
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x0D, /* [ 9549] OBJ_id_smime_ori */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x0D,0x03, /* [ 9559] OBJ_id_smime_ori_kem */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x11, /* [ 9570] OBJ_id_alg_hss_lms_hashsig */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x25, /* [ 9581] OBJ_ML_DSA_44_RSA2048_PSS_SHA256 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x26, /* [ 9589] OBJ_ML_DSA_44_RSA2048_PKCS15_SHA256 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x27, /* [ 9597] OBJ_ML_DSA_44_Ed25519_SHA512 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x28, /* [ 9605] OBJ_ML_DSA_44_ECDSA_P256_SHA256 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x29, /* [ 9613] OBJ_ML_DSA_65_RSA3072_PSS_SHA512 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x2A, /* [ 9621] OBJ_ML_DSA_65_RSA3072_PKCS15_SHA512 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x2B, /* [ 9629] OBJ_ML_DSA_65_RSA4096_PSS_SHA512 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x2C, /* [ 9637] OBJ_ML_DSA_65_RSA4096_PKCS15_SHA512 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x2D, /* [ 9645] OBJ_ML_DSA_65_ECDSA_P256_SHA512 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x2E, /* [ 9653] OBJ_ML_DSA_65_ECDSA_P384_SHA512 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x2F, /* [ 9661] OBJ_ML_DSA_65_ECDSA_brainpoolP256r1_SHA512 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x30, /* [ 9669] OBJ_ML_DSA_65_Ed25519_SHA512 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x31, /* [ 9677] OBJ_ML_DSA_87_ECDSA_P384_SHA512 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x32, /* [ 9685] OBJ_ML_DSA_87_ECDSA_brainpoolP384r1_SHA512 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x33, /* [ 9693] OBJ_ML_DSA_87_Ed448_SHAKE256 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x34, /* [ 9701] OBJ_ML_DSA_87_RSA3072_PSS_SHA512 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x35, /* [ 9709] OBJ_ML_DSA_87_RSA4096_PSS_SHA512 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x36, /* [ 9717] OBJ_ML_DSA_87_ECDSA_P521_SHA512 */
};

#define NUM_NID 1502
#define NUM_NID 1520
static const ASN1_OBJECT nid_objs[NUM_NID] = {
{"UNDEF", "undefined", NID_undef},
{"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
Expand Down Expand Up @@ -2870,9 +2888,27 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
{"id-smime-ori", "id-smime-ori", NID_id_smime_ori, 10, &so[9549]},
{"id-smime-ori-kem", "id-smime-ori-kem", NID_id_smime_ori_kem, 11, &so[9559]},
{"id-alg-hss-lms-hashsig", "id-alg-hss-lms-hashsig", NID_id_alg_hss_lms_hashsig, 11, &so[9570]},
{"id-mldsa44-rsa2048-pss-sha256", "ML-DSA-44-RSA2048-PSS-SHA256", NID_ML_DSA_44_RSA2048_PSS_SHA256, 8, &so[9581]},
{"id-mldsa44-rsa2048-pkcs15-sha256", "ML-DSA-44-RSA2048-PKCS15-SHA256", NID_ML_DSA_44_RSA2048_PKCS15_SHA256, 8, &so[9589]},
{"id-mldsa44-ed25519-sha512", "ML-DSA-44-Ed25519-SHA512", NID_ML_DSA_44_Ed25519_SHA512, 8, &so[9597]},
{"id-mldsa44-ecdsa-p256-sha256", "ML-DSA-44-ECDSA-P256-SHA256", NID_ML_DSA_44_ECDSA_P256_SHA256, 8, &so[9605]},
{"id-mldsa65-rsa3072-pss-sha512", "ML-DSA-65-RSA3072-PSS-SHA512", NID_ML_DSA_65_RSA3072_PSS_SHA512, 8, &so[9613]},
{"id-mldsa65-rsa3072-pkcs15-sha512", "ML-DSA-65-RSA3072-PKCS15-SHA512", NID_ML_DSA_65_RSA3072_PKCS15_SHA512, 8, &so[9621]},
{"id-mldsa65-rsa4096-pss-sha512", "ML-DSA-65-RSA4096-PSS-SHA512", NID_ML_DSA_65_RSA4096_PSS_SHA512, 8, &so[9629]},
{"id-mldsa65-rsa4096-pkcs15-sha512", "ML-DSA-65-RSA4096-PKCS15-SHA512", NID_ML_DSA_65_RSA4096_PKCS15_SHA512, 8, &so[9637]},
{"id-mldsa65-ecdsa-p256-sha512", "ML-DSA-65-ECDSA-P256-SHA512", NID_ML_DSA_65_ECDSA_P256_SHA512, 8, &so[9645]},
{"id-mldsa65-ecdsa-p384-sha512", "ML-DSA-65-ECDSA-P384-SHA512", NID_ML_DSA_65_ECDSA_P384_SHA512, 8, &so[9653]},
{"id-mldsa65-ecdsa-brainpoolP256r1-sha512", "ML-DSA-65-ECDSA-brainpoolP256r1-SHA512", NID_ML_DSA_65_ECDSA_brainpoolP256r1_SHA512, 8, &so[9661]},
{"id-mldsa65-ed25519-sha512", "ML-DSA-65-Ed25519-SHA512", NID_ML_DSA_65_Ed25519_SHA512, 8, &so[9669]},
{"id-mldsa87-ecdsa-p384-sha512", "ML-DSA-87-ECDSA-P384-SHA512", NID_ML_DSA_87_ECDSA_P384_SHA512, 8, &so[9677]},
{"id-mldsa87-ecdsa-brainpoolp384r1-sha512", "ML-DSA-87-ECDSA-brainpoolP384r1-SHA512", NID_ML_DSA_87_ECDSA_brainpoolP384r1_SHA512, 8, &so[9685]},
{"id-mldsa87-ed448-shake256", "ML-DSA-87-Ed448-SHAKE256", NID_ML_DSA_87_Ed448_SHAKE256, 8, &so[9693]},
{"id-mldsa87-rsa3072-pss-sha512", "ML-DSA-87-RSA3072-PSS-SHA512", NID_ML_DSA_87_RSA3072_PSS_SHA512, 8, &so[9701]},
{"id-mldsa87-rsa4096-pss-sha512", "ML-DSA-87-RSA4096-PSS-SHA512", NID_ML_DSA_87_RSA4096_PSS_SHA512, 8, &so[9709]},
{"id-mldsa87-ecdsa-p521-sha512", "ML-DSA-87-ECDSA-P521-SHA512", NID_ML_DSA_87_ECDSA_P521_SHA512, 8, &so[9717]},
};

#define NUM_SN 1493
#define NUM_SN 1511
static const unsigned int sn_objs[NUM_SN] = {
364, /* "AD_DVCS" */
419, /* "AES-128-CBC" */
Expand Down Expand Up @@ -3615,6 +3651,24 @@ static const unsigned int sn_objs[NUM_SN] = {
1457, /* "id-ml-dsa-44" */
1458, /* "id-ml-dsa-65" */
1459, /* "id-ml-dsa-87" */
1505, /* "id-mldsa44-ecdsa-p256-sha256" */
1504, /* "id-mldsa44-ed25519-sha512" */
1503, /* "id-mldsa44-rsa2048-pkcs15-sha256" */
1502, /* "id-mldsa44-rsa2048-pss-sha256" */
1512, /* "id-mldsa65-ecdsa-brainpoolP256r1-sha512" */
1510, /* "id-mldsa65-ecdsa-p256-sha512" */
1511, /* "id-mldsa65-ecdsa-p384-sha512" */
1513, /* "id-mldsa65-ed25519-sha512" */
1507, /* "id-mldsa65-rsa3072-pkcs15-sha512" */
1506, /* "id-mldsa65-rsa3072-pss-sha512" */
1509, /* "id-mldsa65-rsa4096-pkcs15-sha512" */
1508, /* "id-mldsa65-rsa4096-pss-sha512" */
1515, /* "id-mldsa87-ecdsa-brainpoolp384r1-sha512" */
1514, /* "id-mldsa87-ecdsa-p384-sha512" */
1519, /* "id-mldsa87-ecdsa-p521-sha512" */
1516, /* "id-mldsa87-ed448-shake256" */
1517, /* "id-mldsa87-rsa3072-pss-sha512" */
1518, /* "id-mldsa87-rsa4096-pss-sha512" */
280, /* "id-mod-attribute-cert" */
274, /* "id-mod-cmc" */
277, /* "id-mod-cmp" */
Expand Down Expand Up @@ -4369,7 +4423,7 @@ static const unsigned int sn_objs[NUM_SN] = {
1289, /* "zstd" */
};

#define NUM_LN 1493
#define NUM_LN 1511
static const unsigned int ln_objs[NUM_LN] = {
363, /* "AD Time Stamping" */
405, /* "ANSI X9.62" */
Expand Down Expand Up @@ -4530,8 +4584,26 @@ static const unsigned int ln_objs[NUM_LN] = {
142, /* "Invalidity Date" */
504, /* "MIME MHS" */
1457, /* "ML-DSA-44" */
1505, /* "ML-DSA-44-ECDSA-P256-SHA256" */
1504, /* "ML-DSA-44-Ed25519-SHA512" */
1503, /* "ML-DSA-44-RSA2048-PKCS15-SHA256" */
1502, /* "ML-DSA-44-RSA2048-PSS-SHA256" */
1458, /* "ML-DSA-65" */
1510, /* "ML-DSA-65-ECDSA-P256-SHA512" */
1511, /* "ML-DSA-65-ECDSA-P384-SHA512" */
1512, /* "ML-DSA-65-ECDSA-brainpoolP256r1-SHA512" */
1513, /* "ML-DSA-65-Ed25519-SHA512" */
1507, /* "ML-DSA-65-RSA3072-PKCS15-SHA512" */
1506, /* "ML-DSA-65-RSA3072-PSS-SHA512" */
1509, /* "ML-DSA-65-RSA4096-PKCS15-SHA512" */
1508, /* "ML-DSA-65-RSA4096-PSS-SHA512" */
1459, /* "ML-DSA-87" */
1514, /* "ML-DSA-87-ECDSA-P384-SHA512" */
1519, /* "ML-DSA-87-ECDSA-P521-SHA512" */
1515, /* "ML-DSA-87-ECDSA-brainpoolP384r1-SHA512" */
1516, /* "ML-DSA-87-Ed448-SHAKE256" */
1517, /* "ML-DSA-87-RSA3072-PSS-SHA512" */
1518, /* "ML-DSA-87-RSA4096-PSS-SHA512" */
1456, /* "ML-KEM-1024" */
1454, /* "ML-KEM-512" */
1455, /* "ML-KEM-768" */
Expand Down Expand Up @@ -5866,7 +5938,7 @@ static const unsigned int ln_objs[NUM_LN] = {
125, /* "zlib compression" */
};

#define NUM_OBJ 1350
#define NUM_OBJ 1368
static const unsigned int obj_objs[NUM_OBJ] = {
0, /* OBJ_undef 0 */
181, /* OBJ_iso 1 */
Expand Down Expand Up @@ -6695,6 +6767,24 @@ static const unsigned int obj_objs[NUM_OBJ] = {
324, /* OBJ_id_alg_noSignature 1 3 6 1 5 5 7 6 2 */
325, /* OBJ_id_alg_dh_sig_hmac_sha1 1 3 6 1 5 5 7 6 3 */
326, /* OBJ_id_alg_dh_pop 1 3 6 1 5 5 7 6 4 */
1502, /* OBJ_ML_DSA_44_RSA2048_PSS_SHA256 1 3 6 1 5 5 7 6 37 */
1503, /* OBJ_ML_DSA_44_RSA2048_PKCS15_SHA256 1 3 6 1 5 5 7 6 38 */
1504, /* OBJ_ML_DSA_44_Ed25519_SHA512 1 3 6 1 5 5 7 6 39 */
1505, /* OBJ_ML_DSA_44_ECDSA_P256_SHA256 1 3 6 1 5 5 7 6 40 */
1506, /* OBJ_ML_DSA_65_RSA3072_PSS_SHA512 1 3 6 1 5 5 7 6 41 */
1507, /* OBJ_ML_DSA_65_RSA3072_PKCS15_SHA512 1 3 6 1 5 5 7 6 42 */
1508, /* OBJ_ML_DSA_65_RSA4096_PSS_SHA512 1 3 6 1 5 5 7 6 43 */
1509, /* OBJ_ML_DSA_65_RSA4096_PKCS15_SHA512 1 3 6 1 5 5 7 6 44 */
1510, /* OBJ_ML_DSA_65_ECDSA_P256_SHA512 1 3 6 1 5 5 7 6 45 */
1511, /* OBJ_ML_DSA_65_ECDSA_P384_SHA512 1 3 6 1 5 5 7 6 46 */
1512, /* OBJ_ML_DSA_65_ECDSA_brainpoolP256r1_SHA512 1 3 6 1 5 5 7 6 47 */
1513, /* OBJ_ML_DSA_65_Ed25519_SHA512 1 3 6 1 5 5 7 6 48 */
1514, /* OBJ_ML_DSA_87_ECDSA_P384_SHA512 1 3 6 1 5 5 7 6 49 */
1515, /* OBJ_ML_DSA_87_ECDSA_brainpoolP384r1_SHA512 1 3 6 1 5 5 7 6 50 */
1516, /* OBJ_ML_DSA_87_Ed448_SHAKE256 1 3 6 1 5 5 7 6 51 */
1517, /* OBJ_ML_DSA_87_RSA3072_PSS_SHA512 1 3 6 1 5 5 7 6 52 */
1518, /* OBJ_ML_DSA_87_RSA4096_PSS_SHA512 1 3 6 1 5 5 7 6 53 */
1519, /* OBJ_ML_DSA_87_ECDSA_P521_SHA512 1 3 6 1 5 5 7 6 54 */
327, /* OBJ_id_cmc_statusInfo 1 3 6 1 5 5 7 7 1 */
328, /* OBJ_id_cmc_identification 1 3 6 1 5 5 7 7 2 */
329, /* OBJ_id_cmc_identityProof 1 3 6 1 5 5 7 7 3 */
Expand Down
18 changes: 18 additions & 0 deletions crypto/objects/obj_mac.num
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,3 +1499,21 @@ HKDF_SHA512 1498
id_smime_ori 1499
id_smime_ori_kem 1500
id_alg_hss_lms_hashsig 1501
ML_DSA_44_RSA2048_PSS_SHA256 1502
ML_DSA_44_RSA2048_PKCS15_SHA256 1503
ML_DSA_44_Ed25519_SHA512 1504
ML_DSA_44_ECDSA_P256_SHA256 1505
ML_DSA_65_RSA3072_PSS_SHA512 1506
ML_DSA_65_RSA3072_PKCS15_SHA512 1507
ML_DSA_65_RSA4096_PSS_SHA512 1508
ML_DSA_65_RSA4096_PKCS15_SHA512 1509
ML_DSA_65_ECDSA_P256_SHA512 1510
ML_DSA_65_ECDSA_P384_SHA512 1511
ML_DSA_65_ECDSA_brainpoolP256r1_SHA512 1512
ML_DSA_65_Ed25519_SHA512 1513
ML_DSA_87_ECDSA_P384_SHA512 1514
ML_DSA_87_ECDSA_brainpoolP384r1_SHA512 1515
ML_DSA_87_Ed448_SHAKE256 1516
ML_DSA_87_RSA3072_PSS_SHA512 1517
ML_DSA_87_RSA4096_PSS_SHA512 1518
ML_DSA_87_ECDSA_P521_SHA512 1519
33 changes: 33 additions & 0 deletions crypto/objects/obj_xref.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,39 @@ static const nid_triple sigoid_srt[] = {
{NID_SLH_DSA_SHAKE_192f, NID_undef, NID_SLH_DSA_SHAKE_192f},
{NID_SLH_DSA_SHAKE_256s, NID_undef, NID_SLH_DSA_SHAKE_256s},
{NID_SLH_DSA_SHAKE_256f, NID_undef, NID_SLH_DSA_SHAKE_256f},
{NID_ML_DSA_44_RSA2048_PSS_SHA256, NID_undef,
NID_ML_DSA_44_RSA2048_PSS_SHA256},
{NID_ML_DSA_44_RSA2048_PKCS15_SHA256, NID_undef,
NID_ML_DSA_44_RSA2048_PKCS15_SHA256},
{NID_ML_DSA_44_Ed25519_SHA512, NID_undef, NID_ML_DSA_44_Ed25519_SHA512},
{NID_ML_DSA_44_ECDSA_P256_SHA256, NID_undef,
NID_ML_DSA_44_ECDSA_P256_SHA256},
{NID_ML_DSA_65_RSA3072_PSS_SHA512, NID_undef,
NID_ML_DSA_65_RSA3072_PSS_SHA512},
{NID_ML_DSA_65_RSA3072_PKCS15_SHA512, NID_undef,
NID_ML_DSA_65_RSA3072_PKCS15_SHA512},
{NID_ML_DSA_65_RSA4096_PSS_SHA512, NID_undef,
NID_ML_DSA_65_RSA4096_PSS_SHA512},
{NID_ML_DSA_65_RSA4096_PKCS15_SHA512, NID_undef,
NID_ML_DSA_65_RSA4096_PKCS15_SHA512},
{NID_ML_DSA_65_ECDSA_P256_SHA512, NID_undef,
NID_ML_DSA_65_ECDSA_P256_SHA512},
{NID_ML_DSA_65_ECDSA_P384_SHA512, NID_undef,
NID_ML_DSA_65_ECDSA_P384_SHA512},
{NID_ML_DSA_65_ECDSA_brainpoolP256r1_SHA512, NID_undef,
NID_ML_DSA_65_ECDSA_brainpoolP256r1_SHA512},
{NID_ML_DSA_65_Ed25519_SHA512, NID_undef, NID_ML_DSA_65_Ed25519_SHA512},
{NID_ML_DSA_87_ECDSA_P384_SHA512, NID_undef,
NID_ML_DSA_87_ECDSA_P384_SHA512},
{NID_ML_DSA_87_ECDSA_brainpoolP384r1_SHA512, NID_undef,
NID_ML_DSA_87_ECDSA_brainpoolP384r1_SHA512},
{NID_ML_DSA_87_Ed448_SHAKE256, NID_undef, NID_ML_DSA_87_Ed448_SHAKE256},
{NID_ML_DSA_87_RSA3072_PSS_SHA512, NID_undef,
NID_ML_DSA_87_RSA3072_PSS_SHA512},
{NID_ML_DSA_87_RSA4096_PSS_SHA512, NID_undef,
NID_ML_DSA_87_RSA4096_PSS_SHA512},
{NID_ML_DSA_87_ECDSA_P521_SHA512, NID_undef,
NID_ML_DSA_87_ECDSA_P521_SHA512},
};

static const nid_triple *const sigoid_srt_xref[] = {
Expand Down
Loading
Loading