Merge pull request SoftEtherVPN#2091 from siddharth-narayan/oqs-submo…

…dule-update Update liboqs and oqs-provider submodules - Add X25519MLKEM768 NIST f…
chipitsine · Jan 15, 2025 · 2628ac1 · 2628ac1
2 parents 8be6d75 + 972256c
commit 2628ac1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Mayaqua/3rdparty/liboqs b/src/Mayaqua/3rdparty/liboqs
diff --git a/src/Mayaqua/3rdparty/oqs-provider b/src/Mayaqua/3rdparty/oqs-provider
diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h
@@ -60,7 +60,7 @@ struct DYN_VALUE
 #define	DEFAULT_CIPHER_LIST			"ECDHE+AESGCM:ECDHE+CHACHA20:DHE+AESGCM:DHE+CHACHA20:ECDHE+AES256:DHE+AES256:RSA+AES"
 
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-#define PQ_GROUP_LIST				"p521_kyber1024:x25519_kyber768:P-521:X25519:P-256"
+#define PQ_GROUP_LIST				"X25519MLKEM768:p521_kyber1024:x25519_kyber768:P-521:X25519:P-256"
 #endif
 
 // SSL logging function
+0 −163		.circleci/config.yml
+7 −0		.github/CODEOWNERS
+14 −0		.github/workflows/check_workflows.yml
+17 −3		.github/workflows/coding_style.yml
+20 −17		.github/workflows/linux.yml
+8 −7		.github/workflows/macos.yml
+2 −2		.github/workflows/standalone.yml
+15 −14		.github/workflows/windows.yml
+140 −112		ALGORITHMS.md
+4 −10		CMakeLists.txt
+24 −7		CONFIGURE.md
+17 −3		CONTRIBUTING.md
+1 −1		GOVERNANCE.md
+59 −17		README.md
+133 −3		RELEASE.md
+3 −1		SECURITY.md
+1 −1		STANDARDS.md
+4 −0		USAGE.md
+6 −1		examples/CMakeLists.txt
+0 −13		oqs-template/ALGORITHMS.md/encodings.fragment
+4 −1		oqs-template/ALGORITHMS.md/ids.fragment
+1 −1		oqs-template/ALGORITHMS.md/oids.fragment
+1 −1		oqs-template/README.md/algs.fragment
+5 −3		oqs-template/generate.py
+248 −47		oqs-template/generate.yml
+1 −1		oqs-template/generate.yml-0.10.0
+1,667 −0		oqs-template/generate.yml-0.11.0
+1,674 −0		oqs-template/generate.yml-0.12.0
+7 −0		oqs-template/generate_oid_nid_table.py
+14 −14		oqs-template/oqs-kem-info.md
+192 −155		oqs-template/oqs-sig-info.md
+2 −2		oqs-template/oqsprov/oqs_decode_der2key.c/decoder_make.fragment
+3 −3		oqs-template/oqsprov/oqs_encode_key2any.c/encoder_defines.fragment
+7 −7		oqs-template/oqsprov/oqs_encode_key2any.c/encoder_make.fragment
+6 −6		oqs-template/oqsprov/oqs_kmgmt.c/keymgmt_constructors.fragment
+2 −2		oqs-template/oqsprov/oqs_kmgmt.c/keymgmt_functions.fragment
+2 −2		oqs-template/oqsprov/oqs_prov.h/alg_functions.fragment
+9 −9		oqs-template/oqsprov/oqs_prov.h/endecoder_functions.fragment
+2 −2		oqs-template/oqsprov/oqsdecoders.inc/make.fragment
+7 −7		oqs-template/oqsprov/oqsencoders.inc/make.fragment
+9 −1		oqs-template/oqsprov/oqsprov.c/assign_sig_oids.fragment
+0 −21		oqs-template/oqsprov/oqsprov.c/encoding_patching.fragment
+1 −1		oqs-template/oqsprov/oqsprov.c/kem_functions.fragment
+1 −1		oqs-template/oqsprov/oqsprov.c/keymgmt_functions.fragment
+1 −1		oqs-template/oqsprov/oqsprov.c/oid_patching.fragment
+1 −1		oqs-template/oqsprov/oqsprov_capabilities.c/codepoint_patching.fragment
+2 −2		oqs-template/oqsprov/oqsprov_capabilities.c/group_assignments.fragment
+1 −1		oqs-template/oqsprov/oqsprov_capabilities.c/group_names.fragment
+2 −2		oqs-template/oqsprov/oqsprov_keys.c/oqsnames.fragment
+1 −1		oqs-template/scripts/common.py/kex_algs.fragment
+14 −0		oqs-template/test/oqs_test_evp_pkey_params.c/composite_sig_algs.fragment
+1 −1		oqs-template/test/oqs_test_evp_pkey_params.c/hybrid_kem_algs.fragment
+14 −29		oqsprov/CMakeLists.txt
+129 −120		oqsprov/oqs_decode_der2key.c
+752 −670		oqsprov/oqs_encode_key2any.c
+12 −17		oqsprov/oqs_endecoder_common.c
+2 −1		oqsprov/oqs_endecoder_local.h
+266 −0		oqsprov/oqs_hyb_kem.c
+47 −284		oqsprov/oqs_kem.c
+573 −572		oqsprov/oqs_kmgmt.c
+208 −70		oqsprov/oqs_prov.h
+416 −304		oqsprov/oqs_sig.c
+213 −353		oqsprov/oqsdecoders.inc
+818 −1,156		oqsprov/oqsencoders.inc
+275 −425		oqsprov/oqsprov.c
+31 −51		oqsprov/oqsprov_bio.c
+361 −313		oqsprov/oqsprov_capabilities.c
+693 −532		oqsprov/oqsprov_keys.c
+45 −0		sbom.cdx.json
+3 −3		scripts/common.py
+27 −0		scripts/do_code_format.sh
+16 −0		scripts/format_code.sh
+11 −3		scripts/fullbuild.sh
+15 −6		scripts/oqsprovider-externalinterop.sh
+6 −1		scripts/oqsprovider-pkcs12gen.sh
+0 −29		scripts/runtests_encodings.sh
+14 −6		test/CMakeLists.txt
+29 −21		test/oqs_test_endecode.c
+92 −71		test/oqs_test_evp_pkey_params.c
+33 −17		test/oqs_test_groups.c
+30 −31		test/oqs_test_kems.c
+41 −42		test/oqs_test_signatures.c
+40 −26		test/oqs_test_tlssig.c
+8 −12		test/test_common.c
+22 −22		test/test_common.h
+60 −39		test/tlstest_helpers.c
+2 −2		test/tlstest_helpers.h