openharmony/security_deviceauth
1
0
Fork 0
mirror of https://github.com/openharmony/security_deviceauth.git synced 2026-07-20 19:04:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

bug fix

Browse Source 
Signed-off-by: fuzikun <fuzikun@huawei.com>
This commit is contained in:
fuzikun
2022-03-17 11:06:43 +08:00
parent 7f7ef38cc2
commit ae7578769f
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/group_manager/src/group_operation/group_operation_common.c
+2 -2
View File
@@ -705,9 +705,9 @@ int32_t AddUdidToParams(TrustedDeviceEntry *devParams)
int32_t AddAuthIdToParamsOrDefault(const CJson *jsonParams, TrustedDeviceEntry *devParams)
{
const char *authId = GetStringFromJson(jsonParams, FIELD_DEVICE_ID);
char udid[INPUT_UDID_LEN] = { 0 };
if (authId == NULL) {
LOGD("No authId is found. The default value is udid!");
char udid[INPUT_UDID_LEN] = { 0 };
int32_t res = HcGetUdid((uint8_t *)udid, INPUT_UDID_LEN);
if (res != HC_SUCCESS) {
LOGE("Failed to get local udid! res: %d", res);
@@ -983,7 +983,7 @@ int32_t ProcessKeyPair(int action, const CJson *jsonParams, const char *groupId)
LOGE("Failed to get local udid! res: %d", res);
return HC_ERR_DB;
}
authId = (char *)udid;
authId = udid;
}
int32_t userType = DEVICE_TYPE_ACCESSORY;
(void)GetIntFromJson(jsonParams, FIELD_USER_TYPE, &userType);
services/group_manager/src/session/bind_session/bind_session_common.c
+1 -4
View File
@@ -486,18 +486,15 @@ static int32_t AddAuthIdAndUserTypeIfValidOrDefault(int32_t osAccountId, const c
return HC_ERR_INVALID_PARAMS;
}
const char *authId = GetStringFromJson(jsonParams, FIELD_DEVICE_ID);
char udid[INPUT_UDID_LEN] = { 0 };
if (authId == NULL) {
LOGD("No authId is found. The default value is udid!");
char udid[INPUT_UDID_LEN] = { 0 };
int32_t res = HcGetUdid((uint8_t *)udid, INPUT_UDID_LEN);
if (res != HC_SUCCESS) {
LOGE("Failed to get local udid! res: %d", res);
return HC_ERR_DB;
}
authId = udid;
if (authId == NULL) {
return HC_ERR_DB;
}
}
int32_t result = CheckAuthIdAndUserTypeValid(osAccountId, userType, groupId, authId);
if (result != HC_SUCCESS) {