未验证 提交 43457e9c 编写于 作者: O openharmony_ci 提交者: Gitee

!203 修改WPA_SUPPLICANT程序,以便支持OpenSSL 3.0.7 版本。

Merge pull request !203 from 徐杰/zoufan
...@@ -346,7 +346,7 @@ wpa_base_include_dirs = [ ...@@ -346,7 +346,7 @@ wpa_base_include_dirs = [
"//third_party/libnl/libnl-3.5.0/include", "//third_party/libnl/libnl-3.5.0/include",
"//drivers/peripheral/wlan/client/include", "//drivers/peripheral/wlan/client/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//third_party/openssl/include", "//third_party/openssl/compatible/include",
"$WPA_ROOT_DIR/src/crypto", "$WPA_ROOT_DIR/src/crypto",
"$WPA_ROOT_DIR/src/eap_common", "$WPA_ROOT_DIR/src/eap_common",
"//base/hiviewdfxhilog/interfaces/native/innerkits/include", "//base/hiviewdfxhilog/interfaces/native/innerkits/include",
...@@ -428,8 +428,8 @@ ohos_shared_library("wpa") { ...@@ -428,8 +428,8 @@ ohos_shared_library("wpa") {
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//drivers/peripheral/wlan/client:wifi_driver_client", "//drivers/peripheral/wlan/client:wifi_driver_client",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
"//third_party/openssl:libcrypto_shared", "//third_party/openssl/compatible:libcrypto_static_compatible",
"//third_party/openssl:libssl_shared", "//third_party/openssl/compatible:ssl_source_compatible",
] ]
external_deps = [ "init:libbegetutil" ] external_deps = [ "init:libbegetutil" ]
...@@ -484,7 +484,7 @@ ohos_shared_library("wpa") { ...@@ -484,7 +484,7 @@ ohos_shared_library("wpa") {
include_dirs += [ include_dirs += [
"//base/security/certificate_manager/frameworks/cert_manager_standard/main/common/include", "//base/security/certificate_manager/frameworks/cert_manager_standard/main/common/include",
"//base/security/certificate_manager/interfaces/innerkits/cert_manager_standard/main/include", "//base/security/certificate_manager/interfaces/innerkits/cert_manager_standard/main/include",
"//third_party/openssl", "//third_party/openssl/compatible",
] ]
defines += [ "CONFIG_OHOS_CERTMGR" ] defines += [ "CONFIG_OHOS_CERTMGR" ]
} }
...@@ -570,8 +570,8 @@ ohos_shared_library("wpa_updater") { ...@@ -570,8 +570,8 @@ ohos_shared_library("wpa_updater") {
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//drivers/peripheral/wlan/client:wifi_driver_client", "//drivers/peripheral/wlan/client:wifi_driver_client",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
"//third_party/openssl:libcrypto_shared", "//third_party/openssl/compatible:libcrypto_static_compatible",
"//third_party/openssl:libssl_shared", "//third_party/openssl/compatible:ssl_source_compatible",
] ]
external_deps = [ "init:libbegetutil" ] external_deps = [ "init:libbegetutil" ]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册