Merge 67fe99e1dc into 4e8f797036

Move duplicated code to one place
Remove testing code
2024-11-22 01:19:52 +03:00 · 2024-07-16 06:34:23 +00:00 · 2024-07-16 02:33:16 -04:00 · 2024-07-04 13:56:13 -04:00 · 2024-07-04 13:15:50 -04:00 · 2024-07-04 06:55:06 -04:00
6 changed files with 37 additions and 1 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -10,3 +10,9 @@
 [submodule "src/libhamcore"]
 	path = src/libhamcore
 	url = https://github.com/SoftEtherVPN/libhamcore.git
+[submodule "src/Mayaqua/3rdparty/oqs-provider"]
+	path = src/Mayaqua/3rdparty/oqs-provider
+	url = https://github.com/open-quantum-safe/oqs-provider.git
+[submodule "src/Mayaqua/3rdparty/liboqs"]
+	path = src/Mayaqua/3rdparty/liboqs
+	url = https://github.com/open-quantum-safe/liboqs.git
--- a/src/Mayaqua/3rdparty/Findliboqs.cmake
+++ b/src/Mayaqua/3rdparty/Findliboqs.cmake
@ -0,0 +1,2 @@
+set(oqs_FOUND TRUE)
+add_library(OQS::oqs ALIAS oqs)
--- a/src/Mayaqua/3rdparty/liboqs
+++ b/src/Mayaqua/3rdparty/liboqs
@ -0,0 +1 @@
+Subproject commit 51ddd33cc04d12bd47c8639c1254714879f4cdf3
--- a/src/Mayaqua/3rdparty/oqs-provider
+++ b/src/Mayaqua/3rdparty/oqs-provider
@ -0,0 +1 @@
+Subproject commit 8f37521d5e27ab4d1e0d69a4b4a5bd17927b24b9
--- a/src/Mayaqua/CMakeLists.txt
+++ b/src/Mayaqua/CMakeLists.txt
@ -18,6 +18,22 @@ set_target_properties(mayaqua

 find_package(OpenSSL REQUIRED)

+if(OPENSSL_VERSION VERSION_LESS "3") # Disable oqsprovider when OpenSSL version < 3
+  add_definitions(-DSKIP_OQS_PROVIDER)
+else()
+  set(OQS_BUILD_ONLY_LIB ON CACHE BOOL "Set liboqs to build only the library (no tests)")
+  set(BUILD_TESTING OFF CACHE BOOL "By setting this to OFF, no tests or examples will be compiled.")
+  set(OQS_PROVIDER_BUILD_STATIC ON CACHE BOOL "Build a static library instead of a shared library") # Build oqsprovider as a static library (defaults to shared)
+  list(PREPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/src/Mayaqua/3rdparty/")
+
+  add_subdirectory(3rdparty/liboqs)
+  add_subdirectory(3rdparty/oqs-provider)
+
+  target_include_directories(oqsprovider PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/3rdparty/liboqs/include)
+  set_property(TARGET oqsprovider PROPERTY POSITION_INDEPENDENT_CODE ON)
+  target_link_libraries(mayaqua PRIVATE oqsprovider)
+endif()
+
 include(CheckSymbolExists)

 set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
--- a/src/Mayaqua/Encrypt.c
+++ b/src/Mayaqua/Encrypt.c
@ -42,6 +42,10 @@
 #include <openssl/x509v3.h>
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
 #include <openssl/provider.h>
+// Static oqsprovider initialization function
+#ifndef SKIP_OQS_PROVIDER
+	extern OSSL_provider_init_fn oqs_provider_init;
+#endif
 #endif

 #ifdef _MSC_VER
@ -4005,7 +4009,13 @@ void InitCryptLibrary()
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
 	ossl_provider_default = OSSL_PROVIDER_load(NULL, "legacy");
 	ossl_provider_legacy = OSSL_PROVIDER_load(NULL, "default");
-	ossl_provider_oqsprovider = OSSL_PROVIDER_load(NULL, "oqsprovider");
+
+	char *oqs_provider_name = "oqsprovider";
+	#ifndef SKIP_OQS_PROVIDER
+		// Registers "oqsprovider" as a provider -- necessary because oqsprovider is built in now.
+		OSSL_PROVIDER_add_builtin(NULL, oqs_provider_name, oqs_provider_init); 
+	#endif
+	ossl_provider_oqsprovider = OSSL_PROVIDER_load(NULL, oqs_provider_name);
 #endif

 	ssl_clientcert_index = SSL_get_ex_new_index(0, "struct SslClientCertInfo *", NULL, NULL, NULL);
Author	SHA1	Message	Date
siddharth-narayan	fcb05b9bb8	Merge `67fe99e1dc` into `4e8f797036`	2024-07-16 06:34:23 +00:00
Siddharth	67fe99e1dc	Move duplicated code to one place	2024-07-16 02:33:16 -04:00
Siddharth	d4d20e4443	Remove testing code	2024-07-04 13:56:13 -04:00
Siddharth	a45219bb78	Revert "Fix engine include errors on Fedora Rawhide" This reverts commit `1d57ccf94a`.	2024-07-04 13:15:50 -04:00
Siddharth	1d57ccf94a	Fix engine include errors on Fedora Rawhide	2024-07-04 06:55:06 -04:00
siddharth-narayan	04912037c0	Merge branch 'SoftEtherVPN:master' into built-in-post-quantum	2024-07-03 20:12:21 -04:00
Siddharth	1f9ce6f9c2	Skip oqsprovider build when OpenSSL version is less than 3.0	2024-06-28 17:05:52 -04:00
Siddharth	28ded982a7	Remove empty OpenSSL version guard	2024-06-28 14:18:48 -04:00
siddharth-narayan	de9c566f33	Merge branch 'SoftEtherVPN:master' into built-in-post-quantum	2024-06-28 13:43:55 -04:00
Siddharth	0af6c96d88	Skip tests for oqsprovider	2024-06-28 04:01:30 -04:00
Siddharth	c2c1388f8c	Update liboqs and oqs-provider git submodules	2024-06-28 04:00:51 -04:00
Siddharth	d15f92c9b2	Make oqsprovider not build tests	2024-06-28 04:00:51 -04:00
Siddharth	7dc3f2240c	Add liboqs with find_package	2024-06-26 20:55:09 -04:00
Siddharth	eb66e7d360	That's not how you comment in C!	2024-06-21 15:16:27 -04:00
Siddharth	13e6369db3	Add liboqs because it isn't normally packaged	2024-06-21 15:14:49 -04:00
Siddharth	102485a4b8	Add oqsprovider statically (built in) by default	2024-06-20 22:08:38 -04:00
				`@ -0,0 +1 @@`
				`Subproject commit 51ddd33cc04d12bd47c8639c1254714879f4cdf3`
				`@ -0,0 +1 @@`
				`Subproject commit 8f37521d5e27ab4d1e0d69a4b4a5bd17927b24b9`