From 1731c825439f25873c519ca76093a2a2f615848f Mon Sep 17 00:00:00 2001 From: z30034863 Date: Tue, 20 Aug 2024 15:18:38 +0800 Subject: [PATCH] =?UTF-8?q?HILOG=E6=B5=81=E6=B0=B4=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=95=86=E7=94=A8=E5=B8=B8=E5=BC=80=E5=AE=89=E5=85=A8=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=EF=BC=8C=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: z30034863 --- .../innerkits/appverify/src/init/trusted_ticket_manager.cpp | 2 +- interfaces/innerkits/appverify/src/ticket/ticket_verify.cpp | 4 ++-- .../appverify/src/util/hap_cert_verify_openssl_utils.cpp | 2 +- .../innerkits/appverify/src/util/hap_profile_verify_utils.cpp | 4 ++-- interfaces/innerkits/appverify/src/verify/hap_verify_v2.cpp | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/interfaces/innerkits/appverify/src/init/trusted_ticket_manager.cpp b/interfaces/innerkits/appverify/src/init/trusted_ticket_manager.cpp index 3299faa..0537414 100644 --- a/interfaces/innerkits/appverify/src/init/trusted_ticket_manager.cpp +++ b/interfaces/innerkits/appverify/src/init/trusted_ticket_manager.cpp @@ -137,7 +137,7 @@ bool TrustedTicketManager::ParseTrustedTicketSourceJson(TicketSourceInfoVec& tru HAPVERIFY_LOG_ERROR("Get critialcalCertExtension Failed"); return false; } - HAPVERIFY_LOG_INFO("trusted ticket source: %{public}s", + HAPVERIFY_LOG_INFO("trusted ticket source: %{private}s", EncapTrustedTicketSourceString(hapTicketSource).c_str()); trustedTicketSources.push_back(hapTicketSource); } diff --git a/interfaces/innerkits/appverify/src/ticket/ticket_verify.cpp b/interfaces/innerkits/appverify/src/ticket/ticket_verify.cpp index b5ad6be..f079b1d 100644 --- a/interfaces/innerkits/appverify/src/ticket/ticket_verify.cpp +++ b/interfaces/innerkits/appverify/src/ticket/ticket_verify.cpp @@ -187,11 +187,11 @@ bool VerifyTicketSignature(HapByteBuffer& ticketBlock, Pkcs7Context& pkcs7Contex pkcs7Context.matchResult = trustedTicketSourceManager.IsTrustedSource(certSubject, pkcs7Context.certIssuer, pkcs7Context.certChains[0].size()); if (pkcs7Context.matchResult.matchState == DO_NOT_MATCH) { - HAPVERIFY_LOG_ERROR("Ticket signature is not trusted source, subject: %{public}s, issuer: %{public}s", + HAPVERIFY_LOG_ERROR("Ticket signature is not trusted source, subject: %{private}s, issuer: %{public}s", certSubject.c_str(), pkcs7Context.certIssuer.c_str()); return false; } - HAPVERIFY_LOG_INFO("Ticket subject: %{public}s, issuer: %{public}s", + HAPVERIFY_LOG_INFO("Ticket subject: %{private}s, issuer: %{public}s", certSubject.c_str(), pkcs7Context.certIssuer.c_str()); return true; } diff --git a/interfaces/innerkits/appverify/src/util/hap_cert_verify_openssl_utils.cpp b/interfaces/innerkits/appverify/src/util/hap_cert_verify_openssl_utils.cpp index 0066934..3973a4c 100644 --- a/interfaces/innerkits/appverify/src/util/hap_cert_verify_openssl_utils.cpp +++ b/interfaces/innerkits/appverify/src/util/hap_cert_verify_openssl_utils.cpp @@ -133,7 +133,7 @@ bool HapCertVerifyOpensslUtils::GetFingerprintBase64FromPemCert(const std::strin fingerprint += buff; } X509_free(cert); - HAPVERIFY_LOG_DEBUG("GetFingerprintBase64FromPemCert end %{public}s", fingerprint.c_str()); + HAPVERIFY_LOG_DEBUG("GetFingerprintBase64FromPemCert end %{private}s", fingerprint.c_str()); return true; } diff --git a/interfaces/innerkits/appverify/src/util/hap_profile_verify_utils.cpp b/interfaces/innerkits/appverify/src/util/hap_profile_verify_utils.cpp index a1f8ca3..9b64124 100644 --- a/interfaces/innerkits/appverify/src/util/hap_profile_verify_utils.cpp +++ b/interfaces/innerkits/appverify/src/util/hap_profile_verify_utils.cpp @@ -69,11 +69,11 @@ bool HapProfileVerifyUtils::VerifyProfile(Pkcs7Context& pkcs7Context) pkcs7Context.matchResult = trustedSourceManager.IsTrustedSource(certSubject, certIssuer, PROFILE_BLOB, pkcs7Context.certChains[0].size()); if (pkcs7Context.matchResult.matchState == DO_NOT_MATCH) { - HAPVERIFY_LOG_ERROR("profile signature is not trusted source, subject: %{public}s, issuer: %{public}s", + HAPVERIFY_LOG_ERROR("profile signature is not trusted source, subject: %{private}s, issuer: %{public}s", certSubject.c_str(), certIssuer.c_str()); return false; } - HAPVERIFY_LOG_DEBUG("profile subject: %{public}s, issuer: %{public}s", + HAPVERIFY_LOG_DEBUG("profile subject: %{private}s, issuer: %{public}s", certSubject.c_str(), certIssuer.c_str()); return true; } diff --git a/interfaces/innerkits/appverify/src/verify/hap_verify_v2.cpp b/interfaces/innerkits/appverify/src/verify/hap_verify_v2.cpp index e0bcaa5..829f35b 100644 --- a/interfaces/innerkits/appverify/src/verify/hap_verify_v2.cpp +++ b/interfaces/innerkits/appverify/src/verify/hap_verify_v2.cpp @@ -151,7 +151,7 @@ bool HapVerifyV2::VerifyAppSourceAndParseProfile(Pkcs7Context& pkcs7Context, HAPVERIFY_LOG_ERROR("Get info of sign cert failed"); return false; } - HAPVERIFY_LOG_DEBUG("App signature subject: %{public}s, issuer: %{public}s", + HAPVERIFY_LOG_DEBUG("App signature subject: %{private}s, issuer: %{public}s", certSubject.c_str(), pkcs7Context.certIssuer.c_str()); TrustedSourceManager& trustedSourceManager = TrustedSourceManager::GetInstance(); @@ -262,7 +262,7 @@ bool HapVerifyV2::GenerateFingerprint(ProvisionInfo& provisionInfo) return false; } provisionInfo.fingerprint = fingerprint; - HAPVERIFY_LOG_DEBUG("fingerprint is : %{public}s", fingerprint.c_str()); + HAPVERIFY_LOG_DEBUG("fingerprint is : %{private}s", fingerprint.c_str()); return true; } -- Gitee