2 files changed, 62 insertions, 34 deletions
diff --git a/cmake/dependencies/crypt/openssl.cmake b/cmake/dependencies/crypt/openssl.cmake
index 38eb826f..b0fa8d11 100644
--- a/cmake/dependencies/crypt/openssl.cmake
+++ b/cmake/dependencies/crypt/openssl.cmake
@@ -25,49 +25,32 @@ message(STATUS "OpenSSL support enabled, found version ${OPENSSL_VERSION}")
 set(HAVE_OPENSSL TRUE CACHE INTERNAL
   "OpenSSL cryptography support available")
 
-if(OPENSSL_VERSION VERSION_GREATER_EQUAL "3.4.0")
-  set(DISABLE_ML_KEM FALSE CACHE BOOL
-    "Disable ML-KEM support")
-  set(DISABLE_ML_DSA FALSE CACHE BOOL
-    "Disable ML-DSA support")
-  if(NOT DISABLE_ML_KEM)
-    set(HAVE_OPENSSL_ML_KEM TRUE CACHE INTERNAL
-      "OpenSSL ML-KEM available")
-    message(STATUS "OpenSSL ML-KEM support enabled")
-  else()
-    message(STATUS "OpenSSL ML-KEM support disabled")
-    unset(HAVE_OPENSSL_ML_KEM CACHE)
-  endif()
-  if(NOT DISABLE_ML_DSA)
-    set(HAVE_OPENSSL_ML_DSA TRUE CACHE INTERNAL
-      "OpenSSL ML-DSA available")
-    message(STATUS "OpenSSL ML-DSA support enabled")
-  else()
-    message(STATUS "OpenSSL ML-DSA support disabled")
-    unset(HAVE_OPENSSL_ML_DSA CACHE)
-  endif()
-else()
-  message(STATUS
-    "Install OpenSSL >= 3.4.0 for ML-KEM/ML-DSA")
-  unset(HAVE_OPENSSL_ML_KEM CACHE)
-  unset(HAVE_OPENSSL_ML_DSA CACHE)
-endif()
-
 if(OPENSSL_VERSION VERSION_GREATER_EQUAL "3.5.0")
-  set(DISABLE_SLH_DSA FALSE CACHE BOOL
+  set(DISABLE_ML FALSE CACHE BOOL
+    "Disable ML-KEM/ML-DSA support")
+  set(DISABLE_SLH FALSE CACHE BOOL
     "Disable SLH-DSA support")
-  if(NOT DISABLE_SLH_DSA)
-    set(HAVE_OPENSSL_SLH_DSA TRUE CACHE INTERNAL
+  if(NOT DISABLE_ML)
+    set(HAVE_ML TRUE CACHE INTERNAL
+      "OpenSSL ML-KEM/ML-DSA available")
+    message(STATUS "OpenSSL ML-KEM/ML-DSA support enabled")
+  else()
+    message(STATUS "OpenSSL ML-KEM/ML-DSA support disabled")
+    unset(HAVE_ML CACHE)
+  endif()
+  if(NOT DISABLE_SLH)
+    set(HAVE_SLH TRUE CACHE INTERNAL
       "OpenSSL SLH-DSA available")
     message(STATUS "OpenSSL SLH-DSA support enabled")
   else()
     message(STATUS "OpenSSL SLH-DSA support disabled")
-    unset(HAVE_OPENSSL_SLH_DSA CACHE)
+    unset(HAVE_SLH CACHE)
   endif()
 else()
   message(STATUS
-    "Install OpenSSL >= 3.5.0 for SLH-DSA")
-  unset(HAVE_OPENSSL_SLH_DSA CACHE)
+    "Install OpenSSL >= 3.5.0 for PQC (ML-KEM/ML-DSA/SLH-DSA)")
+  unset(HAVE_ML CACHE)
+  unset(HAVE_SLH CACHE)
 endif()
 
 # Secure memory options are in cmake/config/global.cmake
diff --git a/cmake/dependencies/system/liburcu.cmake b/cmake/dependencies/system/liburcu.cmake
new file mode 100644
index 00000000..89a7ab12
--- /dev/null
+++ b/cmake/dependencies/system/liburcu.cmake
@@ -0,0 +1,45 @@
+# Userspace RCU (liburcu) - optional. Enables lock-free data-plane key
+# rotation; absent => per-flow rwlock fallback. The "bulletproof" flavour
+# (urcu-bp) auto-registers reader threads, so application threads need no
+# RCU lifecycle plumbing.
+if(PkgConfig_FOUND)
+  pkg_check_modules(URCU_PKG QUIET IMPORTED_TARGET liburcu-bp)
+  if(URCU_PKG_FOUND AND NOT TARGET Urcu::Urcu)
+    add_library(Urcu::Urcu ALIAS PkgConfig::URCU_PKG)
+  endif()
+endif()
+
+if(NOT URCU_PKG_FOUND)
+  find_library(URCU_BP_LIBRARY urcu-bp QUIET)
+  find_library(URCU_COMMON_LIBRARY urcu-common QUIET)
+  find_path(URCU_INCLUDE_DIR urcu-bp.h QUIET)
+  if(URCU_BP_LIBRARY AND URCU_COMMON_LIBRARY AND URCU_INCLUDE_DIR)
+    set(URCU_PKG_FOUND TRUE)
+    if(NOT TARGET Urcu::Urcu)
+      add_library(Urcu::Urcu INTERFACE IMPORTED)
+      set_target_properties(Urcu::Urcu PROPERTIES
+        INTERFACE_LINK_LIBRARIES "${URCU_BP_LIBRARY};${URCU_COMMON_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${URCU_INCLUDE_DIR}")
+    endif()
+  endif()
+endif()
+
+if(URCU_PKG_FOUND)
+  set(DISABLE_LIBURCU FALSE CACHE BOOL "Disable liburcu (RCU) support")
+  if(NOT DISABLE_LIBURCU)
+    if(URCU_PKG_VERSION)
+      message(STATUS "liburcu (RCU) support enabled (version ${URCU_PKG_VERSION})")
+    else()
+      message(STATUS "liburcu (RCU) support enabled")
+    endif()
+    set(HAVE_LIBURCU TRUE CACHE INTERNAL "Userspace RCU (liburcu) available")
+  else()
+    message(STATUS "liburcu (RCU) support disabled by user")
+    unset(HAVE_LIBURCU CACHE)
+  endif()
+else()
+  message(STATUS "Install liburcu (urcu-bp) for lock-free data-plane re-keying")
+  unset(HAVE_LIBURCU CACHE)
+endif()
+
+mark_as_advanced(URCU_BP_LIBRARY URCU_COMMON_LIBRARY URCU_INCLUDE_DIR)