From cc5cbb832458ef5e5483ea1e49cbc4254c82c74a Mon Sep 17 00:00:00 2001 From: l30005037 Date: Thu, 20 Mar 2025 21:10:03 +0800 Subject: [PATCH 1/4] Security and privacy compliance requirements Signed-off-by: l30005037 --- .../distributeddataservice/adapter/dfx/test/BUILD.gn | 12 +++++++++--- .../distributeddataservice/adapter/utils/BUILD.gn | 4 +++- services/distributeddataservice/app/BUILD.gn | 4 +++- .../distributeddataservice/app/src/checker/BUILD.gn | 4 +++- services/distributeddataservice/app/test/BUILD.gn | 4 +++- services/distributeddataservice/framework/BUILD.gn | 4 +++- .../distributeddataservice/framework/test/BUILD.gn | 4 +++- services/distributeddataservice/service/BUILD.gn | 4 +++- 8 files changed, 30 insertions(+), 10 deletions(-) diff --git a/services/distributeddataservice/adapter/dfx/test/BUILD.gn b/services/distributeddataservice/adapter/dfx/test/BUILD.gn index 78a3fa45b..e7ee9c851 100755 --- a/services/distributeddataservice/adapter/dfx/test/BUILD.gn +++ b/services/distributeddataservice/adapter/dfx/test/BUILD.gn @@ -42,7 +42,9 @@ ohos_unittest("DistributeddataDfxMSTTest") { "kv_store:distributeddata_inner", "openssl:libcrypto_shared", ] - ldflags = [ "-Wl,--exclude-libs,ALL" ] + ldflags = [ + "-Wl,-z,relro,-z,now,--exclude-libs,ALL" + ] deps = [ "${data_service_path}/adapter/dfx:distributeddata_dfx", "//third_party/googletest:gtest_main", @@ -83,7 +85,9 @@ ohos_unittest("DistributeddataDfxUTTest") { "kv_store:distributeddata_inner", "openssl:libcrypto_shared", ] - ldflags = [ "-Wl,--exclude-libs,ALL" ] + ldflags = [ + "-Wl,-z,relro,-z,now,--exclude-libs,ALL" + ] deps = [ "${data_service_path}/adapter/dfx:distributeddata_dfx", "${data_service_path}/adapter/utils:distributeddata_utils", @@ -115,7 +119,9 @@ ohos_unittest("HiViewAdapterDfxTest") { "kv_store:distributeddata_mgr", "openssl:libcrypto_shared", ] - ldflags = [ "-Wl,--exclude-libs,ALL" ] + ldflags = [ + "-Wl,-z,relro,-z,now,--exclude-libs,ALL" + ] deps = [ "${data_service_path}/adapter/communicator:distributeddata_communicator", "${data_service_path}/adapter/dfx:distributeddata_dfx", diff --git a/services/distributeddataservice/adapter/utils/BUILD.gn b/services/distributeddataservice/adapter/utils/BUILD.gn index bf5b815f0..2c6bbb08a 100755 --- a/services/distributeddataservice/adapter/utils/BUILD.gn +++ b/services/distributeddataservice/adapter/utils/BUILD.gn @@ -31,7 +31,9 @@ ohos_source_set("distributeddata_utils") { } include_dirs = [ "../include/utils" ] - ldflags = [ "-Wl,--exclude-libs,ALL" ] + ldflags = [ + "-Wl,-z,relro,-z,now,--exclude-libs,ALL" + ] external_deps = [ "c_utils:utils", diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index 084cbb75e..55b8a8ac4 100644 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -83,7 +83,9 @@ config("module_private_config") { "-Oz", ] - ldflags = [ "-Wl,--gc-sections" ] + ldflags = [ + "-Wl,-z,relro,-z,now,--gc-sections" + ] } ohos_shared_library("distributeddataservice") { diff --git a/services/distributeddataservice/app/src/checker/BUILD.gn b/services/distributeddataservice/app/src/checker/BUILD.gn index f0fa8dd25..544f496ac 100644 --- a/services/distributeddataservice/app/src/checker/BUILD.gn +++ b/services/distributeddataservice/app/src/checker/BUILD.gn @@ -37,7 +37,9 @@ ohos_source_set("distributeddata_checker") { if (build_public_version) { cflags_cc += [ "-DCONFIG_PUBLIC_VERSION" ] } - ldflags = [ "-Wl,--exclude-libs,ALL" ] + ldflags = [ + "-Wl,-z,relro,-z,now,--exclude-libs,ALL" + ] deps = [ "${data_service_path}/adapter/utils:distributeddata_utils" ] cflags = [ "-Oz" ] external_deps = [ diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index f3f912893..774e98288 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -65,7 +65,9 @@ config("module_private_config") { "-Dprivate=public", "-Dprotected=public", ] - ldflags = [ "-Wl,--whole-archive" ] + ldflags = [ + "-Wl,-z,relro,-z,now,--whole-archive" + ] defines = [ "TEST_ON_DEVICE", "OPENSSL_SUPPRESS_DEPRECATED", diff --git a/services/distributeddataservice/framework/BUILD.gn b/services/distributeddataservice/framework/BUILD.gn index f85d7b550..7d6ae6b90 100644 --- a/services/distributeddataservice/framework/BUILD.gn +++ b/services/distributeddataservice/framework/BUILD.gn @@ -125,7 +125,9 @@ ohos_shared_library("distributeddatasvcfwk") { "-ffunction-sections", ] - ldflags = [ "-Wl,--gc-sections" ] + ldflags = [ + "-Wl,-z,relro,-z,now,--gc-sections" + ] cflags_cc = [ "-fvisibility=hidden" ] diff --git a/services/distributeddataservice/framework/test/BUILD.gn b/services/distributeddataservice/framework/test/BUILD.gn index 728d05f26..8b3706750 100644 --- a/services/distributeddataservice/framework/test/BUILD.gn +++ b/services/distributeddataservice/framework/test/BUILD.gn @@ -47,7 +47,9 @@ config("module_private_config") { "//third_party/json/single_include", ] cflags = [ "-Werror" ] - ldflags = [ "-Wl,--whole-archive" ] + ldflags = [ + "-Wl,-z,relro,-z,now,--whole-archive" + ] defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ] } diff --git a/services/distributeddataservice/service/BUILD.gn b/services/distributeddataservice/service/BUILD.gn index 952c92895..683dede32 100644 --- a/services/distributeddataservice/service/BUILD.gn +++ b/services/distributeddataservice/service/BUILD.gn @@ -65,7 +65,9 @@ ohos_shared_library("distributeddatasvc") { "-ffunction-sections", ] - ldflags = [ "-Wl,--gc-sections" ] + ldflags = [ + "-Wl,-z,relro,-z,now,--gc-sections" + ] cflags_cc = [ "-fvisibility=hidden", -- Gitee From f57aab520d329e441b47ced8dc61d8c03f772c26 Mon Sep 17 00:00:00 2001 From: l30005037 Date: Thu, 20 Mar 2025 22:07:28 +0800 Subject: [PATCH 2/4] Security and privacy compliance requirements Signed-off-by: l30005037 --- .../distributeddataservice/adapter/dfx/test/BUILD.gn | 12 +++--------- .../distributeddataservice/adapter/utils/BUILD.gn | 4 +--- services/distributeddataservice/app/BUILD.gn | 4 +--- .../distributeddataservice/app/src/checker/BUILD.gn | 4 +--- services/distributeddataservice/app/test/BUILD.gn | 4 +--- services/distributeddataservice/framework/BUILD.gn | 4 +--- .../distributeddataservice/framework/test/BUILD.gn | 4 +--- services/distributeddataservice/service/BUILD.gn | 4 +--- 8 files changed, 10 insertions(+), 30 deletions(-) diff --git a/services/distributeddataservice/adapter/dfx/test/BUILD.gn b/services/distributeddataservice/adapter/dfx/test/BUILD.gn index e7ee9c851..ff7b5fe6b 100755 --- a/services/distributeddataservice/adapter/dfx/test/BUILD.gn +++ b/services/distributeddataservice/adapter/dfx/test/BUILD.gn @@ -42,9 +42,7 @@ ohos_unittest("DistributeddataDfxMSTTest") { "kv_store:distributeddata_inner", "openssl:libcrypto_shared", ] - ldflags = [ - "-Wl,-z,relro,-z,now,--exclude-libs,ALL" - ] + ldflags = [ "-Wl,-z,relro,-z,now,--exclude-libs,ALL" ] deps = [ "${data_service_path}/adapter/dfx:distributeddata_dfx", "//third_party/googletest:gtest_main", @@ -85,9 +83,7 @@ ohos_unittest("DistributeddataDfxUTTest") { "kv_store:distributeddata_inner", "openssl:libcrypto_shared", ] - ldflags = [ - "-Wl,-z,relro,-z,now,--exclude-libs,ALL" - ] + ldflags = [ "-Wl,-z,relro,-z,now,--exclude-libs,ALL" ] deps = [ "${data_service_path}/adapter/dfx:distributeddata_dfx", "${data_service_path}/adapter/utils:distributeddata_utils", @@ -119,9 +115,7 @@ ohos_unittest("HiViewAdapterDfxTest") { "kv_store:distributeddata_mgr", "openssl:libcrypto_shared", ] - ldflags = [ - "-Wl,-z,relro,-z,now,--exclude-libs,ALL" - ] + ldflags = [ "-Wl,-z,relro,-z,now,--exclude-libs,ALL" ] deps = [ "${data_service_path}/adapter/communicator:distributeddata_communicator", "${data_service_path}/adapter/dfx:distributeddata_dfx", diff --git a/services/distributeddataservice/adapter/utils/BUILD.gn b/services/distributeddataservice/adapter/utils/BUILD.gn index 2c6bbb08a..f96b7fe3e 100755 --- a/services/distributeddataservice/adapter/utils/BUILD.gn +++ b/services/distributeddataservice/adapter/utils/BUILD.gn @@ -31,9 +31,7 @@ ohos_source_set("distributeddata_utils") { } include_dirs = [ "../include/utils" ] - ldflags = [ - "-Wl,-z,relro,-z,now,--exclude-libs,ALL" - ] + ldflags = [ "-Wl,-z,relro,-z,now,--exclude-libs,ALL" ] external_deps = [ "c_utils:utils", diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index 55b8a8ac4..7748c2fda 100644 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -83,9 +83,7 @@ config("module_private_config") { "-Oz", ] - ldflags = [ - "-Wl,-z,relro,-z,now,--gc-sections" - ] + ldflags = [ "-Wl,-z,relro,-z,now,--gc-sections" ] } ohos_shared_library("distributeddataservice") { diff --git a/services/distributeddataservice/app/src/checker/BUILD.gn b/services/distributeddataservice/app/src/checker/BUILD.gn index 544f496ac..575e9fad2 100644 --- a/services/distributeddataservice/app/src/checker/BUILD.gn +++ b/services/distributeddataservice/app/src/checker/BUILD.gn @@ -37,9 +37,7 @@ ohos_source_set("distributeddata_checker") { if (build_public_version) { cflags_cc += [ "-DCONFIG_PUBLIC_VERSION" ] } - ldflags = [ - "-Wl,-z,relro,-z,now,--exclude-libs,ALL" - ] + ldflags = [ "-Wl,-z,relro,-z,now,--exclude-libs,ALL" ] deps = [ "${data_service_path}/adapter/utils:distributeddata_utils" ] cflags = [ "-Oz" ] external_deps = [ diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index 774e98288..f8ae56963 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -65,9 +65,7 @@ config("module_private_config") { "-Dprivate=public", "-Dprotected=public", ] - ldflags = [ - "-Wl,-z,relro,-z,now,--whole-archive" - ] + ldflags = [ "-Wl,-z,relro,-z,now,--whole-archive" ] defines = [ "TEST_ON_DEVICE", "OPENSSL_SUPPRESS_DEPRECATED", diff --git a/services/distributeddataservice/framework/BUILD.gn b/services/distributeddataservice/framework/BUILD.gn index 7d6ae6b90..a4b707a6e 100644 --- a/services/distributeddataservice/framework/BUILD.gn +++ b/services/distributeddataservice/framework/BUILD.gn @@ -125,9 +125,7 @@ ohos_shared_library("distributeddatasvcfwk") { "-ffunction-sections", ] - ldflags = [ - "-Wl,-z,relro,-z,now,--gc-sections" - ] + ldflags = [ "-Wl,-z,relro,-z,now,--gc-sections" ] cflags_cc = [ "-fvisibility=hidden" ] diff --git a/services/distributeddataservice/framework/test/BUILD.gn b/services/distributeddataservice/framework/test/BUILD.gn index 8b3706750..2cd08bc3d 100644 --- a/services/distributeddataservice/framework/test/BUILD.gn +++ b/services/distributeddataservice/framework/test/BUILD.gn @@ -47,9 +47,7 @@ config("module_private_config") { "//third_party/json/single_include", ] cflags = [ "-Werror" ] - ldflags = [ - "-Wl,-z,relro,-z,now,--whole-archive" - ] + ldflags = [ "-Wl,-z,relro,-z,now,--whole-archive" ] defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ] } diff --git a/services/distributeddataservice/service/BUILD.gn b/services/distributeddataservice/service/BUILD.gn index 683dede32..6274b1d1c 100644 --- a/services/distributeddataservice/service/BUILD.gn +++ b/services/distributeddataservice/service/BUILD.gn @@ -65,9 +65,7 @@ ohos_shared_library("distributeddatasvc") { "-ffunction-sections", ] - ldflags = [ - "-Wl,-z,relro,-z,now,--gc-sections" - ] + ldflags = [ "-Wl,-z,relro,-z,now,--gc-sections" ] cflags_cc = [ "-fvisibility=hidden", -- Gitee From 6a867f0d127508e71ed68022df3c1427fb00c11d Mon Sep 17 00:00:00 2001 From: l30005037 Date: Sat, 22 Mar 2025 09:48:47 +0800 Subject: [PATCH 3/4] Security and privacy compliance requirements Signed-off-by: l30005037 --- .../adapter/account/BUILD.gn | 5 ++- .../adapter/account/test/BUILD.gn | 1 + .../adapter/communicator/BUILD.gn | 5 ++- .../adapter/communicator/test/BUILD.gn | 7 +++++ .../fuzztest/softbusadapter_fuzzer/BUILD.gn | 1 + .../adapter/dfx/BUILD.gn | 5 ++- .../adapter/dfx/test/BUILD.gn | 1 + .../adapter/network/BUILD.gn | 2 ++ .../adapter/network/test/BUILD.gn | 2 ++ .../adapter/schema_helper/BUILD.gn | 5 ++- .../adapter/screenlock/BUILD.gn | 5 ++- .../adapter/screenlock/test/BUILD.gn | 1 + .../adapter/utils/BUILD.gn | 5 ++- services/distributeddataservice/app/BUILD.gn | 2 ++ .../app/src/checker/BUILD.gn | 6 +++- .../app/src/installer/BUILD.gn | 6 +++- .../distributeddataservice/app/test/BUILD.gn | 7 ++++- .../fuzztest/dataservicestub_fuzzer/BUILD.gn | 1 + .../distributeddataservice/framework/BUILD.gn | 6 +++- .../framework/test/BUILD.gn | 7 ++++- .../rust/connect_adapter/BUILD.gn | 10 ++++-- .../rust/extension/BUILD.gn | 6 +++- .../distributeddataservice/service/BUILD.gn | 7 ++++- .../service/backup/BUILD.gn | 2 ++ .../service/bootstrap/BUILD.gn | 2 ++ .../service/cloud/BUILD.gn | 2 ++ .../service/common/BUILD.gn | 2 ++ .../service/config/BUILD.gn | 2 ++ .../service/crypto/BUILD.gn | 2 ++ .../service/data_share/BUILD.gn | 2 ++ .../service/dumper/BUILD.gn | 2 ++ .../service/kvdb/BUILD.gn | 2 ++ .../service/matrix/BUILD.gn | 2 ++ .../service/object/BUILD.gn | 2 ++ .../service/permission/BUILD.gn | 2 ++ .../service/rdb/BUILD.gn | 2 ++ .../service/test/BUILD.gn | 31 ++++++++++++++++++- .../fuzztest/cloudservicestub_fuzzer/BUILD.gn | 1 + .../datashareservicestub_fuzzer/BUILD.gn | 1 + .../test/fuzztest/dumphelper_fuzzer/BUILD.gn | 1 + .../fuzztest/kvdbservicestub_fuzzer/BUILD.gn | 1 + .../objectservicestub_fuzzer/BUILD.gn | 1 + .../fuzztest/rdbresultsetstub_fuzzer/BUILD.gn | 1 + .../fuzztest/rdbservicestub_fuzzer/BUILD.gn | 1 + .../test/fuzztest/udmfservice_fuzzer/BUILD.gn | 1 + .../service/udmf/BUILD.gn | 2 ++ 46 files changed, 154 insertions(+), 16 deletions(-) diff --git a/services/distributeddataservice/adapter/account/BUILD.gn b/services/distributeddataservice/adapter/account/BUILD.gn index 85697b11b..fc643f996 100755 --- a/services/distributeddataservice/adapter/account/BUILD.gn +++ b/services/distributeddataservice/adapter/account/BUILD.gn @@ -35,7 +35,10 @@ ohos_source_set("distributeddata_account") { "${data_service_path}/framework/include/account", ] - cflags_cc = [ "-fvisibility=hidden" ] + cflags_cc = [ + "-fvisibility=hidden", + "-fstack-protector-strong", + ] remove_configs = [ "//build/config/compiler:no_exceptions" ] diff --git a/services/distributeddataservice/adapter/account/test/BUILD.gn b/services/distributeddataservice/adapter/account/test/BUILD.gn index 39c09ee55..5340c802a 100755 --- a/services/distributeddataservice/adapter/account/test/BUILD.gn +++ b/services/distributeddataservice/adapter/account/test/BUILD.gn @@ -32,6 +32,7 @@ ohos_unittest("AccountDelegateTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ "../:distributeddata_account" ] diff --git a/services/distributeddataservice/adapter/communicator/BUILD.gn b/services/distributeddataservice/adapter/communicator/BUILD.gn index ff2d7cf86..522a20c21 100755 --- a/services/distributeddataservice/adapter/communicator/BUILD.gn +++ b/services/distributeddataservice/adapter/communicator/BUILD.gn @@ -49,7 +49,10 @@ ohos_source_set("distributeddata_communicator") { "${data_service_path}/framework/include/utils", ] - cflags_cc = [ "-fvisibility=hidden" ] + cflags_cc = [ + "-fvisibility=hidden", + "-fstack-protector-strong", + ] deps = [ "${data_service_path}/adapter/utils:distributeddata_utils", diff --git a/services/distributeddataservice/adapter/communicator/test/BUILD.gn b/services/distributeddataservice/adapter/communicator/test/BUILD.gn index 5e5a3489d..c18e1b084 100755 --- a/services/distributeddataservice/adapter/communicator/test/BUILD.gn +++ b/services/distributeddataservice/adapter/communicator/test/BUILD.gn @@ -65,6 +65,7 @@ ohos_unittest("CommunicatorContextTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ "${data_service_path}/adapter/communicator:distributeddata_communicator", @@ -88,6 +89,7 @@ ohos_unittest("CommunicatorDataBufferTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ "${data_service_path}/adapter/communicator:distributeddata_communicator", @@ -118,6 +120,7 @@ ohos_unittest("DeviceManagerAdapterTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ "${data_service_path}/adapter/communicator:distributeddata_communicator", @@ -174,6 +177,7 @@ ohos_unittest("ProcessCommunicatorImplTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ @@ -231,6 +235,7 @@ ohos_unittest("SoftbusAdapterStandardTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ "${data_service_path}/adapter/utils:distributeddata_utils", @@ -262,6 +267,7 @@ ohos_unittest("SoftbusClientTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ "${data_service_path}/adapter/communicator:distributeddata_communicator", @@ -292,6 +298,7 @@ ohos_unittest("AppPipeMgrServiceTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ "${data_service_path}/adapter/communicator:distributeddata_communicator", diff --git a/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn b/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn index cc55d56d7..01c09fe7b 100644 --- a/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn +++ b/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn @@ -33,6 +33,7 @@ ohos_fuzztest("SoftBusAdapterFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", + "-fstack-protector-strong", ] sources = [ "softbusadapter_fuzzer.cpp" ] diff --git a/services/distributeddataservice/adapter/dfx/BUILD.gn b/services/distributeddataservice/adapter/dfx/BUILD.gn index dc2a52cb3..483c45449 100644 --- a/services/distributeddataservice/adapter/dfx/BUILD.gn +++ b/services/distributeddataservice/adapter/dfx/BUILD.gn @@ -50,7 +50,10 @@ ohos_source_set("distributeddata_dfx") { "${data_service_path}/framework/include/utils", ] - cflags_cc = [ "-fvisibility=hidden" ] + cflags_cc = [ + "-fvisibility=hidden", + "-fstack-protector-strong", + ] external_deps = [ "c_utils:utils", diff --git a/services/distributeddataservice/adapter/dfx/test/BUILD.gn b/services/distributeddataservice/adapter/dfx/test/BUILD.gn index ff7b5fe6b..bc4d53b77 100755 --- a/services/distributeddataservice/adapter/dfx/test/BUILD.gn +++ b/services/distributeddataservice/adapter/dfx/test/BUILD.gn @@ -100,6 +100,7 @@ ohos_unittest("HiViewAdapterDfxTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] configs = [ ":module_dfx_config" ] diff --git a/services/distributeddataservice/adapter/network/BUILD.gn b/services/distributeddataservice/adapter/network/BUILD.gn index fb25666a3..f120004b8 100644 --- a/services/distributeddataservice/adapter/network/BUILD.gn +++ b/services/distributeddataservice/adapter/network/BUILD.gn @@ -37,6 +37,7 @@ ohos_source_set("distributeddata_network") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] configs = [ ":network_public_config" ] @@ -48,6 +49,7 @@ ohos_source_set("distributeddata_network") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", + "-fstack-protector-strong", ] external_deps = [ "kv_store:datamgr_common" ] diff --git a/services/distributeddataservice/adapter/network/test/BUILD.gn b/services/distributeddataservice/adapter/network/test/BUILD.gn index c1b564cc8..14277e488 100755 --- a/services/distributeddataservice/adapter/network/test/BUILD.gn +++ b/services/distributeddataservice/adapter/network/test/BUILD.gn @@ -32,6 +32,7 @@ ohos_unittest("NetworkDelegateTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ "../:distributeddata_network" ] @@ -66,6 +67,7 @@ ohos_unittest("NetworkDelegateNormalImplTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/adapter/schema_helper/BUILD.gn b/services/distributeddataservice/adapter/schema_helper/BUILD.gn index 26095037d..4bfbe3be2 100644 --- a/services/distributeddataservice/adapter/schema_helper/BUILD.gn +++ b/services/distributeddataservice/adapter/schema_helper/BUILD.gn @@ -29,7 +29,10 @@ ohos_source_set("distributeddata_schema_helper") { } sources = [ "src/get_schema_helper.cpp" ] - cflags_cc = [ "-fvisibility=hidden" ] + cflags_cc = [ + "-fvisibility=hidden", + "-fstack-protector-strong", + ] include_dirs = [ "../include/schema_helper" ] diff --git a/services/distributeddataservice/adapter/screenlock/BUILD.gn b/services/distributeddataservice/adapter/screenlock/BUILD.gn index ed1fd3913..28f3b0b78 100644 --- a/services/distributeddataservice/adapter/screenlock/BUILD.gn +++ b/services/distributeddataservice/adapter/screenlock/BUILD.gn @@ -24,7 +24,10 @@ ohos_source_set("distributeddata_screenlock") { } sources = [ "src/screen_lock.cpp" ] - cflags_cc = [ "-fvisibility=hidden" ] + cflags_cc = [ + "-fvisibility=hidden", + "-fstack-protector-strong", + ] include_dirs = [ "../include/screenlock", diff --git a/services/distributeddataservice/adapter/screenlock/test/BUILD.gn b/services/distributeddataservice/adapter/screenlock/test/BUILD.gn index f1f16b53b..962f8d9bc 100755 --- a/services/distributeddataservice/adapter/screenlock/test/BUILD.gn +++ b/services/distributeddataservice/adapter/screenlock/test/BUILD.gn @@ -33,6 +33,7 @@ ohos_unittest("ScreenLockTest") { "-Dprivate=public", "-Dprotected=public", "-Werror", + "-fstack-protector-strong", ] external_deps = [ diff --git a/services/distributeddataservice/adapter/utils/BUILD.gn b/services/distributeddataservice/adapter/utils/BUILD.gn index f96b7fe3e..8325bf050 100755 --- a/services/distributeddataservice/adapter/utils/BUILD.gn +++ b/services/distributeddataservice/adapter/utils/BUILD.gn @@ -24,7 +24,10 @@ ohos_source_set("distributeddata_utils") { } sources = [ "src/kvstore_utils.cpp" ] - cflags_cc = [ "-fvisibility=hidden" ] + cflags_cc = [ + "-fvisibility=hidden", + "-fstack-protector-strong", + ] if (build_public_version) { cflags_cc += [ "-DCONFIG_PUBLIC_VERSION" ] diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index 7748c2fda..b66d01341 100644 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -76,11 +76,13 @@ config("module_private_config") { "-Oz", "-fdata-sections", "-ffunction-sections", + "-fstack-protector-strong", ] cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] ldflags = [ "-Wl,-z,relro,-z,now,--gc-sections" ] diff --git a/services/distributeddataservice/app/src/checker/BUILD.gn b/services/distributeddataservice/app/src/checker/BUILD.gn index 575e9fad2..6695b0d65 100644 --- a/services/distributeddataservice/app/src/checker/BUILD.gn +++ b/services/distributeddataservice/app/src/checker/BUILD.gn @@ -30,6 +30,7 @@ ohos_source_set("distributeddata_checker") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] include_dirs = [ "${data_service_path}/framework/include" ] @@ -39,7 +40,10 @@ ohos_source_set("distributeddata_checker") { } ldflags = [ "-Wl,-z,relro,-z,now,--exclude-libs,ALL" ] deps = [ "${data_service_path}/adapter/utils:distributeddata_utils" ] - cflags = [ "-Oz" ] + cflags = [ + "-Oz", + "-fstack-protector-strong", + ] external_deps = [ "ability_base:base", "ability_base:want", diff --git a/services/distributeddataservice/app/src/installer/BUILD.gn b/services/distributeddataservice/app/src/installer/BUILD.gn index 0ccfc73e8..49eb62d2f 100644 --- a/services/distributeddataservice/app/src/installer/BUILD.gn +++ b/services/distributeddataservice/app/src/installer/BUILD.gn @@ -40,9 +40,13 @@ ohos_source_set("distributeddata_installer") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] - cflags = [ "-Oz" ] + cflags = [ + "-Oz", + "-fstack-protector-strong", + ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk", diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index f8ae56963..9b82df489 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -64,6 +64,7 @@ config("module_private_config") { "-Werror", "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] ldflags = [ "-Wl,-z,relro,-z,now,--whole-archive" ] defines = [ @@ -155,7 +156,10 @@ ohos_unittest("SessionManagerTest") { debug = false } - cflags_cc = [ "-DUT_TEST" ] + cflags_cc = [ + "-DUT_TEST", + "-fstack-protector-strong", + ] configs = [ ":module_private_config" ] external_deps = [ @@ -313,6 +317,7 @@ ohos_unittest("FeatureStubImplTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] if (datamgr_service_power) { diff --git a/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn index a04a1d620..55528a3c1 100644 --- a/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn @@ -59,6 +59,7 @@ ohos_fuzztest("DataServiceStubFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", + "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/framework/BUILD.gn b/services/distributeddataservice/framework/BUILD.gn index a4b707a6e..fafa407a3 100644 --- a/services/distributeddataservice/framework/BUILD.gn +++ b/services/distributeddataservice/framework/BUILD.gn @@ -123,11 +123,15 @@ ohos_shared_library("distributeddatasvcfwk") { "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-fdata-sections", "-ffunction-sections", + "-fstack-protector-strong", ] ldflags = [ "-Wl,-z,relro,-z,now,--gc-sections" ] - cflags_cc = [ "-fvisibility=hidden" ] + cflags_cc = [ + "-fvisibility=hidden", + "-fstack-protector-strong", + ] configs = [ ":module_config" ] diff --git a/services/distributeddataservice/framework/test/BUILD.gn b/services/distributeddataservice/framework/test/BUILD.gn index 2cd08bc3d..e814574a7 100644 --- a/services/distributeddataservice/framework/test/BUILD.gn +++ b/services/distributeddataservice/framework/test/BUILD.gn @@ -46,7 +46,10 @@ config("module_private_config") { "${data_service_path}/service/matrix/include", "//third_party/json/single_include", ] - cflags = [ "-Werror" ] + cflags = [ + "-Werror", + "-fstack-protector-strong", + ] ldflags = [ "-Wl,-z,relro,-z,now,--whole-archive" ] defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ] } @@ -127,6 +130,7 @@ ohos_unittest("ServiceUtilsTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] external_deps = [ @@ -163,6 +167,7 @@ ohos_unittest("StoreTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] external_deps = [ diff --git a/services/distributeddataservice/rust/connect_adapter/BUILD.gn b/services/distributeddataservice/rust/connect_adapter/BUILD.gn index 49162568b..292dc2003 100644 --- a/services/distributeddataservice/rust/connect_adapter/BUILD.gn +++ b/services/distributeddataservice/rust/connect_adapter/BUILD.gn @@ -34,8 +34,14 @@ ohos_shared_library("conn_adapter") { "src/connect_wrapper.cpp", ] configs = [ ":export_connect" ] - cflags = [ "-Werror" ] - cflags_cc = [ "-fvisibility=hidden" ] + cflags = [ + "-Werror", + "-fstack-protector-strong", + ] + cflags_cc = [ + "-fvisibility=hidden", + "-fstack-protector-strong", + ] external_deps = [ "ability_base:want", diff --git a/services/distributeddataservice/rust/extension/BUILD.gn b/services/distributeddataservice/rust/extension/BUILD.gn index d1c0fdc1d..6730b9901 100644 --- a/services/distributeddataservice/rust/extension/BUILD.gn +++ b/services/distributeddataservice/rust/extension/BUILD.gn @@ -47,9 +47,13 @@ ohos_shared_library("opencloudextension") { cflags = [ "-Werror", "-Wno-multichar", + "-fstack-protector-strong", ] - cflags_cc = [ "-fvisibility=hidden" ] + cflags_cc = [ + "-fvisibility=hidden", + "-fstack-protector-strong", + ] configs = [ ":module_public_config" ] diff --git a/services/distributeddataservice/service/BUILD.gn b/services/distributeddataservice/service/BUILD.gn index 6274b1d1c..b07724a03 100644 --- a/services/distributeddataservice/service/BUILD.gn +++ b/services/distributeddataservice/service/BUILD.gn @@ -42,7 +42,10 @@ config("module_public_config") { "${kv_store_distributeddb_path}/interfaces/include/", "${kv_store_distributeddb_path}/interfaces/include/relational", ] - cflags = [ "-Wno-c99-designator" ] + cflags = [ + "-Wno-c99-designator", + "-fstack-protector-strong", + ] } ohos_shared_library("distributeddatasvc") { @@ -63,6 +66,7 @@ ohos_shared_library("distributeddatasvc") { "-Oz", "-fdata-sections", "-ffunction-sections", + "-fstack-protector-strong", ] ldflags = [ "-Wl,-z,relro,-z,now,--gc-sections" ] @@ -70,6 +74,7 @@ ohos_shared_library("distributeddatasvc") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] configs = [ ":module_public_config" ] diff --git a/services/distributeddataservice/service/backup/BUILD.gn b/services/distributeddataservice/service/backup/BUILD.gn index 6b90fa32f..6a492ef4b 100755 --- a/services/distributeddataservice/service/backup/BUILD.gn +++ b/services/distributeddataservice/service/backup/BUILD.gn @@ -32,6 +32,7 @@ ohos_source_set("distributeddata_backup") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] include_dirs = [ @@ -46,6 +47,7 @@ ohos_source_set("distributeddata_backup") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", + "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/service/bootstrap/BUILD.gn b/services/distributeddataservice/service/bootstrap/BUILD.gn index ff48eaece..70b1c24c0 100644 --- a/services/distributeddataservice/service/bootstrap/BUILD.gn +++ b/services/distributeddataservice/service/bootstrap/BUILD.gn @@ -32,6 +32,7 @@ ohos_source_set("distributeddata_bootstrap") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] include_dirs = [ "${data_service_path}/service/config/include" ] @@ -43,6 +44,7 @@ ohos_source_set("distributeddata_bootstrap") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", + "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/service/cloud/BUILD.gn b/services/distributeddataservice/service/cloud/BUILD.gn index b36909c07..3c592276d 100755 --- a/services/distributeddataservice/service/cloud/BUILD.gn +++ b/services/distributeddataservice/service/cloud/BUILD.gn @@ -39,6 +39,7 @@ ohos_source_set("distributeddata_cloud") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] include_dirs = [ @@ -59,6 +60,7 @@ ohos_source_set("distributeddata_cloud") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", + "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/service/common/BUILD.gn b/services/distributeddataservice/service/common/BUILD.gn index 3a8e1990d..7a493bd1b 100644 --- a/services/distributeddataservice/service/common/BUILD.gn +++ b/services/distributeddataservice/service/common/BUILD.gn @@ -31,6 +31,7 @@ ohos_source_set("distributeddata_common") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] include_dirs = [ "include" ] @@ -40,6 +41,7 @@ ohos_source_set("distributeddata_common") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", + "-fstack-protector-strong", ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] diff --git a/services/distributeddataservice/service/config/BUILD.gn b/services/distributeddataservice/service/config/BUILD.gn index a2ea71cf4..9349f8113 100644 --- a/services/distributeddataservice/service/config/BUILD.gn +++ b/services/distributeddataservice/service/config/BUILD.gn @@ -39,6 +39,7 @@ ohos_source_set("distributeddata_config") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] include_dirs = [ @@ -52,6 +53,7 @@ ohos_source_set("distributeddata_config") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", + "-fstack-protector-strong", ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] diff --git a/services/distributeddataservice/service/crypto/BUILD.gn b/services/distributeddataservice/service/crypto/BUILD.gn index 2b8003be8..18b166a96 100644 --- a/services/distributeddataservice/service/crypto/BUILD.gn +++ b/services/distributeddataservice/service/crypto/BUILD.gn @@ -32,6 +32,7 @@ ohos_source_set("distributeddata_crypto") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] include_dirs = [ "include" ] @@ -42,6 +43,7 @@ ohos_source_set("distributeddata_crypto") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", + "-fstack-protector-strong", ] configs = [ ":crypto_public_config" ] public_configs = [ ":crypto_public_config" ] diff --git a/services/distributeddataservice/service/data_share/BUILD.gn b/services/distributeddataservice/service/data_share/BUILD.gn index 5f435aa5e..2964c14db 100644 --- a/services/distributeddataservice/service/data_share/BUILD.gn +++ b/services/distributeddataservice/service/data_share/BUILD.gn @@ -94,11 +94,13 @@ ohos_source_set("data_share_service") { "-Wno-multichar", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", + "-fstack-protector-strong", ] cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] configs = [ ":module_public_config" ] diff --git a/services/distributeddataservice/service/dumper/BUILD.gn b/services/distributeddataservice/service/dumper/BUILD.gn index 72b194d79..9ba04db73 100644 --- a/services/distributeddataservice/service/dumper/BUILD.gn +++ b/services/distributeddataservice/service/dumper/BUILD.gn @@ -27,6 +27,7 @@ ohos_source_set("distributeddata_dumper") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] include_dirs = [ "include" ] @@ -37,6 +38,7 @@ ohos_source_set("distributeddata_dumper") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", + "-fstack-protector-strong", ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] diff --git a/services/distributeddataservice/service/kvdb/BUILD.gn b/services/distributeddataservice/service/kvdb/BUILD.gn index 874dc361c..9f1d96dae 100644 --- a/services/distributeddataservice/service/kvdb/BUILD.gn +++ b/services/distributeddataservice/service/kvdb/BUILD.gn @@ -55,6 +55,7 @@ ohos_source_set("distributeddata_kvdb") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] cflags = [ @@ -63,6 +64,7 @@ ohos_source_set("distributeddata_kvdb") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", + "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/service/matrix/BUILD.gn b/services/distributeddataservice/service/matrix/BUILD.gn index e7f2d0a63..3499cbe6c 100755 --- a/services/distributeddataservice/service/matrix/BUILD.gn +++ b/services/distributeddataservice/service/matrix/BUILD.gn @@ -35,6 +35,7 @@ ohos_source_set("distributeddata_matrix") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] include_dirs = [ @@ -49,6 +50,7 @@ ohos_source_set("distributeddata_matrix") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", + "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/service/object/BUILD.gn b/services/distributeddataservice/service/object/BUILD.gn index e76a7510e..29056fe07 100644 --- a/services/distributeddataservice/service/object/BUILD.gn +++ b/services/distributeddataservice/service/object/BUILD.gn @@ -49,6 +49,7 @@ ohos_source_set("distributeddata_object") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] include_dirs = [ "include" ] @@ -61,6 +62,7 @@ ohos_source_set("distributeddata_object") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", + "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/service/permission/BUILD.gn b/services/distributeddataservice/service/permission/BUILD.gn index 2795bda98..0f28d2778 100644 --- a/services/distributeddataservice/service/permission/BUILD.gn +++ b/services/distributeddataservice/service/permission/BUILD.gn @@ -36,6 +36,7 @@ ohos_source_set("distributeddata_permit") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] include_dirs = [ @@ -51,6 +52,7 @@ ohos_source_set("distributeddata_permit") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", + "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/service/rdb/BUILD.gn b/services/distributeddataservice/service/rdb/BUILD.gn index 9c126c795..ad693d92d 100644 --- a/services/distributeddataservice/service/rdb/BUILD.gn +++ b/services/distributeddataservice/service/rdb/BUILD.gn @@ -63,6 +63,7 @@ ohos_source_set("distributeddata_rdb") { "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Werror", "-Oz", + "-fstack-protector-strong", ] deps = [ @@ -96,6 +97,7 @@ ohos_source_set("distributeddata_rdb") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] subsystem_name = "distributeddatamgr" diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn index 4d16dc1f1..32c82ccab 100755 --- a/services/distributeddataservice/service/test/BUILD.gn +++ b/services/distributeddataservice/service/test/BUILD.gn @@ -52,7 +52,10 @@ config("module_private_config") { "${relational_store_path}/interfaces/inner_api/common_type/include", "${data_service_path}/adapter/include/communicator", ] - cflags = [ "-Werror" ] + cflags = [ + "-Werror", + "-fstack-protector-strong", + ] defines = [ "TEST_ON_DEVICE", "OPENSSL_SUPPRESS_DEPRECATED", @@ -150,6 +153,7 @@ ohos_unittest("CloudDataTest") { cflags = [ "-fno-access-control", # Ignore Private Member Access Control + "-fstack-protector-strong", ] cflags_cc = cflags @@ -246,6 +250,7 @@ ohos_unittest("CloudServiceImplTest") { cflags = [ "-fno-access-control", # Ignore Private Member Access Control + "-fstack-protector-strong", ] cflags_cc = cflags @@ -294,6 +299,7 @@ ohos_unittest("ValueProxyServiceTest") { "-Dprotected=public", "-Wno-multichar", "-Wno-c99-designator", + "-fstack-protector-strong", ] external_deps = [ @@ -399,6 +405,7 @@ ohos_unittest("DeviceMatrixTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] external_deps = [ @@ -449,6 +456,7 @@ ohos_unittest("KVDBGeneralStoreTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] external_deps = [ @@ -517,6 +525,7 @@ ohos_unittest("KVDBGeneralStoreAbnormalTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] external_deps = [ @@ -566,6 +575,7 @@ ohos_unittest("RdbResultSetImplTest") { "-Dprotected=public", "-Wno-multichar", "-Wno-c99-designator", + "-fstack-protector-strong", ] external_deps = [ @@ -625,6 +635,7 @@ ohos_unittest("RdbServiceTest") { "-Wno-multichar", "-Wno-c99-designator", "-fno-access-control", # Ignore Private Member Access Control + "-fstack-protector-strong", ] external_deps = [ @@ -686,6 +697,7 @@ ohos_unittest("ObjectAssetLoaderTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] } @@ -756,6 +768,7 @@ ohos_unittest("ObjectDmsHandlerTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] } @@ -817,6 +830,7 @@ ohos_unittest("ObjectManagerTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] } @@ -1040,6 +1054,7 @@ ohos_unittest("DataShareServiceImplTest") { "-Wno-c99-designator", "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] external_deps = [ @@ -1114,6 +1129,7 @@ ohos_unittest("KvdbServiceImplTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] external_deps = [ @@ -1156,6 +1172,7 @@ ohos_unittest("DumpHelperTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] external_deps = [ @@ -1189,6 +1206,7 @@ ohos_unittest("UdmfServiceImplTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ @@ -1226,6 +1244,7 @@ ohos_unittest("UdmfServiceStubTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ @@ -1301,6 +1320,7 @@ ohos_unittest("UdmfServiceStubMockTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ "${data_service_path}/service:distributeddatasvc" ] @@ -1350,6 +1370,7 @@ ohos_unittest("UdmfCheckerManagerTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ @@ -1428,6 +1449,7 @@ ohos_unittest("PermissionValidatorMockTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ @@ -1469,6 +1491,7 @@ ohos_unittest("PermitDelegateMockTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] cflags_cc = cflags @@ -1544,6 +1567,7 @@ ohos_unittest("BootStrapMockTest") { "-Werror", "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] cflags_cc = cflags @@ -1571,6 +1595,7 @@ ohos_unittest("QueryHelperUnitTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] deps = [ @@ -1630,6 +1655,7 @@ ohos_unittest("AuthDelegateMockTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] cflags_cc = cflags @@ -1688,6 +1714,7 @@ ohos_unittest("UpgradeMockTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] cflags_cc = cflags @@ -1727,6 +1754,7 @@ ohos_unittest("UserDelegateMockTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] cflags_cc = cflags @@ -1759,6 +1787,7 @@ ohos_unittest("BackupManagerServiceTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", + "-fstack-protector-strong", ] external_deps = [ diff --git a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn index 3cb8f10bd..1202e1210 100644 --- a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn @@ -59,6 +59,7 @@ ohos_fuzztest("CloudServiceStubFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", + "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn index 67dd09415..081de015c 100644 --- a/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn @@ -48,6 +48,7 @@ ohos_fuzztest("DataShareServiceStubFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", + "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn index 2fd165553..75a5eea34 100644 --- a/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("DumpHelperFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", + "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn index 458b5897b..3f9651228 100644 --- a/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn @@ -55,6 +55,7 @@ ohos_fuzztest("KvdbServiceStubFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", + "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn index 336b0dbfc..459739baa 100755 --- a/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn @@ -55,6 +55,7 @@ ohos_fuzztest("ObjectServiceStubFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", + "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn index 984eddf37..effc420c1 100644 --- a/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn @@ -47,6 +47,7 @@ ohos_fuzztest("RdbResultSetStubFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", + "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn index e51d78511..89c31f950 100644 --- a/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn @@ -59,6 +59,7 @@ ohos_fuzztest("RdbServiceStubFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", + "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn index 723fdfcc9..0449b7bd0 100644 --- a/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn @@ -40,6 +40,7 @@ ohos_fuzztest("UdmfServiceFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", + "-fstack-protector-strong", ] sources = [ "udmfservice_fuzzer.cpp" ] diff --git a/services/distributeddataservice/service/udmf/BUILD.gn b/services/distributeddataservice/service/udmf/BUILD.gn index 5d0f44c13..6a51944f7 100644 --- a/services/distributeddataservice/service/udmf/BUILD.gn +++ b/services/distributeddataservice/service/udmf/BUILD.gn @@ -70,6 +70,7 @@ ohos_source_set("udmf_server") { "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Werror", "-Oz", + "-fstack-protector-strong", ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] @@ -92,6 +93,7 @@ ohos_source_set("udmf_server") { cflags_cc = [ "-fvisibility=hidden", "-Oz", + "-fstack-protector-strong", ] subsystem_name = "distributeddatamgr" -- Gitee From 447ad4edc2f8a586f83a1afd7806975030688991 Mon Sep 17 00:00:00 2001 From: l30005037 Date: Sat, 22 Mar 2025 10:39:19 +0800 Subject: [PATCH 4/4] Security and privacy compliance requirements Signed-off-by: l30005037 --- .../adapter/account/test/BUILD.gn | 1 - .../adapter/communicator/test/BUILD.gn | 7 ----- .../fuzztest/softbusadapter_fuzzer/BUILD.gn | 1 - .../adapter/dfx/test/BUILD.gn | 7 ++--- .../adapter/network/test/BUILD.gn | 2 -- .../adapter/screenlock/test/BUILD.gn | 1 - .../distributeddataservice/app/test/BUILD.gn | 9 ++---- .../fuzztest/dataservicestub_fuzzer/BUILD.gn | 1 - .../framework/test/BUILD.gn | 9 ++---- .../service/test/BUILD.gn | 31 +------------------ .../fuzztest/cloudservicestub_fuzzer/BUILD.gn | 1 - .../datashareservicestub_fuzzer/BUILD.gn | 1 - .../test/fuzztest/dumphelper_fuzzer/BUILD.gn | 1 - .../fuzztest/kvdbservicestub_fuzzer/BUILD.gn | 1 - .../objectservicestub_fuzzer/BUILD.gn | 1 - .../fuzztest/rdbresultsetstub_fuzzer/BUILD.gn | 1 - .../fuzztest/rdbservicestub_fuzzer/BUILD.gn | 1 - .../test/fuzztest/udmfservice_fuzzer/BUILD.gn | 1 - 18 files changed, 8 insertions(+), 69 deletions(-) diff --git a/services/distributeddataservice/adapter/account/test/BUILD.gn b/services/distributeddataservice/adapter/account/test/BUILD.gn index 5340c802a..39c09ee55 100755 --- a/services/distributeddataservice/adapter/account/test/BUILD.gn +++ b/services/distributeddataservice/adapter/account/test/BUILD.gn @@ -32,7 +32,6 @@ ohos_unittest("AccountDelegateTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ "../:distributeddata_account" ] diff --git a/services/distributeddataservice/adapter/communicator/test/BUILD.gn b/services/distributeddataservice/adapter/communicator/test/BUILD.gn index c18e1b084..5e5a3489d 100755 --- a/services/distributeddataservice/adapter/communicator/test/BUILD.gn +++ b/services/distributeddataservice/adapter/communicator/test/BUILD.gn @@ -65,7 +65,6 @@ ohos_unittest("CommunicatorContextTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ "${data_service_path}/adapter/communicator:distributeddata_communicator", @@ -89,7 +88,6 @@ ohos_unittest("CommunicatorDataBufferTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ "${data_service_path}/adapter/communicator:distributeddata_communicator", @@ -120,7 +118,6 @@ ohos_unittest("DeviceManagerAdapterTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ "${data_service_path}/adapter/communicator:distributeddata_communicator", @@ -177,7 +174,6 @@ ohos_unittest("ProcessCommunicatorImplTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ @@ -235,7 +231,6 @@ ohos_unittest("SoftbusAdapterStandardTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ "${data_service_path}/adapter/utils:distributeddata_utils", @@ -267,7 +262,6 @@ ohos_unittest("SoftbusClientTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ "${data_service_path}/adapter/communicator:distributeddata_communicator", @@ -298,7 +292,6 @@ ohos_unittest("AppPipeMgrServiceTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ "${data_service_path}/adapter/communicator:distributeddata_communicator", diff --git a/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn b/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn index 01c09fe7b..cc55d56d7 100644 --- a/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn +++ b/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn @@ -33,7 +33,6 @@ ohos_fuzztest("SoftBusAdapterFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", - "-fstack-protector-strong", ] sources = [ "softbusadapter_fuzzer.cpp" ] diff --git a/services/distributeddataservice/adapter/dfx/test/BUILD.gn b/services/distributeddataservice/adapter/dfx/test/BUILD.gn index bc4d53b77..78a3fa45b 100755 --- a/services/distributeddataservice/adapter/dfx/test/BUILD.gn +++ b/services/distributeddataservice/adapter/dfx/test/BUILD.gn @@ -42,7 +42,7 @@ ohos_unittest("DistributeddataDfxMSTTest") { "kv_store:distributeddata_inner", "openssl:libcrypto_shared", ] - ldflags = [ "-Wl,-z,relro,-z,now,--exclude-libs,ALL" ] + ldflags = [ "-Wl,--exclude-libs,ALL" ] deps = [ "${data_service_path}/adapter/dfx:distributeddata_dfx", "//third_party/googletest:gtest_main", @@ -83,7 +83,7 @@ ohos_unittest("DistributeddataDfxUTTest") { "kv_store:distributeddata_inner", "openssl:libcrypto_shared", ] - ldflags = [ "-Wl,-z,relro,-z,now,--exclude-libs,ALL" ] + ldflags = [ "-Wl,--exclude-libs,ALL" ] deps = [ "${data_service_path}/adapter/dfx:distributeddata_dfx", "${data_service_path}/adapter/utils:distributeddata_utils", @@ -100,7 +100,6 @@ ohos_unittest("HiViewAdapterDfxTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] configs = [ ":module_dfx_config" ] @@ -116,7 +115,7 @@ ohos_unittest("HiViewAdapterDfxTest") { "kv_store:distributeddata_mgr", "openssl:libcrypto_shared", ] - ldflags = [ "-Wl,-z,relro,-z,now,--exclude-libs,ALL" ] + ldflags = [ "-Wl,--exclude-libs,ALL" ] deps = [ "${data_service_path}/adapter/communicator:distributeddata_communicator", "${data_service_path}/adapter/dfx:distributeddata_dfx", diff --git a/services/distributeddataservice/adapter/network/test/BUILD.gn b/services/distributeddataservice/adapter/network/test/BUILD.gn index 14277e488..c1b564cc8 100755 --- a/services/distributeddataservice/adapter/network/test/BUILD.gn +++ b/services/distributeddataservice/adapter/network/test/BUILD.gn @@ -32,7 +32,6 @@ ohos_unittest("NetworkDelegateTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ "../:distributeddata_network" ] @@ -67,7 +66,6 @@ ohos_unittest("NetworkDelegateNormalImplTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/adapter/screenlock/test/BUILD.gn b/services/distributeddataservice/adapter/screenlock/test/BUILD.gn index 962f8d9bc..f1f16b53b 100755 --- a/services/distributeddataservice/adapter/screenlock/test/BUILD.gn +++ b/services/distributeddataservice/adapter/screenlock/test/BUILD.gn @@ -33,7 +33,6 @@ ohos_unittest("ScreenLockTest") { "-Dprivate=public", "-Dprotected=public", "-Werror", - "-fstack-protector-strong", ] external_deps = [ diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index 9b82df489..f3f912893 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -64,9 +64,8 @@ config("module_private_config") { "-Werror", "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] - ldflags = [ "-Wl,-z,relro,-z,now,--whole-archive" ] + ldflags = [ "-Wl,--whole-archive" ] defines = [ "TEST_ON_DEVICE", "OPENSSL_SUPPRESS_DEPRECATED", @@ -156,10 +155,7 @@ ohos_unittest("SessionManagerTest") { debug = false } - cflags_cc = [ - "-DUT_TEST", - "-fstack-protector-strong", - ] + cflags_cc = [ "-DUT_TEST" ] configs = [ ":module_private_config" ] external_deps = [ @@ -317,7 +313,6 @@ ohos_unittest("FeatureStubImplTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] if (datamgr_service_power) { diff --git a/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn index 55528a3c1..a04a1d620 100644 --- a/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn @@ -59,7 +59,6 @@ ohos_fuzztest("DataServiceStubFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", - "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/framework/test/BUILD.gn b/services/distributeddataservice/framework/test/BUILD.gn index e814574a7..728d05f26 100644 --- a/services/distributeddataservice/framework/test/BUILD.gn +++ b/services/distributeddataservice/framework/test/BUILD.gn @@ -46,11 +46,8 @@ config("module_private_config") { "${data_service_path}/service/matrix/include", "//third_party/json/single_include", ] - cflags = [ - "-Werror", - "-fstack-protector-strong", - ] - ldflags = [ "-Wl,-z,relro,-z,now,--whole-archive" ] + cflags = [ "-Werror" ] + ldflags = [ "-Wl,--whole-archive" ] defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ] } @@ -130,7 +127,6 @@ ohos_unittest("ServiceUtilsTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] external_deps = [ @@ -167,7 +163,6 @@ ohos_unittest("StoreTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] external_deps = [ diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn index 32c82ccab..4d16dc1f1 100755 --- a/services/distributeddataservice/service/test/BUILD.gn +++ b/services/distributeddataservice/service/test/BUILD.gn @@ -52,10 +52,7 @@ config("module_private_config") { "${relational_store_path}/interfaces/inner_api/common_type/include", "${data_service_path}/adapter/include/communicator", ] - cflags = [ - "-Werror", - "-fstack-protector-strong", - ] + cflags = [ "-Werror" ] defines = [ "TEST_ON_DEVICE", "OPENSSL_SUPPRESS_DEPRECATED", @@ -153,7 +150,6 @@ ohos_unittest("CloudDataTest") { cflags = [ "-fno-access-control", # Ignore Private Member Access Control - "-fstack-protector-strong", ] cflags_cc = cflags @@ -250,7 +246,6 @@ ohos_unittest("CloudServiceImplTest") { cflags = [ "-fno-access-control", # Ignore Private Member Access Control - "-fstack-protector-strong", ] cflags_cc = cflags @@ -299,7 +294,6 @@ ohos_unittest("ValueProxyServiceTest") { "-Dprotected=public", "-Wno-multichar", "-Wno-c99-designator", - "-fstack-protector-strong", ] external_deps = [ @@ -405,7 +399,6 @@ ohos_unittest("DeviceMatrixTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] external_deps = [ @@ -456,7 +449,6 @@ ohos_unittest("KVDBGeneralStoreTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] external_deps = [ @@ -525,7 +517,6 @@ ohos_unittest("KVDBGeneralStoreAbnormalTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] external_deps = [ @@ -575,7 +566,6 @@ ohos_unittest("RdbResultSetImplTest") { "-Dprotected=public", "-Wno-multichar", "-Wno-c99-designator", - "-fstack-protector-strong", ] external_deps = [ @@ -635,7 +625,6 @@ ohos_unittest("RdbServiceTest") { "-Wno-multichar", "-Wno-c99-designator", "-fno-access-control", # Ignore Private Member Access Control - "-fstack-protector-strong", ] external_deps = [ @@ -697,7 +686,6 @@ ohos_unittest("ObjectAssetLoaderTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] } @@ -768,7 +756,6 @@ ohos_unittest("ObjectDmsHandlerTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] } @@ -830,7 +817,6 @@ ohos_unittest("ObjectManagerTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] } @@ -1054,7 +1040,6 @@ ohos_unittest("DataShareServiceImplTest") { "-Wno-c99-designator", "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] external_deps = [ @@ -1129,7 +1114,6 @@ ohos_unittest("KvdbServiceImplTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] external_deps = [ @@ -1172,7 +1156,6 @@ ohos_unittest("DumpHelperTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] external_deps = [ @@ -1206,7 +1189,6 @@ ohos_unittest("UdmfServiceImplTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ @@ -1244,7 +1226,6 @@ ohos_unittest("UdmfServiceStubTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ @@ -1320,7 +1301,6 @@ ohos_unittest("UdmfServiceStubMockTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ "${data_service_path}/service:distributeddatasvc" ] @@ -1370,7 +1350,6 @@ ohos_unittest("UdmfCheckerManagerTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ @@ -1449,7 +1428,6 @@ ohos_unittest("PermissionValidatorMockTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ @@ -1491,7 +1469,6 @@ ohos_unittest("PermitDelegateMockTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] cflags_cc = cflags @@ -1567,7 +1544,6 @@ ohos_unittest("BootStrapMockTest") { "-Werror", "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] cflags_cc = cflags @@ -1595,7 +1571,6 @@ ohos_unittest("QueryHelperUnitTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] deps = [ @@ -1655,7 +1630,6 @@ ohos_unittest("AuthDelegateMockTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] cflags_cc = cflags @@ -1714,7 +1688,6 @@ ohos_unittest("UpgradeMockTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] cflags_cc = cflags @@ -1754,7 +1727,6 @@ ohos_unittest("UserDelegateMockTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] cflags_cc = cflags @@ -1787,7 +1759,6 @@ ohos_unittest("BackupManagerServiceTest") { cflags = [ "-Dprivate=public", "-Dprotected=public", - "-fstack-protector-strong", ] external_deps = [ diff --git a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn index 1202e1210..3cb8f10bd 100644 --- a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn @@ -59,7 +59,6 @@ ohos_fuzztest("CloudServiceStubFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", - "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn index 081de015c..67dd09415 100644 --- a/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn @@ -48,7 +48,6 @@ ohos_fuzztest("DataShareServiceStubFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", - "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn index 75a5eea34..2fd165553 100644 --- a/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn @@ -44,7 +44,6 @@ ohos_fuzztest("DumpHelperFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", - "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn index 3f9651228..458b5897b 100644 --- a/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn @@ -55,7 +55,6 @@ ohos_fuzztest("KvdbServiceStubFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", - "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn index 459739baa..336b0dbfc 100755 --- a/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/objectservicestub_fuzzer/BUILD.gn @@ -55,7 +55,6 @@ ohos_fuzztest("ObjectServiceStubFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", - "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn index effc420c1..984eddf37 100644 --- a/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/rdbresultsetstub_fuzzer/BUILD.gn @@ -47,7 +47,6 @@ ohos_fuzztest("RdbResultSetStubFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", - "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn index 89c31f950..e51d78511 100644 --- a/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn @@ -59,7 +59,6 @@ ohos_fuzztest("RdbServiceStubFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", - "-fstack-protector-strong", ] sources = [ diff --git a/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn index 0449b7bd0..723fdfcc9 100644 --- a/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/udmfservice_fuzzer/BUILD.gn @@ -40,7 +40,6 @@ ohos_fuzztest("UdmfServiceFuzzTest") { "-O0", "-Wno-unused-variable", "-fno-omit-frame-pointer", - "-fstack-protector-strong", ] sources = [ "udmfservice_fuzzer.cpp" ] -- Gitee