From 1ee734f731e8170f4ec3d9725a90c7550e39118f Mon Sep 17 00:00:00 2001 From: peng-langyuan Date: Mon, 29 Jul 2024 18:45:24 +0800 Subject: [PATCH 1/2] fix secondary authentication error --- 0006-fix-secondary-authentication-error.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 0006-fix-secondary-authentication-error.patch diff --git a/0006-fix-secondary-authentication-error.patch b/0006-fix-secondary-authentication-error.patch new file mode 100644 index 0000000..5bbbd32 --- /dev/null +++ b/0006-fix-secondary-authentication-error.patch @@ -0,0 +1,32 @@ +From 430d9673284f006762a28848003f6ba9fc4383b8 Mon Sep 17 00:00:00 2001 +From: peng-langyuan +Date: Mon, 29 Jul 2024 18:31:50 +0800 +Subject: [PATCH] =?UTF-8?q?fix:=E9=80=82=E9=85=8Dopeneuler=E4=BD=9C?= + =?UTF-8?q?=E4=B8=BA=E5=8F=91=E8=B5=B7=E7=AB=AF=EF=BC=8C=E9=94=99=E8=AF=AF?= + =?UTF-8?q?=E8=BE=93=E5=85=A5pin=E7=A0=81=E5=AF=BC=E8=87=B4=E6=97=A0?= + =?UTF-8?q?=E6=B3=95=E4=BA=8C=E6=AC=A1=E5=8F=91=E8=B5=B7=E8=AE=A4=E8=AF=81?= + =?UTF-8?q?=E9=97=AE=E9=A2=98?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + services/implementation/src/authentication/dm_auth_manager.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/services/implementation/src/authentication/dm_auth_manager.cpp b/services/implementation/src/authentication/dm_auth_manager.cpp +index 2874bec6..af1def0f 100644 +--- a/services/implementation/src/authentication/dm_auth_manager.cpp ++++ b/services/implementation/src/authentication/dm_auth_manager.cpp +@@ -40,7 +40,7 @@ const int32_t WAIT_NEGOTIATE_TIMEOUT = 10; + const int32_t WAIT_REQUEST_TIMEOUT = 10; + const int32_t CANCEL_PIN_CODE_DISPLAY = 1; + const int32_t DEVICE_ID_HALF = 2; +-const int32_t MAX_AUTH_TIMES = 3; ++const int32_t MAX_AUTH_TIMES = 1; + const int32_t MIN_PIN_TOKEN = 10000000; + const int32_t MAX_PIN_TOKEN = 90000000; + const int32_t MIN_PIN_CODE = 100000; +-- +2.33.0 + -- Gitee From 001c66f1811b6377a2328b5fdc79422525eb3036 Mon Sep 17 00:00:00 2001 From: peng-langyuan Date: Mon, 29 Jul 2024 18:55:59 +0800 Subject: [PATCH 2/2] fix:secondary authentication error --- 0006-fix-secondary-authentication-error.patch | 13 +++---------- device_manager.spec | 6 +++++- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/0006-fix-secondary-authentication-error.patch b/0006-fix-secondary-authentication-error.patch index 5bbbd32..f51bc39 100644 --- a/0006-fix-secondary-authentication-error.patch +++ b/0006-fix-secondary-authentication-error.patch @@ -1,14 +1,7 @@ -From 430d9673284f006762a28848003f6ba9fc4383b8 Mon Sep 17 00:00:00 2001 +From c1f0313076de2133b2948da968017aaa8a40c42f Mon Sep 17 00:00:00 2001 From: peng-langyuan -Date: Mon, 29 Jul 2024 18:31:50 +0800 -Subject: [PATCH] =?UTF-8?q?fix:=E9=80=82=E9=85=8Dopeneuler=E4=BD=9C?= - =?UTF-8?q?=E4=B8=BA=E5=8F=91=E8=B5=B7=E7=AB=AF=EF=BC=8C=E9=94=99=E8=AF=AF?= - =?UTF-8?q?=E8=BE=93=E5=85=A5pin=E7=A0=81=E5=AF=BC=E8=87=B4=E6=97=A0?= - =?UTF-8?q?=E6=B3=95=E4=BA=8C=E6=AC=A1=E5=8F=91=E8=B5=B7=E8=AE=A4=E8=AF=81?= - =?UTF-8?q?=E9=97=AE=E9=A2=98?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +Date: Mon, 29 Jul 2024 18:51:30 +0800 +Subject: [PATCH] fix:secondary authentication error --- services/implementation/src/authentication/dm_auth_manager.cpp | 2 +- diff --git a/device_manager.spec b/device_manager.spec index 1c821cb..5576dae 100644 --- a/device_manager.spec +++ b/device_manager.spec @@ -8,7 +8,7 @@ Name: distributedhardware_device_manager Version: 1.0.0 -Release: 6 +Release: 7 Summary: Distributed middleware used components. License: Apache-2.0 Url: https://gitee.com/openharmony/ @@ -23,6 +23,7 @@ Patch2: 0002-device-manager-only-support-for-network.patch Patch3: 0003-Fix-crash-for-nullptr-in-EstablishAuthChannel.patch Patch4: 0004-Add-placeholder-for-the-string-of-params.patch Patch5: 0005-release-handle-when-dlerror-returns-non-nullptr.patch +Patch6: 0006-fix-secondary-authentication-error.patch BuildRequires: gcc, make, hilog, kernel-devel, uname-build-checks BuildRequires: distributed-build, distributed-beget @@ -60,6 +61,7 @@ cp -rf %{_builddir}/build/openeuler/compiler_gn/* %{_builddir} %patch -P3 -p1 -d %{distributedhardware_dir}/device_manager %patch -P4 -p1 -d %{distributedhardware_dir}/device_manager %patch -P5 -p1 -d %{distributedhardware_dir}/device_manager +%patch -P6 -p1 -d %{distributedhardware_dir}/device_manager %setup -q -D -T -a 2 -c -n %{third_party_dir}/ @@ -122,6 +124,8 @@ ln -s /usr/include/device_manager %{buildroot}%{build_opt}/openeuler/compiler_gn /system/* %changelog +* Mon Jul 29 2024 peng-langyuan - 1.0.0-7 +- Fix secondary authentication error * Wed May 29 2024 wei_jiangang - 1.0.0-6 - release handle when dlerror returns non-nullptr * Mon Apr 1 2024 wei_jiangang - 1.0.0-5 -- Gitee