From d0370bae093ca976b6911c437ca6013805eaa2a0 Mon Sep 17 00:00:00 2001 From: wenfei Date: Mon, 14 Feb 2022 18:30:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=BD=AF=E6=80=BB=E7=BA=BF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=98=E5=8A=A8,=E4=BD=BF=E7=94=A8=E6=96=B0?= =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E6=95=B0=E7=94=9F=E6=88=90=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wenfei --- .../devicemanagerservice/src/requestauth/request_session.cpp | 5 +---- .../devicemanagerservice/src/softbus/softbus_adapter.cpp | 4 ++-- ext/mini/utils/src/cipher/encrypt_utils.cpp | 5 +++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ext/mini/services/devicemanagerservice/src/requestauth/request_session.cpp b/ext/mini/services/devicemanagerservice/src/requestauth/request_session.cpp index f3e34509b..42628e837 100644 --- a/ext/mini/services/devicemanagerservice/src/requestauth/request_session.cpp +++ b/ext/mini/services/devicemanagerservice/src/requestauth/request_session.cpp @@ -46,10 +46,7 @@ RequestSession::RequestSession(std::string &hostPkgName, std::string &targetPkgN #if (defined(__LINUX__) || defined(__LITEOS_A__)) mPinToken_ = IpcServerAdapter::GenRandInt(MIN_PIN_TOKEN, MAX_PIN_TOKEN); #else - std::random_device randDevice; - std::mt19937 genRand(randDevice()); - std::uniform_int_distribution disRand(MIN_PIN_TOKEN, MAX_PIN_TOKEN); - mPinToken_ = disRand(genRand); + mPinToken_ = MIN_PIN_TOKEN + random() % (MAX_PIN_TOKEN - MIN_PIN_TOKEN); #endif char randStr[TOKEN_LEN] = {0}; bool res = EncryptUtils::MbedtlsGenRandomStr(randStr, sizeof(randStr), false); diff --git a/ext/mini/services/devicemanagerservice/src/softbus/softbus_adapter.cpp b/ext/mini/services/devicemanagerservice/src/softbus/softbus_adapter.cpp index a909b7116..4b1065f6a 100644 --- a/ext/mini/services/devicemanagerservice/src/softbus/softbus_adapter.cpp +++ b/ext/mini/services/devicemanagerservice/src/softbus/softbus_adapter.cpp @@ -124,7 +124,7 @@ void SoftbusAdapter::OnSoftBusDeviceOnline(NodeBasicInfo *info) #endif uint8_t udid[UDID_BUF_LEN] = {0}; int32_t ret = GetNodeKeyInfo(DEVICE_MANAGER_PACKAGE_NAME.c_str(), info->networkId, - NodeDeivceInfoKey::NODE_KEY_UDID, udid, sizeof(udid)); + NodeDeviceInfoKey::NODE_KEY_UDID, udid, sizeof(udid)); if (ret != DEVICEMANAGER_OK) { DMLOG(DM_LOG_ERROR, "GetNodeKeyInfo failed"); return; @@ -428,7 +428,7 @@ bool SoftbusAdapter::IsDeviceOnLine(std::string &deviceId) } uint8_t udid[UDID_BUF_LEN] = {0}; int32_t ret = GetNodeKeyInfo(DEVICE_MANAGER_PACKAGE_NAME.c_str(), networkId.c_str(), - NodeDeivceInfoKey::NODE_KEY_UDID, udid, sizeof(udid)); + NodeDeviceInfoKey::NODE_KEY_UDID, udid, sizeof(udid)); if (ret != DEVICEMANAGER_OK) { DMLOG(DM_LOG_ERROR, "DM_IsDeviceOnLine GetNodeKeyInfo failed"); break; diff --git a/ext/mini/utils/src/cipher/encrypt_utils.cpp b/ext/mini/utils/src/cipher/encrypt_utils.cpp index 67a39b9c4..3609486eb 100644 --- a/ext/mini/utils/src/cipher/encrypt_utils.cpp +++ b/ext/mini/utils/src/cipher/encrypt_utils.cpp @@ -45,10 +45,15 @@ int32_t EncryptUtils::MbedtlsBase64Decode(uint8_t *dst, size_t dlen, size_t *ole int32_t EncryptUtils::GenRandInt(int32_t randMin, int32_t randMax) { +#if (defined(__LINUX__) || defined(__LITEOS_A__)) std::random_device randDevice; std::mt19937 genRand(randDevice()); std::uniform_int_distribution disRand(randMin, randMax); return disRand(genRand); +#else + return (randMin + random() % (randMax - randMin)); +#endif + } int64_t EncryptUtils::GenRandLongLong(int64_t randMin, int64_t randMax) -- Gitee