From 211f2219167a6fac9c335acf86d335d61528826f Mon Sep 17 00:00:00 2001 From: tan-qingliu Date: Thu, 5 Jun 2025 15:27:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9SA=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E9=94=80=E6=AF=81=E6=97=B6=E9=97=B4=E4=B8=BA?= =?UTF-8?q?1=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tan-qingliu Change-Id: Ie2bbacad1e229d2c70d46ed65bf732e266528aa3 --- .../cert_manager_service/main/os_dependency/sa/cm_sa.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_sa.cpp b/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_sa.cpp index b1f0f65..f6ee752 100644 --- a/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_sa.cpp +++ b/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_sa.cpp @@ -43,7 +43,7 @@ const uint32_t MAX_DELAY_TIMES = 100; const uint32_t DELAY_INTERVAL = 200000; /* delay 200ms waiting for system event */ const std::string TASK_ID = "unload"; -const uint32_t DELAY_TIME = 180000; /* delay 180000ms to unload SA */ +const uint32_t DELAY_TIME = 60000; /* delay 60000ms to unload SA */ const std::string USER_REMOVED_EVENT = "usual.event.USER_REMOVED"; constexpr int CM_IPC_THREAD_NUM = 32; -- Gitee From cc41c2e93d0a4a5d918befd6953f3add33c34d58 Mon Sep 17 00:00:00 2001 From: tan-qingliu Date: Sat, 7 Jun 2025 22:22:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=AF=81=E4=B9=A6=E6=96=87=E4=BB=B6=E3=80=81=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=92=8C=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E6=8D=AE=E7=9A=84=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tan-qingliu Change-Id: I37e9c2c75b6972962036f2876215d8373b60138c --- .../main/core/src/cert_manager.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c index f6ed66b..2189bb7 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c @@ -867,20 +867,18 @@ static int32_t RemoveAllUserCert(const struct CmContext *context, uint32_t store for (uint32_t i = 0; i < fileNames.size; i++) { certUri.data = (uint8_t *)fNames[i].data; certUri.size = fNames[i].size - 1; - ret = DeleteCertProperty((char *)certUri.data); - if (ret != CM_SUCCESS) { - CM_LOG_E("Failed delete cert: %s rdbData", (char *)certUri.data); + ret = CertManagerFileRemove(path, (char *)fNames[i].data); + if (ret != CMR_OK) { + CM_LOG_E("User Cert %u remove failed, ret: %d", i, ret); continue; } ret = CmBackupRemove(context->userId, path, &certUri); if (ret != CMR_OK) { CM_LOG_E("User Cert %u remove config and backup file failed, ret: %d", i, ret); - continue; } - ret = CertManagerFileRemove(path, (char *)fNames[i].data); - if (ret != CMR_OK) { - CM_LOG_E("User Cert %u remove failed, ret: %d", i, ret); - continue; + ret = DeleteCertProperty((char *)certUri.data); + if (ret != CM_SUCCESS) { + CM_LOG_E("Failed delete cert: %s rdbData", (char *)certUri.data); } } -- Gitee