openharmony/security_deviceauth
1
0
Fork 0
mirror of https://github.com/openharmony/security_deviceauth.git synced 2026-07-21 03:15:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix authId bug for server auth

Browse Source 
Signed-off-by: winnieHu <huyu35@huawei.com>
This commit is contained in:
winnieHu
2021-11-16 16:51:05 +08:00
parent ffbe1e6f3a
commit aeb80e86e0
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/common/inc/common_defs.h
+1
View File
@@ -98,6 +98,7 @@
#define FIELD_IS_UUID "uuIdAsDeviceId"
#define FIELD_VERSION "version"
#define FIELD_MK_AGREE_MSG "mkaMsg"
#define FIELD_PEER_ID_FROM_REQUEST "peerIdFromRequest"
#define AUTH_FORM_INVALID_TYPE -1
#define AUTH_FORM_ACCOUNT_UNRELATED 0
services/group_auth/src/group_auth_manager/account_unrelated_group_auth/account_unrelated_group_auth.c
+2 -2
View File
@@ -265,7 +265,7 @@ static int32_t AddNonAccountAuthInfo(const DeviceInfo *localAuthInfo, const Devi
LOGE("Failed to add self devType to paramsData from db!");
return HC_ERR_JSON_FAIL;
}
const char *peerAuthId = GetStringFromJson(paramsData, FIELD_PEER_AUTH_ID);
const char *peerAuthId = GetStringFromJson(paramsData, FIELD_PEER_ID_FROM_REQUEST);
if (peerAuthId == NULL) {
if (AddStringToJson(paramsData, FIELD_PEER_AUTH_ID, StringGet(&peerAuthInfo->authId))
!= HC_SUCCESS) {
@@ -413,7 +413,7 @@ static int32_t CombineDasServerConfirmParams(const CJson *confirmationJson, CJso
}
const char *peerAuthId = GetStringFromJson(confirmationJson, FIELD_PEER_AUTH_ID);
if (peerAuthId != NULL) {
if (AddStringToJson(dataFromClient, FIELD_PEER_AUTH_ID, peerAuthId) != HC_SUCCESS) {
if (AddStringToJson(dataFromClient, FIELD_PEER_ID_FROM_REQUEST, peerAuthId) != HC_SUCCESS) {
LOGE("Failed to combine server param for peerAuthId!");
return HC_ERR_JSON_FAIL;
}