From e6d5420c5ac34fdcbf679452cac75f39f27b03ba Mon Sep 17 00:00:00 2001 From: yuzhaoyang Date: Wed, 20 Sep 2023 10:07:56 +0800 Subject: [PATCH] Code Check Warning Cleanup Signed-off-by: yuzhaoyang --- .../local_code_sign/include/local_code_sign_client.h | 2 +- .../include/local_code_sign_interface.h | 4 ++-- .../local_code_sign/include/local_code_sign_proxy.h | 4 ++-- .../local_code_sign/src/local_code_sign_client.cpp | 4 ++-- .../local_code_sign/include/local_code_sign_stub.h | 2 +- .../signlocalcodestub_fuzzer.cpp | 2 +- test/unittest/code_sign_utils_test.cpp | 12 ++++++------ 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_client.h b/interfaces/innerkits/local_code_sign/include/local_code_sign_client.h index 7aa4390..2400ced 100644 --- a/interfaces/innerkits/local_code_sign/include/local_code_sign_client.h +++ b/interfaces/innerkits/local_code_sign/include/local_code_sign_client.h @@ -59,7 +59,7 @@ private: std::mutex proxyMutex_; std::condition_variable proxyConVar_; - sptr localCodeSignProxy_ = nullptr; + sptr localCodeSignProxy_ = nullptr; sptr localCodeSignSvrRecipient_ = nullptr; }; diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_interface.h b/interfaces/innerkits/local_code_sign/include/local_code_sign_interface.h index 9498864..c78b0b2 100644 --- a/interfaces/innerkits/local_code_sign/include/local_code_sign_interface.h +++ b/interfaces/innerkits/local_code_sign/include/local_code_sign_interface.h @@ -26,9 +26,9 @@ namespace Security { namespace CodeSign { constexpr int LOCAL_CODE_SIGN_SA_ID = 3507; -class ILocalCodeSign : public OHOS::IRemoteBroker { +class LocalCodeSignInterface : public OHOS::IRemoteBroker { public: - DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.Security.ILocalCodeSign"); + DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.Security.LocalCodeSignInterface"); virtual int32_t InitLocalCertificate(ByteBuffer &cert) = 0; virtual int32_t SignLocalCode(const std::string &filePath, ByteBuffer &signature) = 0; }; diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_proxy.h b/interfaces/innerkits/local_code_sign/include/local_code_sign_proxy.h index bfac89c..5845328 100644 --- a/interfaces/innerkits/local_code_sign/include/local_code_sign_proxy.h +++ b/interfaces/innerkits/local_code_sign/include/local_code_sign_proxy.h @@ -23,10 +23,10 @@ namespace OHOS { namespace Security { namespace CodeSign { -class LocalCodeSignProxy : public IRemoteProxy { +class LocalCodeSignProxy : public IRemoteProxy { public: explicit LocalCodeSignProxy(const sptr &impl) - : IRemoteProxy(impl) {} + : IRemoteProxy(impl) {} ~LocalCodeSignProxy() {} int32_t InitLocalCertificate(ByteBuffer &cert) override; int32_t SignLocalCode(const std::string &filePath, ByteBuffer &signature) override; diff --git a/interfaces/innerkits/local_code_sign/src/local_code_sign_client.cpp b/interfaces/innerkits/local_code_sign/src/local_code_sign_client.cpp index 235bf74..974981f 100644 --- a/interfaces/innerkits/local_code_sign/src/local_code_sign_client.cpp +++ b/interfaces/innerkits/local_code_sign/src/local_code_sign_client.cpp @@ -84,7 +84,7 @@ void LocalCodeSignClient::FinishStartSA(const sptr &remoteObject) if (!remoteObject->AddDeathRecipient(localCodeSignSvrRecipient_)) { LOG_ERROR(LABEL, "AddDeathRecipient failed"); } - localCodeSignProxy_ = iface_cast(remoteObject); + localCodeSignProxy_ = iface_cast(remoteObject); if ((localCodeSignProxy_ == nullptr) || (localCodeSignProxy_->AsObject() == nullptr)) { LOG_ERROR(LABEL, "Get code sign proxy failed."); return; @@ -113,7 +113,7 @@ void LocalCodeSignClient::CheckLocalCodeSignProxy() } auto remoteObject = samgr->CheckSystemAbility(LOCAL_CODE_SIGN_SA_ID); if (remoteObject != nullptr) { - localCodeSignProxy_ = iface_cast(remoteObject); + localCodeSignProxy_ = iface_cast(remoteObject); return; } } diff --git a/services/local_code_sign/include/local_code_sign_stub.h b/services/local_code_sign/include/local_code_sign_stub.h index f76512c..5b95a5f 100644 --- a/services/local_code_sign/include/local_code_sign_stub.h +++ b/services/local_code_sign/include/local_code_sign_stub.h @@ -22,7 +22,7 @@ namespace OHOS { namespace Security { namespace CodeSign { -class LocalCodeSignStub : public IRemoteStub { +class LocalCodeSignStub : public IRemoteStub { public: LocalCodeSignStub(); ~LocalCodeSignStub(); diff --git a/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/signlocalcodestub_fuzzer.cpp b/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/signlocalcodestub_fuzzer.cpp index f40b5a1..8ed4e37 100644 --- a/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/signlocalcodestub_fuzzer.cpp +++ b/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/signlocalcodestub_fuzzer.cpp @@ -49,7 +49,7 @@ namespace OHOS { } std::string testName(reinterpret_cast(data), size); MessageParcel datas; - datas.WriteInterfaceToken(ILocalCodeSign::GetDescriptor()); + datas.WriteInterfaceToken(LocalCodeSignInterface::GetDescriptor()); if (!datas.WriteString(testName)) { return false; } diff --git a/test/unittest/code_sign_utils_test.cpp b/test/unittest/code_sign_utils_test.cpp index 5acada5..fd4c39b 100644 --- a/test/unittest/code_sign_utils_test.cpp +++ b/test/unittest/code_sign_utils_test.cpp @@ -53,7 +53,7 @@ static EntryMap g_wrongHapWithMultiLibRetFail = { APP_BASE_PATH + "/demo_with_multi_lib_error/libs/arm64-v8a/libentry.so"}}; // examples of Enforce code signature for app -static const std::vector g_HapWithoutLibSigPkcs7ErrorPath({ +static const std::vector g_HapWithoutLibSigPkcs7ErrorPath = { TMP_BASE_PATH + "/demo_without_lib/pkcs7_error/demo_without_lib_001.sig", // Ilegal pkcs7 format TMP_BASE_PATH + "/demo_without_lib/pkcs7_error/demo_without_lib_002.sig", // Disable to find cert chain TMP_BASE_PATH + "/demo_without_lib/pkcs7_error/demo_without_lib_003.sig", // Don't support digest algorithm @@ -61,9 +61,9 @@ static const std::vector g_HapWithoutLibSigPkcs7ErrorPath({ TMP_BASE_PATH + "/demo_without_lib/pkcs7_error/demo_without_lib_005.sig", // Wrong signature TMP_BASE_PATH + "/demo_without_lib/pkcs7_error/demo_without_lib_006.sig", // Expired signature TMP_BASE_PATH + "/demo_without_lib/pkcs7_error/demo_without_lib_007.sig", // Cert chain validate fail -}); +}; -static const std::vector g_HapWithMultiLibSigPkcs7ErrorPath({ +static const std::vector g_HapWithMultiLibSigPkcs7ErrorPath = { TMP_BASE_PATH + "/demo_with_multi_lib/pkcs7_error/demo_with_multi_lib_001.sig", // Ilegal pkcs7 format TMP_BASE_PATH + "/demo_with_multi_lib/pkcs7_error/demo_with_multi_lib_002.sig", // Disable to find cert chain TMP_BASE_PATH + "/demo_with_multi_lib/pkcs7_error/demo_with_multi_lib_003.sig", // Don't support digest algorithm @@ -71,7 +71,7 @@ static const std::vector g_HapWithMultiLibSigPkcs7ErrorPath({ TMP_BASE_PATH + "/demo_with_multi_lib/pkcs7_error/demo_with_multi_lib_005.sig", // Wrong signature TMP_BASE_PATH + "/demo_with_multi_lib/pkcs7_error/demo_with_multi_lib_006.sig", // Expired signature TMP_BASE_PATH + "/demo_with_multi_lib/pkcs7_error/demo_with_multi_lib_007.sig", // Cert chain validate fail -}); +}; // examples of Enforce code signature for file static const std::string g_fileEnableSuc = APP_BASE_PATH + "/demo_with_multi_lib/libs/arm64-v8a/libentry.so"; @@ -82,7 +82,7 @@ static const std::string g_filesigEnablePath = static const std::string g_wrongFileEnableFail = APP_BASE_PATH + "/demo_with_multi_lib_error/libs/arm64-v8a/libentry.so"; -static const std::vector g_fileSigEnableFailPath({ +static const std::vector g_fileSigEnableFailPath = { TMP_BASE_PATH + "/demo_with_multi_lib/pkcs7_error/file/libentry_01.so.fsv-sig", // ilegal pkcs7 format TMP_BASE_PATH + "/demo_with_multi_lib/pkcs7_error/file/libentry_02.so.fsv-sig", // Disable to find cert chain TMP_BASE_PATH + "/demo_with_multi_lib/pkcs7_error/file/libentry_03.so.fsv-sig", // Don't support digest algorithm @@ -90,7 +90,7 @@ static const std::vector g_fileSigEnableFailPath({ TMP_BASE_PATH + "/demo_with_multi_lib/pkcs7_error/file/libentry_05.so.fsv-sig", // Wrong signature TMP_BASE_PATH + "/demo_with_multi_lib/pkcs7_error/file/libentry_06.so.fsv-sig", // Expired signature TMP_BASE_PATH + "/demo_with_multi_lib/pkcs7_error/file/libentry_07.so.fsv-sig", // Cert chain validate fail -}); +}; // examples of can't find the signature file static const EntryMap g_hapSigNotExist = { -- Gitee