diff --git a/bundle.json b/bundle.json index bd04e08488cf447f1ee3f7dfc8c2827e9be7c1f2..992ef26aff426406551069e222e81a770d0cf86c 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 47f6b73c1fd734c582530f1d2ffc96a302623f54..c86f76c3ad6cd0d5e77ffd9f9e3b088fc96fcb2d 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 c70ebe525fe201a9fd1b3f7e6a258e917463f5b1..69bc0343c2545646288ff0fd64ba3aa953be3950 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 fe2e52e88d14d00d154ec450e1978e658fda6fed..ff57c883251e3cacc2c8004f8055ce11e7976f85 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 b39641df541d7ee1e5b5f006e8388a71237f92a3..df7bdd6ac2c0535de7dfe84153c89c9f61dea323 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 50b443054cbf8b91b9fb9adb2c637dc2d7cc3616..3b17f1a7d8a8d6dee9121ea4074419652395e19a 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 3ba82b49069ada2c82ddd6be20adbdc731120109..8bb1eca05e1c44c563d152773ef18c534174429a 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 d4bf2b71a713975109dd286279196b56eef1442b..2ea275aad66c45fb86c6e4ce4f5c63b7b2da3ebf 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 d9687cbb01da367d719da6766bb6567450532025..af5b512dad0fc7667af7444b714b90c86f7acfc8 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 251557b667d1eb2a5dd1332c8161d3609e33b566..3669256c402b5581487e0452d04fc4bb887e0fc0 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", ]