Merge pull request #2163 from martinetd/disable_oqs

Mayaqua build: allow disabling OQS
2025-11-19 18:01:33 +03:00 · 2025-10-01 11:27:06 +02:00 · 2025-10-01 18:05:59 +09:00 · 2025-09-06 16:31:04 +02:00 · 2025-09-05 21:22:43 +02:00 · 2025-09-05 19:43:42 +02:00
2 changed files with 15 additions and 3 deletions
--- a/3
+++ b/3
@ -37,15 +37,18 @@ COPY --from=builder /usr/local/src/SoftEtherVPN/build/libcedar.so /usr/local/src

 FROM base AS vpnserver
 COPY --from=builder /usr/local/src/SoftEtherVPN/build/vpnserver ./
+RUN ./vpnserver --help
 EXPOSE 443/tcp 992/tcp 1194/tcp 1194/udp 5555/tcp 500/udp 4500/udp
 CMD ["/usr/local/bin/vpnserver", "execsvc"]


 FROM base AS vpnclient
 COPY --from=builder /usr/local/src/SoftEtherVPN/build/vpnclient ./
+RUN ./vpnclient --help
 CMD ["/usr/local/bin/vpnclient", "execsvc"]


 FROM base AS vpnbridge
 COPY --from=builder /usr/local/src/SoftEtherVPN/build/vpnbridge ./
+RUN ./vpnbridge --help
 CMD ["/usr/local/bin/vpnbridge", "execsvc"]
--- a/src/Mayaqua/CMakeLists.txt
+++ b/src/Mayaqua/CMakeLists.txt
@ -18,9 +18,14 @@ 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)
+if(OPENSSL_VERSION VERSION_GREATER_EQUAL "3")
+  set(OQS_ENABLE ON CACHE BOOL "By setting this to OFF, Open Quantum Safe algorithms will not be built in")
 else()
+  # Disable oqsprovider when OpenSSL version < 3
+  set(OQS_ENABLE OFF)
+endif()
+
+if(OQS_ENABLE)
  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)
@ -32,6 +37,8 @@ else()
  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)
+else()
+  add_definitions(-DSKIP_OQS_PROVIDER)
 endif()

 include(CheckSymbolExists)
@ -125,8 +132,10 @@ if(UNIX)
    message("-- Using system's cpu_features")
    target_link_libraries(mayaqua PRIVATE cpu_features)
  else()
+    message("-- Using bundled cpu_features")
+    set(BUILD_SHARED_LIBS OFF)
+    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
    add_subdirectory(3rdparty/cpu_features)
-    set_property(TARGET cpu_features PROPERTY POSITION_INDEPENDENT_CODE ON)
    target_link_libraries(mayaqua PRIVATE cpu_features)
  endif()
Author	SHA1	Message	Date
Ilya Shipitsin	564d2f84b4	Merge pull request #2163 from martinetd/disable_oqs Mayaqua build: allow disabling OQS	2025-10-01 11:27:06 +02:00
Dominique Martinet	4bb366572d	Mayaqua build: allow disabling OQS SoftEtherVPN version 5.02.5186 enable post-quantum algorithms, but these come at a large size increase (after strip, on x86_64, with default options as of master): - default options: 9.1M - new -DOQS_ENABLE=OFF: 762K Note it is also possible to disable all the algorithms individually by passing the (243!) options to cmake -DOQS_ENABLE_KEM_BIKE=OFF -DOQS_ENABLE_KEM_FRODOKEM=OFF -DOQS_ENABLE_KEM_NTRUPRIME=OFF ..., in which case the binary goes back to a reasonable size of 830K In the future, it might make sense to add a few settings picking "sensible" algorithms, e.g. allow everything for a server build or only allow the best algorithms for a lightweight client. See: #2148	2025-10-01 18:05:59 +09:00
Ilya Shipitsin	6c04825b46	Merge pull request #2157 from chipitsine/1ce88cea-29e8-466a-88f4-3713e94171d8 docker: smoke test image during generating	2025-09-06 16:31:04 +02:00
Ilia Shipitsin	0ec8a1ed54	docker: smoke test image during generating reference: https://github.com/SoftEtherVPN/SoftetherVPN-docker/issues/17	2025-09-05 21:22:43 +02:00
Ilya Shipitsin	2acefef41e	Merge pull request #2156 from metalefty/fix_cpu_features Proper fix for #2122 #2150	2025-09-05 19:43:42 +02:00
Koichiro Iwao	efb04daa34	Proper fix for #2122 #2150 Bundled cpu_features needs to be built with PIC but SHARED_LIBS should be OFF.	2025-09-05 22:40:18 +09:00
Ilya Shipitsin	c399ce6bbe	Merge pull request #2152 from metalefty/cpu_features_pic Build bundled cpu_features with PIC	2025-08-25 15:36:27 +02:00
Koichiro Iwao	2746e8dd19	Build bundled cpu_features with PIC After updating bundled cpu_features to 0.9.0, set_property() is not effective. We need to use set() instead. Resolves: #2122 #2150	2025-08-25 21:52:15 +09:00