diff --git a/interfaces/kits/js/src/native_devicemanager_js.cpp b/interfaces/kits/js/src/native_devicemanager_js.cpp index 01503e91d33424b694336885ec8fc24ffdac0fc5..17278a4580ee4056e49983b581960f361359448c 100644 --- a/interfaces/kits/js/src/native_devicemanager_js.cpp +++ b/interfaces/kits/js/src/native_devicemanager_js.cpp @@ -46,6 +46,7 @@ const int32_t DM_NAPI_ARGS_TWO = 2; const int32_t DM_NAPI_ARGS_THREE = 3; const int32_t DM_NAPI_SUB_ID_MAX = 65535; const int32_t DM_AUTH_DIRECTION_CLIENT = 1; +const int32_t DM_AUTH_REQUEST_SUCCESS_STATUS = 8; napi_ref deviceTypeEnumConstructor_ = nullptr; napi_ref deviceStateChangeActionEnumConstructor_ = nullptr; @@ -499,7 +500,7 @@ void DeviceManagerNapi::OnAuthResult(const std::string &deviceId, const std::str napi_get_reference_value(env_, thisVarRef_, &thisVar); napi_value result[DM_NAPI_ARGS_TWO] = {0}; - if (status == 0) { + if (status == DM_AUTH_REQUEST_SUCCESS_STATUS && reason == 0) { LOGI("OnAuthResult success"); napi_get_undefined(env_, &result[0]); napi_create_object(env_, &result[1]); diff --git a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp index c25458c4ca30f3656d1508184b0abfebcf6c2ef6..f1bb3a441aed7a57993f2ce7a0d3bf492c75416b 100644 --- a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp +++ b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp @@ -61,6 +61,7 @@ HiChainConnector::HiChainConnector() { LOGI("HiChainConnector::constructor"); deviceAuthCallback_ = {.onTransmit = nullptr, + .onSessionKeyReturned = nullptr, .onFinish = HiChainConnector::onFinish, .onError = HiChainConnector::onError, .onRequest = HiChainConnector::onRequest}; diff --git a/utils/src/dm_random.cpp b/utils/src/dm_random.cpp index 5a4b83cad9961bb27cc679ee647d09fe249b0653..01daea9dfb537f5de0d82d0134bf9cb442bd20ac 100644 --- a/utils/src/dm_random.cpp +++ b/utils/src/dm_random.cpp @@ -24,6 +24,10 @@ #include "mbedtls/gcm.h" #include "mbedtls/md.h" +#if defined(__LITEOS_M__) +#include +#endif + namespace OHOS { namespace DistributedHardware { int32_t GenRandInt(int32_t randMin, int32_t randMax)