diff --git a/frameworks/js/napi/src/napi_asy_key_generator.cpp b/frameworks/js/napi/src/napi_asy_key_generator.cpp index 02e794cac68ed6cfe66a980717ab04d6f2a7f5aa..fd911d6c0d96506a80769c71c0f104a31634b733 100644 --- a/frameworks/js/napi/src/napi_asy_key_generator.cpp +++ b/frameworks/js/napi/src/napi_asy_key_generator.cpp @@ -417,7 +417,7 @@ HcfAsyKeyGenerator *NapiAsyKeyGenerator::GetAsyKeyGenerator() napi_value NapiAsyKeyGenerator::JsGenerateKeyPair(napi_env env, napi_callback_info info) { LOGI("enter ..."); - GenKeyPairCtx *ctx = (GenKeyPairCtx *)HcfMalloc(sizeof(GenKeyPairCtx), 0); + GenKeyPairCtx *ctx = static_cast(HcfMalloc(sizeof(GenKeyPairCtx), 0)); if (ctx == NULL) { LOGE("create context fail."); napi_throw(env, GenerateBusinessError(env, HCF_ERR_MALLOC, "malloc ctx fail.")); @@ -436,7 +436,7 @@ napi_value NapiAsyKeyGenerator::JsGenerateKeyPair(napi_env env, napi_callback_in napi_value NapiAsyKeyGenerator::JsConvertKey(napi_env env, napi_callback_info info) { LOGI("enter ..."); - ConvertKeyCtx *ctx = (ConvertKeyCtx *)HcfMalloc(sizeof(ConvertKeyCtx), 0); + ConvertKeyCtx *ctx = static_cast(HcfMalloc(sizeof(ConvertKeyCtx), 0)); if (ctx == NULL) { LOGE("create context fail."); return NULL; diff --git a/frameworks/js/napi/src/napi_cipher.cpp b/frameworks/js/napi/src/napi_cipher.cpp index 6ee9e86470bed0fda1ee5f4a184832f2ab8f9def..ce362c786bf2ef41dfa3d06108de1be62a21b6c2 100644 --- a/frameworks/js/napi/src/napi_cipher.cpp +++ b/frameworks/js/napi/src/napi_cipher.cpp @@ -508,7 +508,7 @@ HcfCipher *NapiCipher::GetCipher() napi_value NapiCipher::JsCipherInit(napi_env env, napi_callback_info info) { - CipherFwkCtx context = (CipherFwkCtx)HcfMalloc(sizeof(CipherFwkCtxT), 0); + CipherFwkCtx context = static_cast(HcfMalloc(sizeof(CipherFwkCtxT), 0)); if (context == nullptr) { LOGE("create context fail!"); return nullptr; @@ -525,7 +525,7 @@ napi_value NapiCipher::JsCipherInit(napi_env env, napi_callback_info info) napi_value NapiCipher::JsCipherUpdate(napi_env env, napi_callback_info info) { - CipherFwkCtx context = (CipherFwkCtx)HcfMalloc(sizeof(CipherFwkCtxT), 0); + CipherFwkCtx context = static_cast(HcfMalloc(sizeof(CipherFwkCtxT), 0)); if (context == nullptr) { LOGE("create context fail!"); return nullptr; @@ -542,7 +542,7 @@ napi_value NapiCipher::JsCipherUpdate(napi_env env, napi_callback_info info) napi_value NapiCipher::JsCipherDoFinal(napi_env env, napi_callback_info info) { - CipherFwkCtx context = (CipherFwkCtx)HcfMalloc(sizeof(CipherFwkCtxT), 0); + CipherFwkCtx context = static_cast(HcfMalloc(sizeof(CipherFwkCtxT), 0)); if (context == nullptr) { LOGE("create context fail!"); return nullptr; diff --git a/frameworks/js/napi/src/napi_key_agreement.cpp b/frameworks/js/napi/src/napi_key_agreement.cpp index c2657d1343b72dd0aa6dddbfa22b9a754a159170..f391f6c6102c1b75699df47d5ca81483a4455a51 100644 --- a/frameworks/js/napi/src/napi_key_agreement.cpp +++ b/frameworks/js/napi/src/napi_key_agreement.cpp @@ -225,7 +225,7 @@ HcfKeyAgreement *NapiKeyAgreement::GetKeyAgreement() napi_value NapiKeyAgreement::JsGenerateSecret(napi_env env, napi_callback_info info) { LOGI("enter ..."); - KeyAgreementCtx *ctx = (KeyAgreementCtx *)HcfMalloc(sizeof(KeyAgreementCtx), 0); + KeyAgreementCtx *ctx = static_cast(HcfMalloc(sizeof(KeyAgreementCtx), 0)); if (ctx == NULL) { LOGE("create context fail."); return NULL; diff --git a/frameworks/js/napi/src/napi_mac.cpp b/frameworks/js/napi/src/napi_mac.cpp index f97f2e11d2a9e01dc35e6c54a0cb7d0e12421d60..9c091d8b9b7bdf974c1865cbd4771a726bf8355b 100644 --- a/frameworks/js/napi/src/napi_mac.cpp +++ b/frameworks/js/napi/src/napi_mac.cpp @@ -227,7 +227,7 @@ napi_value NapiMac::MacInit(napi_env env, napi_callback_info info) if (!CheckArgsCount(env, argc, ARGS_SIZE_TWO, false)) { return nullptr; } - MacCtx *context = (MacCtx *)HcfMalloc(sizeof(MacCtx), 0); + MacCtx *context = static_cast(HcfMalloc(sizeof(MacCtx), 0)); if (context == nullptr) { napi_throw(env, GenerateBusinessError(env, HCF_ERR_MALLOC, "malloc context failed")); LOGE("malloc context failed!"); @@ -272,7 +272,7 @@ napi_value NapiMac::MacUpdate(napi_env env, napi_callback_info info) if (!CheckArgsCount(env, argc, ARGS_SIZE_TWO, false)) { return nullptr; } - MacCtx *context = (MacCtx *)HcfMalloc(sizeof(MacCtx), 0); + MacCtx *context = static_cast(HcfMalloc(sizeof(MacCtx), 0)); if (context == nullptr) { napi_throw(env, GenerateBusinessError(env, HCF_ERR_MALLOC, "malloc context failed")); LOGE("malloc context failed!"); @@ -313,7 +313,7 @@ napi_value NapiMac::MacDoFinal(napi_env env, napi_callback_info info) if (!CheckArgsCount(env, argc, ARGS_SIZE_ONE, false)) { return nullptr; } - MacCtx *context = (MacCtx *)HcfMalloc(sizeof(MacCtx), 0); + MacCtx *context = static_cast(HcfMalloc(sizeof(MacCtx), 0)); if (context == nullptr) { napi_throw(env, GenerateBusinessError(env, HCF_ERR_MALLOC, "malloc context failed")); LOGE("malloc context failed!"); diff --git a/frameworks/js/napi/src/napi_md.cpp b/frameworks/js/napi/src/napi_md.cpp index 302d74b2719d09edf307afa4e19595b9ee29e4c9..5bac3f0591de6f98ee0e7d69669e85b9c7444f7d 100644 --- a/frameworks/js/napi/src/napi_md.cpp +++ b/frameworks/js/napi/src/napi_md.cpp @@ -193,7 +193,7 @@ napi_value NapiMd::MdUpdate(napi_env env, napi_callback_info info) if (!CheckArgsCount(env, argc, ARGS_SIZE_TWO, false)) { return nullptr; } - MdCtx *context = (MdCtx *)HcfMalloc(sizeof(MdCtx), 0); + MdCtx *context = static_cast(HcfMalloc(sizeof(MdCtx), 0)); if (context == nullptr) { napi_throw(env, GenerateBusinessError(env, HCF_ERR_MALLOC, "malloc context failed")); LOGE("malloc context failed!"); @@ -234,7 +234,7 @@ napi_value NapiMd::MdDoFinal(napi_env env, napi_callback_info info) if (!CheckArgsCount(env, argc, ARGS_SIZE_ONE, false)) { return nullptr; } - MdCtx *context = (MdCtx *)HcfMalloc(sizeof(MdCtx), 0); + MdCtx *context = static_cast(HcfMalloc(sizeof(MdCtx), 0)); if (context == nullptr) { napi_throw(env, GenerateBusinessError(env, HCF_ERR_MALLOC, "malloc context failed")); LOGE("malloc context failed!"); diff --git a/frameworks/js/napi/src/napi_rand.cpp b/frameworks/js/napi/src/napi_rand.cpp index eabac2076f9ed031031d788af261819ac9808a55..2eada55f71f1dc0c5c4bd5897fc30bbab14a49fa 100644 --- a/frameworks/js/napi/src/napi_rand.cpp +++ b/frameworks/js/napi/src/napi_rand.cpp @@ -201,7 +201,7 @@ napi_value NapiRand::GenerateRandom(napi_env env, napi_callback_info info) LOGE("The arguments count is not expected!"); return ret; } - RandCtx *context = (RandCtx *)HcfMalloc(sizeof(RandCtx), 0); + RandCtx *context = static_cast(HcfMalloc(sizeof(RandCtx), 0)); if (context == nullptr) { napi_throw(env, GenerateBusinessError(env, HCF_ERR_MALLOC, "malloc context failed")); LOGE("malloc context failed!"); @@ -244,7 +244,7 @@ napi_value NapiRand::SetSeed(napi_env env, napi_callback_info info) LOGE("The arguments count is not expected!"); return ret; } - RandCtx *context = (RandCtx *)HcfMalloc(sizeof(RandCtx), 0); + RandCtx *context = static_cast(HcfMalloc(sizeof(RandCtx), 0)); if (context == nullptr) { napi_throw(env, GenerateBusinessError(env, HCF_ERR_MALLOC, "malloc context failed")); LOGE("malloc context failed!"); diff --git a/frameworks/js/napi/src/napi_sign.cpp b/frameworks/js/napi/src/napi_sign.cpp index a3e1208490eec42498b89927240e90b9695206ae..4d2787d220b106b34cf11d0f4fc5a8f30dadb396 100644 --- a/frameworks/js/napi/src/napi_sign.cpp +++ b/frameworks/js/napi/src/napi_sign.cpp @@ -528,7 +528,7 @@ HcfSign *NapiSign::GetSign() napi_value NapiSign::JsInit(napi_env env, napi_callback_info info) { LOGI("enter ..."); - SignInitCtx *ctx = (SignInitCtx *)HcfMalloc(sizeof(SignInitCtx), 0); + SignInitCtx *ctx = static_cast(HcfMalloc(sizeof(SignInitCtx), 0)); if (ctx == NULL) { LOGE("create context fail."); return NULL; @@ -546,7 +546,7 @@ napi_value NapiSign::JsInit(napi_env env, napi_callback_info info) napi_value NapiSign::JsUpdate(napi_env env, napi_callback_info info) { LOGI("enter ..."); - SignUpdateCtx *ctx = (SignUpdateCtx *)HcfMalloc(sizeof(SignUpdateCtx), 0); + SignUpdateCtx *ctx = static_cast(HcfMalloc(sizeof(SignUpdateCtx), 0)); if (ctx == NULL) { LOGE("create context fail."); return NULL; @@ -564,7 +564,7 @@ napi_value NapiSign::JsUpdate(napi_env env, napi_callback_info info) napi_value NapiSign::JsSign(napi_env env, napi_callback_info info) { LOGI("enter ..."); - SignDoFinalCtx *ctx = (SignDoFinalCtx *)HcfMalloc(sizeof(SignDoFinalCtx), 0); + SignDoFinalCtx *ctx = static_cast(HcfMalloc(sizeof(SignDoFinalCtx), 0)); if (ctx == NULL) { LOGE("create context fail."); return NULL; diff --git a/frameworks/js/napi/src/napi_sym_key_generator.cpp b/frameworks/js/napi/src/napi_sym_key_generator.cpp index 71d08d59601afd8830444909124e63d5076d48bd..445a0643cf66ef82b1f369787bce37b6b073014a 100644 --- a/frameworks/js/napi/src/napi_sym_key_generator.cpp +++ b/frameworks/js/napi/src/napi_sym_key_generator.cpp @@ -317,7 +317,7 @@ HcfSymKeyGenerator *NapiSymKeyGenerator::GetSymKeyGenerator() napi_value NapiSymKeyGenerator::JsGenerateSymKey(napi_env env, napi_callback_info info) { - SymKeyGeneratorFwkCtx context = (SymKeyGeneratorFwkCtx)HcfMalloc(sizeof(SymKeyGeneratorFwkCtxT), 0); + SymKeyGeneratorFwkCtx context = static_cast(HcfMalloc(sizeof(SymKeyGeneratorFwkCtxT), 0)); if (context == nullptr) { LOGE("Create context failed!"); return nullptr; @@ -340,7 +340,7 @@ napi_value NapiSymKeyGenerator::JsGenerateSymKey(napi_env env, napi_callback_inf napi_value NapiSymKeyGenerator::JsConvertKey(napi_env env, napi_callback_info info) { - SymKeyGeneratorFwkCtx context = (SymKeyGeneratorFwkCtx)HcfMalloc(sizeof(SymKeyGeneratorFwkCtxT), 0); + SymKeyGeneratorFwkCtx context = static_cast(HcfMalloc(sizeof(SymKeyGeneratorFwkCtxT), 0)); if (context == nullptr) { LOGE("malloc SymKeyGeneratorFwkCtx failed!"); return nullptr; diff --git a/frameworks/js/napi/src/napi_verify.cpp b/frameworks/js/napi/src/napi_verify.cpp index c1cc489e463da64bbaafa90de5e01c6db6707025..ddd5d2295001d8011c9a5b00dc01e20dc363abb9 100644 --- a/frameworks/js/napi/src/napi_verify.cpp +++ b/frameworks/js/napi/src/napi_verify.cpp @@ -555,7 +555,7 @@ HcfVerify *NapiVerify::GetVerify() napi_value NapiVerify::JsInit(napi_env env, napi_callback_info info) { LOGI("enter ..."); - VerifyInitCtx *ctx = (VerifyInitCtx *)HcfMalloc(sizeof(VerifyInitCtx), 0); + VerifyInitCtx *ctx = static_cast(HcfMalloc(sizeof(VerifyInitCtx), 0)); if (ctx == NULL) { LOGE("create context fail."); return NULL; @@ -573,7 +573,7 @@ napi_value NapiVerify::JsInit(napi_env env, napi_callback_info info) napi_value NapiVerify::JsUpdate(napi_env env, napi_callback_info info) { LOGI("enter ..."); - VerifyUpdateCtx *ctx = (VerifyUpdateCtx *)HcfMalloc(sizeof(VerifyUpdateCtx), 0); + VerifyUpdateCtx *ctx = static_cast(HcfMalloc(sizeof(VerifyUpdateCtx), 0)); if (ctx == NULL) { LOGE("create context fail."); return NULL; @@ -591,7 +591,7 @@ napi_value NapiVerify::JsUpdate(napi_env env, napi_callback_info info) napi_value NapiVerify::JsVerify(napi_env env, napi_callback_info info) { LOGI("enter ..."); - VerifyDoFinalCtx *ctx = (VerifyDoFinalCtx *)HcfMalloc(sizeof(VerifyDoFinalCtx), 0); + VerifyDoFinalCtx *ctx = static_cast(HcfMalloc(sizeof(VerifyDoFinalCtx), 0)); if (ctx == NULL) { LOGE("create context fail."); return NULL; diff --git a/plugin/openssl_plugin/common/src/rsa_openssl_common.c b/plugin/openssl_plugin/common/src/rsa_openssl_common.c index 7fad10e0afaa07196aa4d30e3fbb086bbbf5f6fb..fbe3bb2872f0b1ec8856604f6ee28595bf8f68a8 100644 --- a/plugin/openssl_plugin/common/src/rsa_openssl_common.c +++ b/plugin/openssl_plugin/common/src/rsa_openssl_common.c @@ -56,7 +56,7 @@ ERR: static HcfResult InitRsaStruct(BIGNUM *n, BIGNUM *e, BIGNUM *d, const bool needPrivateExponent, RSA **rsa) { - HcfResult ret = HCF_ERR_CRYPTO_OPERATION; + HcfResult ret; if (rsa == NULL || n == NULL || e == NULL) { LOGE("InitRsaStruct params error."); ret = HCF_INVALID_PARAMS; diff --git a/plugin/openssl_plugin/key/asy_key_generator/src/rsa_asy_key_generator_openssl.c b/plugin/openssl_plugin/key/asy_key_generator/src/rsa_asy_key_generator_openssl.c index 893207cd501dd83fd67b5d3919faee74f66222c9..f4dfbd8e7da5fdfdc832419cd192c30e387c3b91 100644 --- a/plugin/openssl_plugin/key/asy_key_generator/src/rsa_asy_key_generator_openssl.c +++ b/plugin/openssl_plugin/key/asy_key_generator/src/rsa_asy_key_generator_openssl.c @@ -214,7 +214,7 @@ static HcfResult RsaSaveKeyMaterial(const RSA *rsa, const uint32_t keySize, HcfB HcfFree(rawMaterial); return HCF_ERR_MALLOC; } - HcfResult ret = HCF_SUCCESS; + HcfResult ret; uint32_t offset = sizeof(*keyMaterial); keyMaterial->nSize = (uint32_t)BN_bn2bin(RSA_get0_n(rsa), tmp_buff); if (memcpy_s(rawMaterial + offset, keyByteLen, tmp_buff, keyMaterial->nSize) != HCF_SUCCESS) {