From 2c08ceba190c3b566c596f7a24840730e025cbfd Mon Sep 17 00:00:00 2001 From: xianqingchen Date: Tue, 5 Mar 2024 17:02:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=8B=E8=AF=95=E5=A5=97?= =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E8=AE=BE=E7=BD=AEcaller=20token=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xianqingchen --- test/unittest/src/cm_test_common.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test/unittest/src/cm_test_common.cpp b/test/unittest/src/cm_test_common.cpp index 66dcbc6..cbcf6df 100644 --- a/test/unittest/src/cm_test_common.cpp +++ b/test/unittest/src/cm_test_common.cpp @@ -27,10 +27,14 @@ #include "accesstoken_kit.h" #include "nativetoken_kit.h" #include "token_setproc.h" +#include namespace CertmanagerTest { +constexpr uint32_t SLEEP_TIME = 3; + void SetATPermission(void) { + static bool firstRun = true; const char **perms = new const char *[2]; // 2 permissions perms[0] = "ohos.permission.ACCESS_CERT_MANAGER_INTERNAL"; // system_basic perms[1] = "ohos.permission.ACCESS_CERT_MANAGER"; // normal @@ -47,6 +51,11 @@ void SetATPermission(void) auto tokenId = GetAccessTokenId(&infoInstance); SetSelfTokenID(tokenId); OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); + if (firstRun) { + system("pidof accesstoken_ser | xargs kill -9"); + sleep(SLEEP_TIME); + firstRun = false; + } delete[] perms; } @@ -313,7 +322,7 @@ int32_t TestGenerateAppCert(const struct CmBlob *alias, uint32_t alg, uint32_t s bool FindCertAbstract(const struct CertAbstract *abstract, const struct CertList *cList) { - if (abstract == NULL || cList == NULL || cList->certsCount == 0) { + if (abstract == nullptr || cList == nullptr || cList->certsCount == 0) { return false; } for (uint32_t i = 0; i < cList->certsCount; ++i) { -- Gitee