From dda649a0daddd2a1ffe08621fa9a887b6ff7e676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Mon, 2 Jun 2025 10:50:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- .../src/authentication_v2/auth_stages/auth_confirm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/implementation/src/authentication_v2/auth_stages/auth_confirm.cpp b/services/implementation/src/authentication_v2/auth_stages/auth_confirm.cpp index f861ff95e..564703c74 100644 --- a/services/implementation/src/authentication_v2/auth_stages/auth_confirm.cpp +++ b/services/implementation/src/authentication_v2/auth_stages/auth_confirm.cpp @@ -722,7 +722,7 @@ int32_t AuthSinkConfirmState::ProcessBindAuthorize(std::shared_ptrconfirmOperation == USER_OPERATION_TYPE_CANCEL_AUTH) { LOGE("AuthSinkConfirmState::Action USER_OPERATION_TYPE_CANCEL_AUTH"); - context->reason = ERR_DM_BIND_USER_CANCEL; + context->reason = ERR_DM_AUTH_PEER_REJECT; return ERR_DM_FAILED; } context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_RESP_USER_CONFIRM, context); -- Gitee From 1f3f4e5eab636c5ded76121f4175bbd22be083e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Mon, 2 Jun 2025 11:17:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- .../src/authentication_v2/auth_stages/auth_pin_auth.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/implementation/src/authentication_v2/auth_stages/auth_pin_auth.cpp b/services/implementation/src/authentication_v2/auth_stages/auth_pin_auth.cpp index af1d2ed5a..913e6cd11 100644 --- a/services/implementation/src/authentication_v2/auth_stages/auth_pin_auth.cpp +++ b/services/implementation/src/authentication_v2/auth_stages/auth_pin_auth.cpp @@ -351,8 +351,8 @@ int32_t AuthSrcPinNegotiateStartState::NegotiatePinAuth(std::shared_ptrcurrentAuthTypeIdx + 1 >= context->authTypeList.size()) { LOGE("all auth type failed"); - context->reason = ERR_DM_AUTH_REJECT; - return ERR_DM_AUTH_REJECT; + context->reason = ERR_DM_BIND_PIN_CODE_ERROR; + return ERR_DM_BIND_PIN_CODE_ERROR; } context->currentAuthTypeIdx++; context->authType = context->authTypeList[context->currentAuthTypeIdx]; @@ -554,8 +554,8 @@ int32_t AuthSinkPinNegotiateStartState::Action(std::shared_ptr co auto idx = context->currentAuthTypeIdx; if (idx + 1 >= context->authTypeList.size()) { LOGE("AuthSinkPinNegotiateStartState::Action all auth type failed"); - context->reason = ERR_DM_AUTH_REJECT; - return ERR_DM_AUTH_REJECT; + context->reason = ERR_DM_BIND_PIN_CODE_ERROR; + return ERR_DM_BIND_PIN_CODE_ERROR; } ++idx; context->currentAuthTypeIdx = idx; -- Gitee From c87c1bc6e3ef0c1a8a7c64b309fefc64cecfae12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Mon, 2 Jun 2025 15:43:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9ut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- test/unittest/UTTest_auth_pin_auth_state.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unittest/UTTest_auth_pin_auth_state.cpp b/test/unittest/UTTest_auth_pin_auth_state.cpp index 0b1b94894..6ec32b49c 100644 --- a/test/unittest/UTTest_auth_pin_auth_state.cpp +++ b/test/unittest/UTTest_auth_pin_auth_state.cpp @@ -1196,7 +1196,7 @@ HWTEST_F(AuthPinAuthStateTest, AuthSrcPinNegotiateStartState_010, testing::ext:: context->direction = DmAuthDirection::DM_AUTH_SOURCE; context->pinNegotiateStarted = true; context->needBind = true; - EXPECT_EQ(authState->Action(context), ERR_DM_AUTH_REJECT); + EXPECT_EQ(authState->Action(context), ERR_DM_BIND_PIN_CODE_ERROR); } HWTEST_F(AuthPinAuthStateTest, AuthSrcPinInputState_001, testing::ext::TestSize.Level1) @@ -1276,7 +1276,7 @@ HWTEST_F(AuthPinAuthStateTest, AuthSinkPinNegotiateStartState_004, testing::ext: EXPECT_EQ(authState->Action(context), DM_OK); EXPECT_EQ(context->pinNegotiateStarted, true); - EXPECT_EQ(authState->Action(context), ERR_DM_AUTH_REJECT); + EXPECT_EQ(authState->Action(context), ERR_DM_BIND_PIN_CODE_ERROR); } HWTEST_F(AuthPinAuthStateTest, AuthSinkPinNegotiateStartState_005, testing::ext::TestSize.Level1) -- Gitee