From 545f19bb34d4dbd0091e73ea852cf02050c0a967 Mon Sep 17 00:00:00 2001 From: wufengshan Date: Tue, 17 May 2022 14:31:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wufengshan --- .../adapter/account/src/account_delegate_normal_impl.cpp | 4 ++-- .../adapter/permission/src/bundle_checker.cpp | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/services/distributeddataservice/adapter/account/src/account_delegate_normal_impl.cpp b/services/distributeddataservice/adapter/account/src/account_delegate_normal_impl.cpp index c40dbf197..d32ce2b45 100644 --- a/services/distributeddataservice/adapter/account/src/account_delegate_normal_impl.cpp +++ b/services/distributeddataservice/adapter/account/src/account_delegate_normal_impl.cpp @@ -142,8 +142,8 @@ std::string AccountDelegateNormalImpl::Sha256AccountId(const std::string &plainT plain = atoll(plainText.substr(plainText.size() - int64MaxLen + 1, int64MaxLen - 1).c_str()); } - plain = htobe64(plain); - return Crypto::Sha256(static_cast(&plain), sizeof(plain), true); + auto plainVal = htobe64(plain); + return Crypto::Sha256(static_cast(&plainVal), sizeof(plainVal), true); } } // namespace DistributedKv } // namespace OHOS \ No newline at end of file diff --git a/services/distributeddataservice/adapter/permission/src/bundle_checker.cpp b/services/distributeddataservice/adapter/permission/src/bundle_checker.cpp index 4a1080f46..a2fa62d28 100644 --- a/services/distributeddataservice/adapter/permission/src/bundle_checker.cpp +++ b/services/distributeddataservice/adapter/permission/src/bundle_checker.cpp @@ -20,6 +20,7 @@ #include "hap_token_info.h" #include "log/log_print.h" #include "utils/crypto.h" +#include "utils/anonymous.h" namespace OHOS { namespace DistributedData { using namespace Security::AccessToken; @@ -64,7 +65,8 @@ std::string BundleChecker::GetAppId(const CheckerManager::StoreInfo &info) return info.bundleName; } - ZLOGD("bundleName:%{public}s, appId:%{public}s", info.bundleName.c_str(), tokenInfo.appID.c_str()); + ZLOGD("bundleName:%{public}s, appId:%{public}s", + info.bundleName.c_str(), Anonymous::Change(tokenInfo.appID).c_str()); return Crypto::Sha256(tokenInfo.appID); } -- Gitee From 74e8f7b79ccfabde0bca3bfff2497284becb3096 Mon Sep 17 00:00:00 2001 From: wufengshan Date: Tue, 17 May 2022 16:23:42 +0800 Subject: [PATCH 2/3] Signed-off-by: wufengshan Changes to be committed: --- .../adapter/permission/src/bundle_checker.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/distributeddataservice/adapter/permission/src/bundle_checker.cpp b/services/distributeddataservice/adapter/permission/src/bundle_checker.cpp index a2fa62d28..db2c9a15f 100644 --- a/services/distributeddataservice/adapter/permission/src/bundle_checker.cpp +++ b/services/distributeddataservice/adapter/permission/src/bundle_checker.cpp @@ -20,7 +20,6 @@ #include "hap_token_info.h" #include "log/log_print.h" #include "utils/crypto.h" -#include "utils/anonymous.h" namespace OHOS { namespace DistributedData { using namespace Security::AccessToken; @@ -66,7 +65,7 @@ std::string BundleChecker::GetAppId(const CheckerManager::StoreInfo &info) } ZLOGD("bundleName:%{public}s, appId:%{public}s", - info.bundleName.c_str(), Anonymous::Change(tokenInfo.appID).c_str()); + info.bundleName.c_str(), tokenInfo.appID.c_str()); return Crypto::Sha256(tokenInfo.appID); } -- Gitee From 662c1eb5beb70e4fb1cbfc80b5c264162e109917 Mon Sep 17 00:00:00 2001 From: wufengshan Date: Tue, 17 May 2022 16:25:25 +0800 Subject: [PATCH 3/3] Signed-off-by: wufengshan Changes to be committed: --- .../adapter/permission/src/bundle_checker.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/distributeddataservice/adapter/permission/src/bundle_checker.cpp b/services/distributeddataservice/adapter/permission/src/bundle_checker.cpp index db2c9a15f..4a1080f46 100644 --- a/services/distributeddataservice/adapter/permission/src/bundle_checker.cpp +++ b/services/distributeddataservice/adapter/permission/src/bundle_checker.cpp @@ -64,8 +64,7 @@ std::string BundleChecker::GetAppId(const CheckerManager::StoreInfo &info) return info.bundleName; } - ZLOGD("bundleName:%{public}s, appId:%{public}s", - info.bundleName.c_str(), tokenInfo.appID.c_str()); + ZLOGD("bundleName:%{public}s, appId:%{public}s", info.bundleName.c_str(), tokenInfo.appID.c_str()); return Crypto::Sha256(tokenInfo.appID); } -- Gitee