From f296e633c84de950f97ad0616ee9d6087d6513b7 Mon Sep 17 00:00:00 2001
From: wuqi0105 <wuqi85@huawei.com>
Date: Wed, 9 Mar 2022 10:07:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug:=E6=89=AB=E7=A2=B0=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=A0=81/=E9=87=8D=E5=A4=8D=E5=8A=9F=E8=83=BD=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81/=E8=AE=BE=E5=A4=87=E4=B8=8B=E7=BA=BF=E4=B8=8D?=
 =?UTF-8?q?=E5=85=B7=E5=A4=87=E9=80=9A=E8=BF=87networkid=E6=9F=A5=E5=AF=BB?=
 =?UTF-8?q?=E6=89=80=E6=96=B0=E5=A2=9E=E7=9A=84map/pin=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wuqi0105 <wuqi85@huawei.com>
---
 ext/pin_auth/src/pin_auth.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ext/pin_auth/src/pin_auth.cpp b/ext/pin_auth/src/pin_auth.cpp
index b67ee4908..aa408d2e4 100644
--- a/ext/pin_auth/src/pin_auth.cpp
+++ b/ext/pin_auth/src/pin_auth.cpp
@@ -16,6 +16,7 @@
 #include "pin_auth.h"
 
 #include <memory>
+#include <string.h>
 
 #include "dm_constants.h"
 #include "dm_log.h"
@@ -65,14 +66,20 @@ int32_t PinAuth::StartAuth(std::string &authToken, std::shared_ptr<DmAuthManager
 int32_t PinAuth::VerifyAuthentication(std::string &authToken, const std::string &authParam)
 {
     times_ += 1;
-    nlohmann::json authParamJson = nlohmann::json::parse(authParam, nullptr, false);
-    if (authParamJson.is_discarded()) {
+    LOGE("Peer rejection%s", authParam.c_str());
+    if (strlen(authParam.c_str()) == 1) {
         if (authParam == "0") {
             return DM_OK;
         }
         LOGE("Peer rejection");
         return DM_FAILED;
     }
+    nlohmann::json authParamJson = nlohmann::json::parse(authParam, nullptr, false);
+    if (authParamJson.is_discarded()) {
+        LOGE("DecodeRequestAuth jsonStr error");
+        return DM_FAILED;
+    }
+    LOGE("Peer rejection%s", authParam.c_str());
     nlohmann::json authTokenJson = nlohmann::json::parse(authToken, nullptr, false);
     if (authTokenJson.is_discarded()) {
         LOGE("DecodeRequestAuth jsonStr error");
-- 
Gitee


From 33ac2d30410fa3b69c6d9612e82849ad3b5862db Mon Sep 17 00:00:00 2001
From: wuqi0105 <wuqi85@huawei.com>
Date: Wed, 9 Mar 2022 10:25:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug:=E6=89=AB=E7=A2=B0=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=A0=81/=E9=87=8D=E5=A4=8D=E5=8A=9F=E8=83=BD=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81/=E8=AE=BE=E5=A4=87=E4=B8=8B=E7=BA=BF=E4=B8=8D?=
 =?UTF-8?q?=E5=85=B7=E5=A4=87=E9=80=9A=E8=BF=87networkid=E6=9F=A5=E5=AF=BB?=
 =?UTF-8?q?=E6=89=80=E6=96=B0=E5=A2=9E=E7=9A=84map/pin=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wuqi0105 <wuqi85@huawei.com>
---
 ext/pin_auth/src/pin_auth.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ext/pin_auth/src/pin_auth.cpp b/ext/pin_auth/src/pin_auth.cpp
index aa408d2e4..377cb8fdb 100644
--- a/ext/pin_auth/src/pin_auth.cpp
+++ b/ext/pin_auth/src/pin_auth.cpp
@@ -16,7 +16,7 @@
 #include "pin_auth.h"
 
 #include <memory>
-#include <string.h>
+#include <cstring>
 
 #include "dm_constants.h"
 #include "dm_log.h"
@@ -66,7 +66,6 @@ int32_t PinAuth::StartAuth(std::string &authToken, std::shared_ptr<DmAuthManager
 int32_t PinAuth::VerifyAuthentication(std::string &authToken, const std::string &authParam)
 {
     times_ += 1;
-    LOGE("Peer rejection%s", authParam.c_str());
     if (strlen(authParam.c_str()) == 1) {
         if (authParam == "0") {
             return DM_OK;
@@ -79,7 +78,6 @@ int32_t PinAuth::VerifyAuthentication(std::string &authToken, const std::string
         LOGE("DecodeRequestAuth jsonStr error");
         return DM_FAILED;
     }
-    LOGE("Peer rejection%s", authParam.c_str());
     nlohmann::json authTokenJson = nlohmann::json::parse(authToken, nullptr, false);
     if (authTokenJson.is_discarded()) {
         LOGE("DecodeRequestAuth jsonStr error");
-- 
Gitee