From 6131dcd49f8ea95302d22114b112ebaf40bed0ac Mon Sep 17 00:00:00 2001 From: l00635678 Date: Tue, 1 Jul 2025 15:05:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E7=8B=AC=E7=AB=8B=E7=BC=96?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l00635678 --- bundle.json | 2 +- frameworks/cj/websocket/BUILD.gn | 1 + frameworks/js/napi/fetch/BUILD.gn | 1 + frameworks/js/napi/http/BUILD.gn | 17 ++++++----------- frameworks/js/napi/websocket/BUILD.gn | 1 + interfaces/innerkits/websocket_client/BUILD.gn | 6 +++++- .../fuzztest/websocketexec_fuzzer/BUILD.gn | 1 + test/unittest/tlssocket/client/BUILD.gn | 4 ++-- test/unittest/utils/common_utils/BUILD.gn | 1 + test/unittest/websocket/BUILD.gn | 1 + 10 files changed, 20 insertions(+), 15 deletions(-) diff --git a/bundle.json b/bundle.json index bd04e0848..992ef26af 100644 --- a/bundle.json +++ b/bundle.json @@ -57,7 +57,7 @@ "libwebsockets", "node", "jsoncpp", - "netmanager_enhanced" + "access_token" ] }, "build": { diff --git a/frameworks/cj/websocket/BUILD.gn b/frameworks/cj/websocket/BUILD.gn index 47f6b73c1..c86f76c3a 100644 --- a/frameworks/cj/websocket/BUILD.gn +++ b/frameworks/cj/websocket/BUILD.gn @@ -61,6 +61,7 @@ ohos_shared_library("cj_net_websocket_ffi") { "napi:ace_napi", "napi:cj_bind_ffi", "napi:cj_bind_native", + "openssl:libcrypto_shared", "openssl:libssl_shared", "samgr:samgr_proxy", ] diff --git a/frameworks/js/napi/fetch/BUILD.gn b/frameworks/js/napi/fetch/BUILD.gn index c70ebe525..69bc0343c 100644 --- a/frameworks/js/napi/fetch/BUILD.gn +++ b/frameworks/js/napi/fetch/BUILD.gn @@ -60,6 +60,7 @@ ohos_shared_library("fetch") { "curl:curl_shared", "hilog:libhilog", "napi:ace_napi", + "c_utils:utils", ] relative_install_dir = "module" diff --git a/frameworks/js/napi/http/BUILD.gn b/frameworks/js/napi/http/BUILD.gn index fe2e52e88..ff57c8832 100644 --- a/frameworks/js/napi/http/BUILD.gn +++ b/frameworks/js/napi/http/BUILD.gn @@ -146,17 +146,12 @@ ohos_shared_library("http") { "samgr:samgr_proxy", "time_service:time_client", ] - if (netstack_http_boringssl) { - external_deps += [ - "netmanager_enhanced:crypto_boringssl", - "netmanager_enhanced:ssl_boringssl", - ] - } else { - external_deps += [ - "openssl:libcrypto_shared", - "openssl:libssl_shared", - ] - } + + external_deps += [ + "openssl:libcrypto_shared", + "openssl:libssl_shared", + ] + if (defined(global_parts_info) && defined(global_parts_info.communication_netmanager_base) && global_parts_info.communication_netmanager_base) { diff --git a/frameworks/js/napi/websocket/BUILD.gn b/frameworks/js/napi/websocket/BUILD.gn index b39641df5..df7bdd6ac 100644 --- a/frameworks/js/napi/websocket/BUILD.gn +++ b/frameworks/js/napi/websocket/BUILD.gn @@ -61,6 +61,7 @@ ohos_shared_library("websocket") { "hilog:libhilog", "libwebsockets:websockets", "napi:ace_napi", + "openssl:libcrypto_shared", "openssl:libssl_shared", "samgr:samgr_proxy", ] diff --git a/interfaces/innerkits/websocket_client/BUILD.gn b/interfaces/innerkits/websocket_client/BUILD.gn index 50b443054..3b17f1a7d 100644 --- a/interfaces/innerkits/websocket_client/BUILD.gn +++ b/interfaces/innerkits/websocket_client/BUILD.gn @@ -79,7 +79,11 @@ ohos_shared_library("websocket_client") { "$NETSTACK_DIR/utils/napi_utils:napi_utils", ] - external_deps = [ "openssl:libssl_shared" ] + external_deps = [ + "bounds_checking_function:libsec_shared", + "openssl:libcrypto_shared", + "openssl:libssl_shared", + ] public_external_deps = [ "libwebsockets:websockets" ] diff --git a/test/fuzztest/websocket/fuzztest/websocketexec_fuzzer/BUILD.gn b/test/fuzztest/websocket/fuzztest/websocketexec_fuzzer/BUILD.gn index 3ba82b490..8bb1eca05 100644 --- a/test/fuzztest/websocket/fuzztest/websocketexec_fuzzer/BUILD.gn +++ b/test/fuzztest/websocket/fuzztest/websocketexec_fuzzer/BUILD.gn @@ -64,6 +64,7 @@ ohos_fuzztest("WebSocketExecFuzzTest") { "hilog:libhilog", "libwebsockets:websockets", "napi:ace_napi", + "openssl:libcrypto_shared", "openssl:libssl_shared", "samgr:samgr_proxy", ] diff --git a/test/unittest/tlssocket/client/BUILD.gn b/test/unittest/tlssocket/client/BUILD.gn index d4bf2b71a..2ea275aad 100644 --- a/test/unittest/tlssocket/client/BUILD.gn +++ b/test/unittest/tlssocket/client/BUILD.gn @@ -329,7 +329,7 @@ ohos_unittest("tls_socket_unilateral_connection") { ] external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "c_utils:utils", "hilog:libhilog", @@ -641,7 +641,7 @@ ohos_unittest("tls_socket_branch_test") { ] external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", + "access_token:libnativetoken_shared", "access_token:libtoken_setproc", "c_utils:utils", "hilog:libhilog", diff --git a/test/unittest/utils/common_utils/BUILD.gn b/test/unittest/utils/common_utils/BUILD.gn index d9687cbb0..af5b512da 100644 --- a/test/unittest/utils/common_utils/BUILD.gn +++ b/test/unittest/utils/common_utils/BUILD.gn @@ -20,6 +20,7 @@ NETSTACK_UTILS_ROOT = "$SUBSYSTEM_DIR/netstack/utils" utils_include = [ "$NETSTACK_UTILS_ROOT/log/include" ] common_external_deps = [ + "bounds_checking_function:libsec_shared", "c_utils:utils", "hilog:libhilog", "hisysevent:libhisysevent", diff --git a/test/unittest/websocket/BUILD.gn b/test/unittest/websocket/BUILD.gn index 251557b66..3669256c4 100644 --- a/test/unittest/websocket/BUILD.gn +++ b/test/unittest/websocket/BUILD.gn @@ -62,6 +62,7 @@ ohos_unittest("websocket_unittest") { external_deps = common_external_deps external_deps += [ "libwebsockets:websockets", + "openssl:libcrypto_shared", "openssl:libssl_shared", "samgr:samgr_proxy", ] -- Gitee