Merge 3a25c6bf73 into 4e8f797036

.gitmodules

@@ -10,9 +10,3 @@
 [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

src/Mayaqua/3rdparty/Findliboqs.cmake

@@ -1,2 +0,0 @@
-set(oqs_FOUND TRUE)
-add_library(OQS::oqs ALIAS oqs)

src/Mayaqua/3rdparty/liboqs

@@ -1 +0,0 @@
-Subproject commit 51ddd33cc04d12bd47c8639c1254714879f4cdf3

src/Mayaqua/3rdparty/oqs-provider

@@ -1 +0,0 @@
-Subproject commit 8f37521d5e27ab4d1e0d69a4b4a5bd17927b24b9

src/Mayaqua/CMakeLists.txt

@@ -18,22 +18,6 @@ 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})

src/Mayaqua/Encrypt.c

@@ -42,10 +42,6 @@
 #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
@@ -4009,13 +4005,7 @@ 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);