From 8c27be5beb47b69610f892b9984077e0cd6476fd Mon Sep 17 00:00:00 2001 From: HapiFive <1143910315@qq.com> Date: Wed, 31 Jul 2024 23:50:30 +0800 Subject: [PATCH] usockets: support openssl3 (#4804) --- packages/u/usockets/port/xmake.lua | 2 +- packages/u/usockets/xmake.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/u/usockets/port/xmake.lua b/packages/u/usockets/port/xmake.lua index 468c127e6..1005395d7 100644 --- a/packages/u/usockets/port/xmake.lua +++ b/packages/u/usockets/port/xmake.lua @@ -9,7 +9,7 @@ local ssl = get_config("ssl") if ssl then add_requires(ssl) add_packages(ssl) - if ssl == "openssl" or ssl == "boringssl" then + if ssl == "openssl" or ssl == "openssl3" or ssl == "boringssl" then add_defines("LIBUS_USE_OPENSSL") elseif ssl == "wolfssl" then add_defines("LIBUS_USE_WOLFSSL") diff --git a/packages/u/usockets/xmake.lua b/packages/u/usockets/xmake.lua index b3cb3845f..e5e20a39b 100644 --- a/packages/u/usockets/xmake.lua +++ b/packages/u/usockets/xmake.lua @@ -8,7 +8,7 @@ package("usockets") add_versions("v0.8.8", "d14d2efe1df767dbebfb8d6f5b52aa952faf66b30c822fbe464debaa0c5c0b17") - add_configs("ssl", {description = "Select ssl library", default = nil, type = "string", values = {"openssl", "wolfssl", "boringssl"}}) + add_configs("ssl", {description = "Select ssl library", default = nil, type = "string", values = {"openssl", "openssl3", "wolfssl", "boringssl"}}) add_configs("uv", {description = "Enable libuv", default = false, type = "boolean"}) add_configs("uring", {description = "Enable liburing", default = false, type = "boolean"}) add_configs("quic", {description = "Enable lsquic", default = false, type = "boolean"}) @@ -17,7 +17,7 @@ package("usockets") local ssl = package:config("ssl") if ssl then package:add("deps", ssl) - if ssl == "openssl" or ssl == "boringssl" then + if ssl == "openssl" or ssl == "openssl3" or ssl == "boringssl" then package:add("defines", "LIBUS_USE_OPENSSL") elseif ssl == "wolfssl" then package:add("defines", "LIBUS_USE_WOLFSSL")