From 549f6ee6723f87d56aae6f7777d63e602474661f Mon Sep 17 00:00:00 2001 From: winnie-hu Date: Tue, 1 Nov 2022 17:28:44 +0800 Subject: [PATCH] fix cppcheck Signed-off-by: winnie-hu --- .../js/napi/src/napi_asy_key_generator.cpp | 6 +- .../js/napi/src/napi_cert_chain_validator.cpp | 4 +- frameworks/js/napi/src/napi_cipher.cpp | 14 ++-- frameworks/js/napi/src/napi_key_agreement.cpp | 2 +- frameworks/js/napi/src/napi_mac.cpp | 14 ++-- frameworks/js/napi/src/napi_md.cpp | 8 +- frameworks/js/napi/src/napi_rand.cpp | 10 +-- frameworks/js/napi/src/napi_sign.cpp | 8 +- .../js/napi/src/napi_sym_key_generator.cpp | 6 +- frameworks/js/napi/src/napi_utils.cpp | 34 ++++---- frameworks/js/napi/src/napi_verify.cpp | 8 +- .../js/napi/src/napi_x509_certificate.cpp | 54 ++++++------- frameworks/js/napi/src/napi_x509_crl.cpp | 60 +++++++------- .../js/napi/src/napi_x509_crl_entry.cpp | 14 ++-- .../src/ecc_asy_key_generator_openssl.c | 4 +- .../x509certificate_fuzzer.cpp | 81 +++++++++---------- .../x509crl_fuzzer/x509crl_fuzzer.cpp | 43 +++++----- .../hcfciphercreate_fuzzer.cpp | 26 +++--- .../hcfmaccreate_fuzzer.cpp | 12 +-- .../hcfmdcreate_fuzzer/hcfmdcreate_fuzzer.cpp | 6 +- .../hcfsigncreate_fuzzer.cpp | 14 ++-- .../hcfverifycreate_fuzzer.cpp | 20 ++--- .../asykeygenerator_fuzzer.cpp | 19 +++-- .../hcfrandcreate_fuzzer.cpp | 4 +- test/unittest/src/crypto_x509_crl_test.cpp | 2 +- 25 files changed, 235 insertions(+), 238 deletions(-) diff --git a/frameworks/js/napi/src/napi_asy_key_generator.cpp b/frameworks/js/napi/src/napi_asy_key_generator.cpp index 539b240..4b06761 100644 --- a/frameworks/js/napi/src/napi_asy_key_generator.cpp +++ b/frameworks/js/napi/src/napi_asy_key_generator.cpp @@ -358,7 +358,7 @@ static napi_value NewGenKeyPairAsyncWork(napi_env env, GenKeyPairCtx *ctx) GenKeyPairAsyncWorkReturn(env, status, data); return; }, - (void *)ctx, + static_cast(ctx), &ctx->asyncWork); napi_queue_async_work(env, ctx->asyncWork); @@ -386,7 +386,7 @@ static napi_value NewConvertKeyAsyncWork(napi_env env, ConvertKeyCtx *ctx) ConvertKeyAsyncWorkReturn(env, status, data); return; }, - (void *)ctx, + static_cast(ctx), &ctx->asyncWork); napi_queue_async_work(env, ctx->asyncWork); @@ -498,7 +498,7 @@ napi_value NapiAsyKeyGenerator::CreateJsAsyKeyGenerator(napi_env env, napi_callb napi_wrap( env, instance, napiAsyKeyGenerator, [](napi_env env, void *data, void *hint) { - NapiAsyKeyGenerator *napiAsyKeyGenerator = (NapiAsyKeyGenerator *)(data); + NapiAsyKeyGenerator *napiAsyKeyGenerator = static_cast(data); delete napiAsyKeyGenerator; return; }, diff --git a/frameworks/js/napi/src/napi_cert_chain_validator.cpp b/frameworks/js/napi/src/napi_cert_chain_validator.cpp index 0f5976b..7f5767f 100644 --- a/frameworks/js/napi/src/napi_cert_chain_validator.cpp +++ b/frameworks/js/napi/src/napi_cert_chain_validator.cpp @@ -166,7 +166,7 @@ napi_value NapiCertChainValidator::Validate(napi_env env, napi_callback_info inf env, nullptr, GetResourceName(env, "Validate"), ValidateExecute, ValidateComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -236,7 +236,7 @@ napi_value NapiCertChainValidator::CreateCertChainValidator(napi_env env, napi_c napi_wrap( env, validatorInstance, ccvClass, [](napi_env env, void* data, void *hint) { - NapiCertChainValidator *ccv = (NapiCertChainValidator *)data; + NapiCertChainValidator *ccv = static_cast(data); delete ccv; }, nullptr, diff --git a/frameworks/js/napi/src/napi_cipher.cpp b/frameworks/js/napi/src/napi_cipher.cpp index a80418a..78c2b56 100644 --- a/frameworks/js/napi/src/napi_cipher.cpp +++ b/frameworks/js/napi/src/napi_cipher.cpp @@ -57,13 +57,13 @@ static void FreeParamsSpec(HcfParamsSpec *paramsSpec) return; } if (IV_PARAMS_SPEC.compare(paramsSpec->getType()) == 0) { - HcfIvParamsSpec *iv = (HcfIvParamsSpec *)paramsSpec; + HcfIvParamsSpec *iv = reinterpret_cast(paramsSpec); HcfFree(iv->iv.data); iv->iv.data = nullptr; iv->iv.len = 0; } if (GCM_PARAMS_SPEC.compare(paramsSpec->getType()) == 0) { - HcfGcmParamsSpec *gcm = (HcfGcmParamsSpec *)paramsSpec; + HcfGcmParamsSpec *gcm = reinterpret_cast(paramsSpec); HcfFree(gcm->iv.data); HcfFree(gcm->aad.data); HcfFree(gcm->tag.data); @@ -75,7 +75,7 @@ static void FreeParamsSpec(HcfParamsSpec *paramsSpec) gcm->tag.data = nullptr; } if (CCM_PARAMS_SPEC.compare(paramsSpec->getType()) == 0) { - HcfCcmParamsSpec *ccm = (HcfCcmParamsSpec *)paramsSpec; + HcfCcmParamsSpec *ccm = reinterpret_cast(paramsSpec); HcfFree(ccm->iv.data); HcfFree(ccm->aad.data); HcfFree(ccm->tag.data); @@ -428,7 +428,7 @@ napi_value NewAsyncInit(napi_env env, CipherFwkCtx context) AsyncInitReturn(env, status, data); return; }, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -454,7 +454,7 @@ napi_value NewAsyncUpdate(napi_env env, CipherFwkCtx context) AsyncUpdateReturn(env, status, data); return; }, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -480,7 +480,7 @@ napi_value NewAsyncDoFinal(napi_env env, CipherFwkCtx context) AsyncDoFinalReturn(env, status, data); return; }, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -579,7 +579,7 @@ napi_value NapiCipher::JsGetAlgorithm(napi_env env, napi_callback_info info) // execute C function const char *algo = cipher->getAlgorithm(cipher); napi_value instance = nullptr; - napi_create_string_utf8(env, (const char *)algo, NAPI_AUTO_LENGTH, &instance); + napi_create_string_utf8(env, algo, NAPI_AUTO_LENGTH, &instance); return instance; } diff --git a/frameworks/js/napi/src/napi_key_agreement.cpp b/frameworks/js/napi/src/napi_key_agreement.cpp index b88413b..c2371e5 100644 --- a/frameworks/js/napi/src/napi_key_agreement.cpp +++ b/frameworks/js/napi/src/napi_key_agreement.cpp @@ -194,7 +194,7 @@ static napi_value NewKeyAgreementAsyncWork(napi_env env, KeyAgreementCtx *ctx) KeyAgreementAsyncWorkReturn(env, status, data); return; }, - (void *)ctx, + static_cast(ctx), &ctx->asyncWork); napi_queue_async_work(env, ctx->asyncWork); diff --git a/frameworks/js/napi/src/napi_mac.cpp b/frameworks/js/napi/src/napi_mac.cpp index e7254be..96fcf97 100644 --- a/frameworks/js/napi/src/napi_mac.cpp +++ b/frameworks/js/napi/src/napi_mac.cpp @@ -130,7 +130,7 @@ static void MacInitExecute(napi_env env, void *data) MacCtx *context = static_cast(data); NapiMac *macClass = context->macClass; HcfMac *macObj = macClass->GetMac(); - HcfSymKey *symKey = (HcfSymKey *)context->symKey; + HcfSymKey *symKey = context->symKey; context->errCode = macObj->init(macObj, symKey); if (context->errCode != HCF_SUCCESS) { LOGE("init failed!"); @@ -156,7 +156,7 @@ static void MacUpdateExecute(napi_env env, void *data) MacCtx *context = static_cast(data); NapiMac *macClass = context->macClass; HcfMac *macObj = macClass->GetMac(); - HcfBlob *inBlob = static_cast(context->inBlob); + HcfBlob *inBlob = reinterpret_cast(context->inBlob); context->errCode = macObj->update(macObj, inBlob); if (context->errCode != HCF_SUCCESS) { LOGE("update failed!"); @@ -182,7 +182,7 @@ static void MacDoFinalExecute(napi_env env, void *data) MacCtx *context = static_cast(data); NapiMac *macClass = context->macClass; HcfMac *macObj = macClass->GetMac(); - HcfBlob *outBlob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *outBlob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (outBlob == nullptr) { LOGE("outBlob is null!"); context->errCode = HCF_ERR_MALLOC; @@ -250,7 +250,7 @@ napi_value NapiMac::MacInit(napi_env env, napi_callback_info info) env, nullptr, GetResourceName(env, "Init"), MacInitExecute, MacInitComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); if (context->asyncType == ASYNC_TYPE_PROMISE) { @@ -291,7 +291,7 @@ napi_value NapiMac::MacUpdate(napi_env env, napi_callback_info info) env, nullptr, GetResourceName(env, "MacUpate"), MacUpdateExecute, MacUpdateComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); if (context->asyncType == ASYNC_TYPE_PROMISE) { @@ -327,7 +327,7 @@ napi_value NapiMac::MacDoFinal(napi_env env, napi_callback_info info) env, nullptr, GetResourceName(env, "MacDoFinal"), MacDoFinalExecute, MacDoFinalComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); if (context->asyncType == ASYNC_TYPE_PROMISE) { @@ -449,7 +449,7 @@ napi_value NapiMac::CreateMac(napi_env env, napi_callback_info info) napi_wrap( env, instance, macNapiObj, [](napi_env env, void *data, void *hint) { - NapiMac *mac = (NapiMac *)(data); + NapiMac *mac = static_cast(data); delete mac; return; }, diff --git a/frameworks/js/napi/src/napi_md.cpp b/frameworks/js/napi/src/napi_md.cpp index 9f07afe..bbe8f71 100644 --- a/frameworks/js/napi/src/napi_md.cpp +++ b/frameworks/js/napi/src/napi_md.cpp @@ -151,7 +151,7 @@ static void MdDoFinalExecute(napi_env env, void *data) MdCtx *context = static_cast(data); NapiMd *mdClass = context->mdClass; HcfMd *mdObj = mdClass->GetMd(); - HcfBlob *outBlob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *outBlob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (outBlob == nullptr) { LOGE("outBlob is null!"); context->errCode = HCF_ERR_MALLOC; @@ -214,7 +214,7 @@ napi_value NapiMd::MdUpdate(napi_env env, napi_callback_info info) env, nullptr, GetResourceName(env, "MdUpdate"), MdUpdateExecute, MdUpdateComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); if (context->asyncType == ASYNC_TYPE_PROMISE) { @@ -249,7 +249,7 @@ napi_value NapiMd::MdDoFinal(napi_env env, napi_callback_info info) env, nullptr, GetResourceName(env, "MdDoFinal"), MdDoFinalExecute, MdDoFinalComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); if (context->asyncType == ASYNC_TYPE_PROMISE) { @@ -361,7 +361,7 @@ napi_value NapiMd::CreateMd(napi_env env, napi_callback_info info) napi_wrap( env, instance, mdNapiObj, [](napi_env env, void *data, void *hint) { - NapiMd *md = (NapiMd *)(data); + NapiMd *md = static_cast(data); delete md; return; }, diff --git a/frameworks/js/napi/src/napi_rand.cpp b/frameworks/js/napi/src/napi_rand.cpp index 5e867ee..79ad203 100644 --- a/frameworks/js/napi/src/napi_rand.cpp +++ b/frameworks/js/napi/src/napi_rand.cpp @@ -127,7 +127,7 @@ static void GenerateRandomExecute(napi_env env, void *data) RandCtx *context = static_cast(data); NapiRand *randClass = context->randClass; HcfRand *randObj = randClass->GetRand(); - HcfBlob *randBlob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *randBlob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (randBlob == nullptr) { LOGE("randBlob is null!"); context->errCode = HCF_ERR_MALLOC; @@ -165,7 +165,7 @@ static void SetSeedExecute(napi_env env, void *data) RandCtx *context = static_cast(data); NapiRand *randClass = context->randClass; HcfRand *randObj = randClass->GetRand(); - HcfBlob *seedBlob = static_cast(context->seedBlob); + HcfBlob *seedBlob = reinterpret_cast(context->seedBlob); context->errCode = randObj->setSeed(randObj, seedBlob); if (context->errCode != HCF_SUCCESS) { LOGE("setSeed failed!"); @@ -221,7 +221,7 @@ napi_value NapiRand::GenerateRandom(napi_env env, napi_callback_info info) env, nullptr, GetResourceName(env, "GenerateRandom"), GenerateRandomExecute, GenerateRandomComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); if (context->asyncType == ASYNC_TYPE_PROMISE) { @@ -265,7 +265,7 @@ napi_value NapiRand::SetSeed(napi_env env, napi_callback_info info) env, nullptr, GetResourceName(env, "SetSeed"), SetSeedExecute, SetSeedComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); if (context->asyncType == ASYNC_TYPE_PROMISE) { @@ -338,7 +338,7 @@ napi_value NapiRand::CreateRand(napi_env env, napi_callback_info info) napi_wrap( env, instance, randNapiObj, [](napi_env env, void *data, void *hint) { - NapiRand *rand = (NapiRand *)(data); + NapiRand *rand = static_cast(data); delete rand; return; }, diff --git a/frameworks/js/napi/src/napi_sign.cpp b/frameworks/js/napi/src/napi_sign.cpp index 508671d..c0497c1 100644 --- a/frameworks/js/napi/src/napi_sign.cpp +++ b/frameworks/js/napi/src/napi_sign.cpp @@ -441,7 +441,7 @@ static napi_value NewSignJsInitAsyncWork(napi_env env, SignInitCtx *ctx) SignJsInitAsyncWorkReturn(env, status, data); return; }, - (void *)ctx, + static_cast(ctx), &ctx->asyncWork); napi_queue_async_work(env, ctx->asyncWork); @@ -469,7 +469,7 @@ static napi_value NewSignJsUpdateAsyncWork(napi_env env, SignUpdateCtx *ctx) SignJsUpdateAsyncWorkReturn(env, status, data); return; }, - (void *)ctx, + static_cast(ctx), &ctx->asyncWork); napi_queue_async_work(env, ctx->asyncWork); @@ -497,7 +497,7 @@ static napi_value NewSignJsDoFinalAsyncWork(napi_env env, SignDoFinalCtx *ctx) SignJsDoFinalAsyncWorkReturn(env, status, data); return; }, - (void *)ctx, + static_cast(ctx), &ctx->asyncWork); napi_queue_async_work(env, ctx->asyncWork); @@ -625,7 +625,7 @@ napi_value NapiSign::CreateJsSign(napi_env env, napi_callback_info info) napi_wrap( env, instance, napiSign, [](napi_env env, void *data, void *hint) { - NapiSign *napiSign = (NapiSign *)(data); + NapiSign *napiSign = static_cast(data); delete napiSign; return; }, diff --git a/frameworks/js/napi/src/napi_sym_key_generator.cpp b/frameworks/js/napi/src/napi_sym_key_generator.cpp index 41540cc..d6b61fa 100644 --- a/frameworks/js/napi/src/napi_sym_key_generator.cpp +++ b/frameworks/js/napi/src/napi_sym_key_generator.cpp @@ -262,7 +262,7 @@ static napi_value NewConvertKeyAsyncWork(napi_env env, SymKeyGeneratorFwkCtx con AsyncKeyReturn(env, status, data); return; }, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -290,7 +290,7 @@ static napi_value NewGenKeyAsyncWork(napi_env env, SymKeyGeneratorFwkCtx context AsyncKeyReturn(env, status, data); return; }, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -433,7 +433,7 @@ napi_value NapiSymKeyGenerator::JsGetAlgorithm(napi_env env, napi_callback_info const char *algo = generator->getAlgoName(generator); napi_value instance = nullptr; - napi_create_string_utf8(env, (const char *)algo, NAPI_AUTO_LENGTH, &instance); + napi_create_string_utf8(env, algo, NAPI_AUTO_LENGTH, &instance); return instance; } diff --git a/frameworks/js/napi/src/napi_utils.cpp b/frameworks/js/napi/src/napi_utils.cpp index 2d4d5d4..e09802d 100644 --- a/frameworks/js/napi/src/napi_utils.cpp +++ b/frameworks/js/napi/src/napi_utils.cpp @@ -52,7 +52,7 @@ napi_value ConvertArrayToNapiValue(napi_env env, HcfArray *array) return nullptr; } for (uint32_t i = 0; i < array->count; i++) { - HcfBlob *blob = (HcfBlob *)(array->data + i); + HcfBlob *blob = reinterpret_cast(array->data + i); napi_value outBuffer = GenerateArrayBuffer(env, blob->data, blob->len); if (outBuffer == nullptr) { LOGE("generate array buffer failed!"); @@ -70,7 +70,7 @@ napi_value ConvertArrayToNapiValue(napi_env env, HcfArray *array) napi_value GenerateArrayBuffer(napi_env env, uint8_t *data, uint32_t size) { - uint8_t *buffer = (uint8_t *)HcfMalloc(size, 0); + uint8_t *buffer = static_cast(HcfMalloc(size, 0)); if (buffer == nullptr) { LOGE("malloc uint8 array buffer failed!"); return nullptr; @@ -119,7 +119,7 @@ static bool GetDataOfEncodingBlob(napi_env env, napi_value data, HcfEncodingBlob LOGE("input data length is 0"); return false; } - encodingBlob->data = (uint8_t *)HcfMalloc(length, 0); + encodingBlob->data = static_cast(HcfMalloc(length, 0)); if (encodingBlob->data == nullptr) { LOGE("malloc encoding blob data failed!"); return false; @@ -136,7 +136,7 @@ static bool GetDataOfEncodingBlob(napi_env env, napi_value data, HcfEncodingBlob bool GetEncodingBlobFromValue(napi_env env, napi_value obj, HcfEncodingBlob **encodingBlob) { - *encodingBlob = (HcfEncodingBlob *)HcfMalloc(sizeof(HcfEncodingBlob), 0); + *encodingBlob = static_cast(HcfMalloc(sizeof(HcfEncodingBlob), 0)); if (*encodingBlob == nullptr) { LOGE("malloc encoding blob failed!"); return false; @@ -217,13 +217,13 @@ HcfBlob *GetBlobFromNapiValue(napi_env env, napi_value arg) return nullptr; } - HcfBlob *newBlob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *newBlob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (newBlob == NULL) { LOGE("Failed to allocate newBlob memory!"); return nullptr; } newBlob->len = length; - newBlob->data = (uint8_t *)HcfMalloc(length, 0); + newBlob->data = static_cast(HcfMalloc(length, 0)); if (newBlob->data == nullptr) { LOGE("malloc blob data failed!"); HcfFree(newBlob); @@ -254,7 +254,7 @@ static const char *GetCcmParamsSpecType() return CCM_PARAMS_SPEC.c_str(); } -static HcfBlob *GetBlobFromParamsSpec(napi_env env, napi_value arg, string type) +static HcfBlob *GetBlobFromParamsSpec(napi_env env, napi_value arg, const string &type) { napi_value data = nullptr; HcfBlob *blob = nullptr; @@ -274,7 +274,7 @@ static HcfBlob *GetBlobFromParamsSpec(napi_env env, napi_value arg, string type) static bool GetIvParamsSpec(napi_env env, napi_value arg, HcfParamsSpec **paramsSpec) { - HcfIvParamsSpec *ivParamsSpec = (HcfIvParamsSpec *)HcfMalloc(sizeof(HcfIvParamsSpec), 0); + HcfIvParamsSpec *ivParamsSpec = reinterpret_cast(HcfMalloc(sizeof(HcfIvParamsSpec), 0)); if (ivParamsSpec == nullptr) { LOGE("ivParamsSpec malloc failed!"); return false; @@ -288,7 +288,7 @@ static bool GetIvParamsSpec(napi_env env, napi_value arg, HcfParamsSpec **params } ivParamsSpec->base.getType = GetIvParamsSpecType; ivParamsSpec->iv = *iv; - *paramsSpec = (HcfParamsSpec *)ivParamsSpec; + *paramsSpec = reinterpret_cast(ivParamsSpec); HcfFree(iv); return true; } @@ -319,7 +319,7 @@ static bool GetGcmParamsSpec(napi_env env, napi_value arg, HcfCryptoMode opMode, HcfBlob authTag = {}; bool ret = false; - HcfGcmParamsSpec *gcmParamsSpec = (HcfGcmParamsSpec *)HcfMalloc(sizeof(HcfGcmParamsSpec), 0); + HcfGcmParamsSpec *gcmParamsSpec = reinterpret_cast(HcfMalloc(sizeof(HcfGcmParamsSpec), 0)); if (gcmParamsSpec == nullptr) { LOGE("gcmParamsSpec malloc failed!"); return false; @@ -338,7 +338,7 @@ static bool GetGcmParamsSpec(napi_env env, napi_value arg, HcfCryptoMode opMode, goto clearup; } } else if (opMode == ENCRYPT_MODE) { - authTag.data = (uint8_t *)HcfMalloc(GCM_AUTH_TAG_LEN, 0); + authTag.data = static_cast(HcfMalloc(GCM_AUTH_TAG_LEN, 0)); if (authTag.data == nullptr) { LOGE("get tag failed!"); goto clearup; @@ -352,7 +352,7 @@ static bool GetGcmParamsSpec(napi_env env, napi_value arg, HcfCryptoMode opMode, gcmParamsSpec->iv = *iv; gcmParamsSpec->aad = *aad; gcmParamsSpec->tag = opMode == DECRYPT_MODE ? *tag : authTag; - *paramsSpec = (HcfParamsSpec *)gcmParamsSpec; + *paramsSpec = reinterpret_cast(gcmParamsSpec); ret = true; clearup: if (!ret) { @@ -393,7 +393,7 @@ static bool GetCcmParamsSpec(napi_env env, napi_value arg, HcfCryptoMode opMode, goto clearup; } } else if (opMode == ENCRYPT_MODE) { - authTag.data = (uint8_t *)HcfMalloc(CCM_AUTH_TAG_LEN, 0); + authTag.data = static_cast(HcfMalloc(CCM_AUTH_TAG_LEN, 0)); if (authTag.data == nullptr) { LOGE("get tag failed!"); goto clearup; @@ -406,7 +406,7 @@ static bool GetCcmParamsSpec(napi_env env, napi_value arg, HcfCryptoMode opMode, ccmParamsSpec->iv = *iv; ccmParamsSpec->aad = *aad; ccmParamsSpec->tag = opMode == DECRYPT_MODE ? *tag : authTag; - *paramsSpec = (HcfParamsSpec *)ccmParamsSpec; + *paramsSpec = reinterpret_cast(ccmParamsSpec); ret = true; clearup: if (!ret) { @@ -456,7 +456,7 @@ napi_value ConvertBlobToNapiValue(napi_env env, HcfBlob *blob) LOGE("Invalid blob!"); return nullptr; } - uint8_t *buffer = (uint8_t *)HcfMalloc(blob->len, 0); + uint8_t *buffer = static_cast(HcfMalloc(blob->len, 0)); if (buffer == nullptr) { LOGE("malloc uint8 array buffer failed!"); return nullptr; @@ -512,7 +512,7 @@ static bool GetDataOfCertChain(napi_env env, napi_value data, HcfCertChainData * LOGE("input data length is 0"); return false; } - certChain->data = (uint8_t *)HcfMalloc(length, 0); + certChain->data = static_cast(HcfMalloc(length, 0)); if (certChain->data == nullptr) { LOGE("malloc cert chain data failed!"); return false; @@ -529,7 +529,7 @@ static bool GetDataOfCertChain(napi_env env, napi_value data, HcfCertChainData * bool GetCertChainFromValue(napi_env env, napi_value obj, HcfCertChainData **certChainData) { - *certChainData = (HcfCertChainData *)HcfMalloc(sizeof(HcfCertChainData), 0); + *certChainData = static_cast(HcfMalloc(sizeof(HcfCertChainData), 0)); if (*certChainData == nullptr) { LOGE("malloc certChainData failed!"); return false; diff --git a/frameworks/js/napi/src/napi_verify.cpp b/frameworks/js/napi/src/napi_verify.cpp index 0886417..94dc577 100644 --- a/frameworks/js/napi/src/napi_verify.cpp +++ b/frameworks/js/napi/src/napi_verify.cpp @@ -468,7 +468,7 @@ static napi_value NewVerifyJsInitAsyncWork(napi_env env, VerifyInitCtx *ctx) VerifyJsInitAsyncWorkReturn(env, status, data); return; }, - (void *)ctx, + static_cast(ctx), &ctx->asyncWork); napi_queue_async_work(env, ctx->asyncWork); @@ -496,7 +496,7 @@ static napi_value NewVerifyJsUpdateAsyncWork(napi_env env, VerifyUpdateCtx *ctx) VerifyJsUpdateAsyncWorkReturn(env, status, data); return; }, - (void *)ctx, + static_cast(ctx), &ctx->asyncWork); napi_queue_async_work(env, ctx->asyncWork); @@ -524,7 +524,7 @@ static napi_value NewVerifyJsDoFinalAsyncWork(napi_env env, VerifyDoFinalCtx *ct VerifyJsDoFinalAsyncWorkReturn(env, status, data); return; }, - (void *)ctx, + static_cast(ctx), &ctx->asyncWork); napi_queue_async_work(env, ctx->asyncWork); @@ -653,7 +653,7 @@ napi_value NapiVerify::CreateJsVerify(napi_env env, napi_callback_info info) napi_wrap( env, instance, napiVerify, [](napi_env env, void *data, void *hint) { - NapiVerify *napiVerify = (NapiVerify *)(data); + NapiVerify *napiVerify = static_cast(data); delete napiVerify; return; }, diff --git a/frameworks/js/napi/src/napi_x509_certificate.cpp b/frameworks/js/napi/src/napi_x509_certificate.cpp index 798292d..27c8c29 100644 --- a/frameworks/js/napi/src/napi_x509_certificate.cpp +++ b/frameworks/js/napi/src/napi_x509_certificate.cpp @@ -139,7 +139,7 @@ static void VerifyExecute(napi_env env, void *data) LOGI("start to verify."); CfCtx *context = static_cast(data); HcfX509Certificate *cert = context->certClass->GetX509Cert(); - context->errCode = cert->base.verify((HcfCertificate *)cert, context->pubKey); + context->errCode = cert->base.verify(&(cert->base), context->pubKey); if (context->errCode != HCF_SUCCESS) { LOGE("verify cert failed!"); context->errMsg = "verify cert failed"; @@ -176,14 +176,14 @@ static void GetEncodedExecute(napi_env env, void *data) { CfCtx *context = static_cast(data); HcfX509Certificate *cert = context->certClass->GetX509Cert(); - HcfEncodingBlob *encodingBlob = (HcfEncodingBlob *)HcfMalloc(sizeof(HcfEncodingBlob), 0); + HcfEncodingBlob *encodingBlob = static_cast(HcfMalloc(sizeof(HcfEncodingBlob), 0)); if (encodingBlob == nullptr) { LOGE("malloc encoding blob failed!"); context->errCode = HCF_ERR_MALLOC; context->errMsg = "malloc encoding blob failed"; return; } - context->errCode = cert->base.getEncoded((HcfCertificate *)cert, encodingBlob); + context->errCode = cert->base.getEncoded(&(cert->base), encodingBlob); if (context->errCode != HCF_SUCCESS) { LOGE("get cert encoded failed!"); context->errMsg = "get cert encoded failed"; @@ -208,7 +208,7 @@ void GetPublicKeyExecute(napi_env env, void *data) { CfCtx *context = static_cast(data); HcfX509Certificate *cert = context->certClass->GetX509Cert(); - context->errCode = cert->base.getPublicKey((HcfCertificate *)cert, &context->returnPubKey); + context->errCode = cert->base.getPublicKey(&(cert->base), &context->returnPubKey); if (context->errCode != HCF_SUCCESS) { LOGE("get cert public key failed!"); context->errMsg = "get cert public key failed"; @@ -228,7 +228,7 @@ void GetPublicKeyComplete(napi_env env, napi_status status, void *data) napi_wrap( env, instance, pubKeyClass, [](napi_env env, void *data, void *hint) { - NapiPubKey *pubKeyClass = (NapiPubKey *)data; + NapiPubKey *pubKeyClass = static_cast(data); delete pubKeyClass; return; }, @@ -273,7 +273,7 @@ napi_value NapiX509Certificate::Verify(napi_env env, napi_callback_info info) env, nullptr, GetResourceName(env, "Verify"), VerifyExecute, VerifyComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -310,7 +310,7 @@ napi_value NapiX509Certificate::GetEncoded(napi_env env, napi_callback_info info env, nullptr, GetResourceName(env, "GetEncoded"), GetEncodedExecute, GetEncodedComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -347,7 +347,7 @@ napi_value NapiX509Certificate::GetPublicKey(napi_env env, napi_callback_info in env, nullptr, GetResourceName(env, "GetPublicKey"), GetPublicKeyExecute, GetPublicKeyComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -390,7 +390,7 @@ napi_value NapiX509Certificate::CheckValidityWithDate(napi_env env, napi_callbac env, nullptr, GetResourceName(env, "CheckValidityWithDate"), checkValidityWithDateExecute, checkValidityWithDateComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -441,7 +441,7 @@ napi_value NapiX509Certificate::GetIssuerName(napi_env env, napi_callback_info i return nullptr; } - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -471,7 +471,7 @@ napi_value NapiX509Certificate::GetSubjectName(napi_env env, napi_callback_info return nullptr; } - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -501,7 +501,7 @@ napi_value NapiX509Certificate::GetNotBeforeTime(napi_env env, napi_callback_inf return nullptr; } - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -516,7 +516,7 @@ napi_value NapiX509Certificate::GetNotBeforeTime(napi_env env, napi_callback_inf return nullptr; } napi_value result = nullptr; - napi_create_string_utf8(env, (char *)blob->data, blob->len, &result); + napi_create_string_utf8(env, reinterpret_cast(blob->data), blob->len, &result); HcfBlobDataFree(blob); HcfFree(blob); blob = nullptr; @@ -532,7 +532,7 @@ napi_value NapiX509Certificate::GetNotAfterTime(napi_env env, napi_callback_info return nullptr; } - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -547,7 +547,7 @@ napi_value NapiX509Certificate::GetNotAfterTime(napi_env env, napi_callback_info return nullptr; } napi_value result = nullptr; - napi_create_string_utf8(env, (char *)blob->data, blob->len, &result); + napi_create_string_utf8(env, reinterpret_cast(blob->data), blob->len, &result); HcfBlobDataFree(blob); HcfFree(blob); blob = nullptr; @@ -563,7 +563,7 @@ napi_value NapiX509Certificate::GetSignature(napi_env env, napi_callback_info in return nullptr; } - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -593,7 +593,7 @@ napi_value NapiX509Certificate::GetSigAlgName(napi_env env, napi_callback_info i return nullptr; } - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -608,7 +608,7 @@ napi_value NapiX509Certificate::GetSigAlgName(napi_env env, napi_callback_info i return nullptr; } napi_value result = nullptr; - napi_create_string_utf8(env, (char *)blob->data, blob->len, &result); + napi_create_string_utf8(env, reinterpret_cast(blob->data), blob->len, &result); HcfBlobDataFree(blob); HcfFree(blob); blob = nullptr; @@ -623,7 +623,7 @@ napi_value NapiX509Certificate::GetSigAlgOID(napi_env env, napi_callback_info in if (!CheckArgsCount(env, argc, ARGS_SIZE_ZERO, true)) { return nullptr; } - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -638,7 +638,7 @@ napi_value NapiX509Certificate::GetSigAlgOID(napi_env env, napi_callback_info in return nullptr; } napi_value result = nullptr; - napi_create_string_utf8(env, (char *)blob->data, blob->len, &result); + napi_create_string_utf8(env, reinterpret_cast(blob->data), blob->len, &result); HcfBlobDataFree(blob); HcfFree(blob); blob = nullptr; @@ -654,7 +654,7 @@ napi_value NapiX509Certificate::GetSigAlgParams(napi_env env, napi_callback_info return nullptr; } - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -683,7 +683,7 @@ napi_value NapiX509Certificate::GetKeyUsage(napi_env env, napi_callback_info inf if (!CheckArgsCount(env, argc, ARGS_SIZE_ZERO, true)) { return nullptr; } - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -712,7 +712,7 @@ napi_value NapiX509Certificate::GetExtendedKeyUsage(napi_env env, napi_callback_ return nullptr; } - HcfArray *array = (HcfArray *)HcfMalloc(sizeof(HcfArray), 0); + HcfArray *array = reinterpret_cast(HcfMalloc(sizeof(HcfArray), 0)); if (array == nullptr) { LOGE("malloc array failed!"); return nullptr; @@ -758,7 +758,7 @@ napi_value NapiX509Certificate::GetSubjectAlternativeNames(napi_env env, napi_ca return nullptr; } - HcfArray *array = (HcfArray *)HcfMalloc(sizeof(HcfArray), 0); + HcfArray *array = reinterpret_cast(HcfMalloc(sizeof(HcfArray), 0)); if (array == nullptr) { LOGE("malloc array failed!"); return nullptr; @@ -787,7 +787,7 @@ napi_value NapiX509Certificate::GetIssuerAlternativeNames(napi_env env, napi_cal return nullptr; } - HcfArray *array = (HcfArray *)HcfMalloc(sizeof(HcfArray), 0); + HcfArray *array = reinterpret_cast(HcfMalloc(sizeof(HcfArray), 0)); if (array == nullptr) { LOGE("malloc array failed!"); return nullptr; @@ -1078,7 +1078,7 @@ void NapiX509Certificate::CreateX509CertComplete(napi_env env, napi_status statu napi_wrap( env, instance, x509CertClass, [](napi_env env, void *data, void *hint) { - NapiX509Certificate *certClass = (NapiX509Certificate *)data; + NapiX509Certificate *certClass = static_cast(data); delete certClass; return; }, @@ -1117,7 +1117,7 @@ napi_value NapiX509Certificate::NapiCreateX509Cert(napi_env env, napi_callback_i env, nullptr, GetResourceName(env, "CreateX509Cert"), CreateX509CertExecute, CreateX509CertComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); diff --git a/frameworks/js/napi/src/napi_x509_crl.cpp b/frameworks/js/napi/src/napi_x509_crl.cpp index 6415768..b4b8a48 100644 --- a/frameworks/js/napi/src/napi_x509_crl.cpp +++ b/frameworks/js/napi/src/napi_x509_crl.cpp @@ -155,7 +155,7 @@ void IsInvokedExecute(napi_env env, void *data) { CfCtx *context = static_cast(data); HcfX509Crl *x509Crl = context->crlClass->GetX509Crl(); - context->isRevoked = x509Crl->base.isRevoked((HcfCrl *)x509Crl, (HcfCertificate *)context->certificate); + context->isRevoked = x509Crl->base.isRevoked(&(x509Crl->base), &(context->certificate->base)); context->errCode = HCF_SUCCESS; } @@ -176,7 +176,7 @@ static void GetEncodedExecute(napi_env env, void *data) { CfCtx *context = static_cast(data); HcfX509Crl *x509Crl = context->crlClass->GetX509Crl(); - HcfEncodingBlob *encodingBlob = (HcfEncodingBlob *)HcfMalloc(sizeof(HcfEncodingBlob), 0); + HcfEncodingBlob *encodingBlob = static_cast(HcfMalloc(sizeof(HcfEncodingBlob), 0)); if (encodingBlob == nullptr) { LOGE("malloc encoding blob failed!"); context->errCode = HCF_ERR_MALLOC; @@ -246,7 +246,7 @@ void GetRevokedCertificateComplete(napi_env env, napi_status status, void *data) napi_wrap( env, instance, x509CrlEntryClass, [](napi_env env, void *data, void *hint) { - NapiX509CrlEntry *x509CrlEntryClass = (NapiX509CrlEntry *)data; + NapiX509CrlEntry *x509CrlEntryClass = static_cast(data); delete x509CrlEntryClass; return; }, @@ -279,7 +279,7 @@ void GetRevokedCertificateWithCertComplete(napi_env env, napi_status status, voi napi_wrap( env, instance, x509CrlEntryClass, [](napi_env env, void *data, void *hint) { - NapiX509CrlEntry *x509CrlEntryClass = (NapiX509CrlEntry *)data; + NapiX509CrlEntry *x509CrlEntryClass = static_cast(data); delete x509CrlEntryClass; return; }, @@ -292,7 +292,7 @@ void GetRevokedCertificatesExecute(napi_env env, void *data) { CfCtx *context = static_cast(data); HcfX509Crl *x509Crl = context->crlClass->GetX509Crl(); - HcfArray *array = (HcfArray *)HcfMalloc(sizeof(HcfArray), 0); + HcfArray *array = reinterpret_cast(HcfMalloc(sizeof(HcfArray), 0)); if (array == nullptr) { LOGE("malloc array failed!"); context->errCode = HCF_ERR_MALLOC; @@ -320,14 +320,14 @@ static napi_value GenerateCrlEntryArray(napi_env env, HcfArray *array) napi_value returnArray = nullptr; napi_create_array(env, &returnArray); for (uint32_t i = 0; i < array->count; i++) { - HcfBlob *blob = (HcfBlob *)(array->data + i); - HcfX509CrlEntry *entry = (HcfX509CrlEntry *)blob->data; + HcfBlob *blob = reinterpret_cast(array->data + i); + HcfX509CrlEntry *entry = reinterpret_cast(blob->data); napi_value instance = NapiX509CrlEntry::CreateX509CrlEntry(env); NapiX509CrlEntry *x509CrlEntryClass = new NapiX509CrlEntry(entry); napi_wrap( env, instance, x509CrlEntryClass, [](napi_env env, void *data, void *hint) { - NapiX509CrlEntry *x509CrlEntryClass = (NapiX509CrlEntry *)data; + NapiX509CrlEntry *x509CrlEntryClass = static_cast(data); delete x509CrlEntryClass; return; }, @@ -354,7 +354,7 @@ void GetTBSCertListExecute(napi_env env, void *data) { CfCtx *context = static_cast(data); HcfX509Crl *x509Crl = context->crlClass->GetX509Crl(); - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); context->errCode = HCF_ERR_MALLOC; @@ -416,7 +416,7 @@ napi_value NapiX509Crl::IsRevoked(napi_env env, napi_callback_info info) env, nullptr, GetResourceName(env, "IsRevoked"), IsInvokedExecute, IsInvokedComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -436,7 +436,7 @@ napi_value NapiX509Crl::GetType(napi_env env, napi_callback_info info) } HcfX509Crl *x509Crl = GetX509Crl(); - const char *type = x509Crl->base.getType((HcfCrl *)x509Crl); + const char *type = x509Crl->base.getType(&(x509Crl->base)); napi_value result = nullptr; napi_create_string_utf8(env, type, strlen(type), &result); return result; @@ -468,7 +468,7 @@ napi_value NapiX509Crl::GetEncoded(napi_env env, napi_callback_info info) env, nullptr, GetResourceName(env, "GetEncoded"), GetEncodedExecute, GetEncodedComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -514,7 +514,7 @@ napi_value NapiX509Crl::Verify(napi_env env, napi_callback_info info) env, nullptr, GetResourceName(env, "Verify"), VerifyExecute, VerifyComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -549,7 +549,7 @@ napi_value NapiX509Crl::GetIssuerDN(napi_env env, napi_callback_info info) } HcfX509Crl *x509Crl = GetX509Crl(); - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -578,7 +578,7 @@ napi_value NapiX509Crl::GetThisUpdate(napi_env env, napi_callback_info info) } HcfX509Crl *x509Crl = GetX509Crl(); - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -592,7 +592,7 @@ napi_value NapiX509Crl::GetThisUpdate(napi_env env, napi_callback_info info) return nullptr; } napi_value result = nullptr; - napi_create_string_utf8(env, (char *)blob->data, blob->len, &result); + napi_create_string_utf8(env, reinterpret_cast(blob->data), blob->len, &result); HcfBlobDataFree(blob); HcfFree(blob); blob = nullptr; @@ -608,7 +608,7 @@ napi_value NapiX509Crl::GetNextUpdate(napi_env env, napi_callback_info info) } HcfX509Crl *x509Crl = GetX509Crl(); - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -622,7 +622,7 @@ napi_value NapiX509Crl::GetNextUpdate(napi_env env, napi_callback_info info) return nullptr; } napi_value result = nullptr; - napi_create_string_utf8(env, (char *)blob->data, blob->len, &result); + napi_create_string_utf8(env, reinterpret_cast(blob->data), blob->len, &result); HcfBlobDataFree(blob); HcfFree(blob); blob = nullptr; @@ -661,7 +661,7 @@ napi_value NapiX509Crl::GetRevokedCertificate(napi_env env, napi_callback_info i env, nullptr, GetResourceName(env, "GetRevokedCertificate"), GetRevokedCertificateExecute, GetRevokedCertificateComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -707,7 +707,7 @@ napi_value NapiX509Crl::GetRevokedCertificateWithCert(napi_env env, napi_callbac env, nullptr, GetResourceName(env, "GetRevokedCertificateWithCert"), GetRevokedCertificateWithCertExecute, GetRevokedCertificateWithCertComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -744,7 +744,7 @@ napi_value NapiX509Crl::GetRevokedCertificates(napi_env env, napi_callback_info env, nullptr, GetResourceName(env, "GetRevokedCertificates"), GetRevokedCertificatesExecute, GetRevokedCertificatesComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -781,7 +781,7 @@ napi_value NapiX509Crl::GetTBSCertList(napi_env env, napi_callback_info info) env, nullptr, GetResourceName(env, "GetTBSCertList"), GetTBSCertListExecute, GetTBSCertListComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -801,7 +801,7 @@ napi_value NapiX509Crl::GetSignature(napi_env env, napi_callback_info info) } HcfX509Crl *x509Crl = GetX509Crl(); - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -830,7 +830,7 @@ napi_value NapiX509Crl::GetSigAlgName(napi_env env, napi_callback_info info) } HcfX509Crl *x509Crl = GetX509Crl(); - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -844,7 +844,7 @@ napi_value NapiX509Crl::GetSigAlgName(napi_env env, napi_callback_info info) return nullptr; } napi_value result = nullptr; - napi_create_string_utf8(env, (char *)blob->data, blob->len, &result); + napi_create_string_utf8(env, reinterpret_cast(blob->data), blob->len, &result); HcfBlobDataFree(blob); HcfFree(blob); blob = nullptr; @@ -860,7 +860,7 @@ napi_value NapiX509Crl::GetSigAlgOID(napi_env env, napi_callback_info info) } HcfX509Crl *x509Crl = GetX509Crl(); - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -874,7 +874,7 @@ napi_value NapiX509Crl::GetSigAlgOID(napi_env env, napi_callback_info info) return nullptr; } napi_value result = nullptr; - napi_create_string_utf8(env, (char *)blob->data, blob->len, &result); + napi_create_string_utf8(env, reinterpret_cast(blob->data), blob->len, &result); HcfBlobDataFree(blob); HcfFree(blob); blob = nullptr; @@ -890,7 +890,7 @@ napi_value NapiX509Crl::GetSigAlgParams(napi_env env, napi_callback_info info) } HcfX509Crl *x509Crl = GetX509Crl(); - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); return nullptr; @@ -1143,7 +1143,7 @@ void NapiX509Crl::CreateX509CrlComplete(napi_env env, napi_status status, void * napi_wrap( env, instance, x509CrlClass, [](napi_env env, void *data, void *hint) { - NapiX509Crl *crlClass = (NapiX509Crl *)data; + NapiX509Crl *crlClass = static_cast(data); delete crlClass; return; }, @@ -1182,7 +1182,7 @@ napi_value NapiX509Crl::NapiCreateX509Crl(napi_env env, napi_callback_info info) env, nullptr, GetResourceName(env, "createX509Crl"), CreateX509CrlExecute, CreateX509CrlComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); diff --git a/frameworks/js/napi/src/napi_x509_crl_entry.cpp b/frameworks/js/napi/src/napi_x509_crl_entry.cpp index dec22de..e7b0133 100644 --- a/frameworks/js/napi/src/napi_x509_crl_entry.cpp +++ b/frameworks/js/napi/src/napi_x509_crl_entry.cpp @@ -133,7 +133,7 @@ static void GetEncodedExecute(napi_env env, void *data) { CfCtx *context = static_cast(data); HcfX509CrlEntry *x509CrlEntry = context->crlEntryClass->GetX509CrlEntry(); - HcfEncodingBlob *encodingBlob = (HcfEncodingBlob *)HcfMalloc(sizeof(HcfEncodingBlob), 0); + HcfEncodingBlob *encodingBlob = static_cast(HcfMalloc(sizeof(HcfEncodingBlob), 0)); if (encodingBlob == nullptr) { LOGE("malloc encoding blob failed!"); context->errCode = HCF_ERR_MALLOC; @@ -166,7 +166,7 @@ static void GetCertificateIssuerExecute(napi_env env, void *data) { CfCtx *context = static_cast(data); HcfX509CrlEntry *x509CrlEntry = context->crlEntryClass->GetX509CrlEntry(); - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); context->errCode = HCF_ERR_MALLOC; @@ -199,7 +199,7 @@ static void GetRevocationDateExecute(napi_env env, void *data) { CfCtx *context = static_cast(data); HcfX509CrlEntry *x509CrlEntry = context->crlEntryClass->GetX509CrlEntry(); - HcfBlob *blob = (HcfBlob *)HcfMalloc(sizeof(HcfBlob), 0); + HcfBlob *blob = reinterpret_cast(HcfMalloc(sizeof(HcfBlob), 0)); if (blob == nullptr) { LOGE("malloc blob failed!"); context->errCode = HCF_ERR_MALLOC; @@ -224,7 +224,7 @@ static void GetRevocationDateComplete(napi_env env, napi_status status, void *da } HcfBlob *blob = context->blob; napi_value result = nullptr; - napi_create_string_utf8(env, (char *)blob->data, blob->len, &result); + napi_create_string_utf8(env, reinterpret_cast(blob->data), blob->len, &result); ReturnResult(env, context, result); FreeCryptoFwkCtx(env, context); } @@ -255,7 +255,7 @@ napi_value NapiX509CrlEntry::GetEncoded(napi_env env, napi_callback_info info) env, nullptr, GetResourceName(env, "GetEncoded"), GetEncodedExecute, GetEncodedComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -307,7 +307,7 @@ napi_value NapiX509CrlEntry::GetCertificateIssuer(napi_env env, napi_callback_in env, nullptr, GetResourceName(env, "GetCertificateIssuer"), GetCertificateIssuerExecute, GetCertificateIssuerComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); @@ -345,7 +345,7 @@ napi_value NapiX509CrlEntry::GetRevocationDate(napi_env env, napi_callback_info env, nullptr, GetResourceName(env, "GetRevocationDate"), GetRevocationDateExecute, GetRevocationDateComplete, - (void *)context, + static_cast(context), &context->asyncWork); napi_queue_async_work(env, context->asyncWork); diff --git a/plugin/openssl_plugin/key/asy_key_generator/src/ecc_asy_key_generator_openssl.c b/plugin/openssl_plugin/key/asy_key_generator/src/ecc_asy_key_generator_openssl.c index 82b50ca..c12c7c5 100644 --- a/plugin/openssl_plugin/key/asy_key_generator/src/ecc_asy_key_generator_openssl.c +++ b/plugin/openssl_plugin/key/asy_key_generator/src/ecc_asy_key_generator_openssl.c @@ -239,7 +239,7 @@ static HcfResult GetEccPubKeyEncoded(HcfKey *self, HcfBlob *returnBlob) } uint32_t actualLen = EC_POINT_point2oct(group, impl->pk, POINT_CONVERSION_UNCOMPRESSED, outData, maxLen, NULL); EC_GROUP_free(group); - if (actualLen <= 0) { + if (actualLen == 0) { HcfPrintOpensslError(); HcfFree(outData); return HCF_ERR_CRYPTO_OPERATION; @@ -274,7 +274,7 @@ static HcfResult GetEccPriKeyEncoded(HcfKey *self, HcfBlob *returnBlob) return HCF_ERR_MALLOC; } uint32_t actualLen = BN_bn2binpad(impl->sk, outData, maxLen); - if (actualLen <= 0) { + if (actualLen == 0) { HcfPrintOpensslError(); HcfFree(outData); return HCF_ERR_CRYPTO_OPERATION; diff --git a/test/fuzztest/certificate/x509certificate_fuzzer/x509certificate_fuzzer.cpp b/test/fuzztest/certificate/x509certificate_fuzzer/x509certificate_fuzzer.cpp index bc48702..1dfcd1d 100755 --- a/test/fuzztest/certificate/x509certificate_fuzzer/x509certificate_fuzzer.cpp +++ b/test/fuzztest/certificate/x509certificate_fuzzer/x509certificate_fuzzer.cpp @@ -20,40 +20,39 @@ #include "securec.h" #include "blob.h" -#include "log.h" #include "result.h" #include "x509_certificate.h" -static char g_fuzzCert[] = -"-----BEGIN CERTIFICATE-----\r\n" -"MIIEMjCCAxqgAwIBAgICARAwDQYJKoZIhvcNAQELBQAwdjELMAkGA1UEBhMCQ04x\r\n" -"CzAJBgNVBAgMAkJKMQswCQYDVQQHDAJCSjELMAkGA1UECgwCSEQxDDAKBgNVBAsM\r\n" -"A2RldjELMAkGA1UEAwwCY2ExJTAjBgkqhkiG9w0BCQEWFmNhQGNyeXB0b2ZyYW1l\r\n" -"d29yay5jb20wHhcNMjIwODE5MTI0OTA2WhcNMzIwODE2MTI0OTA2WjB2MQswCQYD\r\n" -"VQQGEwJDTjELMAkGA1UECAwCQkoxCzAJBgNVBAcMAkJKMQswCQYDVQQKDAJIRDEM\r\n" -"MAoGA1UECwwDZGV2MQswCQYDVQQDDAJjYTElMCMGCSqGSIb3DQEJARYWY2FAY3J5\r\n" -"cHRvZnJhbWV3b3JrLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB\r\n" -"AJ8p0IWE7WwwbtATg+AbYQj33WNBBktU+/AVf+Tl1aAa4TOeW2/ZARc4sdwLVTxd\r\n" -"XCipFseuiGN30hwXrXFUHrcMf0w2sCkznJVZ/rQcfEO5Kb1vBz6DEEcgISYEhhqO\r\n" -"BfYBit5qfpq5R2+2R/Th/ybV+kBrUl+GssXbDAe6oZCy56lGphDvmHMUO7a13j+S\r\n" -"FmThMbI2yeyua1LagSoaBJfY1J+i7jWPmmEFR0dQ2p0EGjHTgQGhRo5VuwDHipNS\r\n" -"v0XP8OUA/PYbL/SBj1Fq4C3gtfvjeswUbzVaMoq/wCuy1qcXI80ZLe3whR24c0cX\r\n" -"YFO0uGi9egPp24fw7yYGqgECAwEAAaOByTCBxjAdBgNVHQ4EFgQUjKM7QmMBs01R\r\n" -"9uQttYN/GDkvt7UwHwYDVR0jBBgwFoAUjKM7QmMBs01R9uQttYN/GDkvt7UwEgYD\r\n" -"VR0TAQH/BAgwBgEB/wIBAjALBgNVHQ8EBAMCAQYwHQYDVR0lBBYwFAYIKwYBBQUH\r\n" -"AwEGCCsGAQUFBwMCMCEGA1UdEQQaMBiBFmNhQGNyeXB0b2ZyYW1ld29yay5jb20w\r\n" -"IQYDVR0SBBowGIEWY2FAY3J5cHRvZnJhbWV3b3JrLmNvbTANBgkqhkiG9w0BAQsF\r\n" -"AAOCAQEAh+4RE6cJ62/gLYssLkc7ESg7exKwZlmisHyBicuy/+XagOZ3cTbgQNXl\r\n" -"QoZKbw/ks/B/cInbQGYbpAm47Sudo+I/G9xj0X7gQB9wtSrbStOs6SjnLiYU0xFc\r\n" -"Fsc0j6k2SrlyiwRQcjS4POKiUS0Cm3F3DHGdj55PlBkXxudXCq2V3J3VwKf2bVjQ\r\n" -"bzz2+M/Q1m+P7FhB+JmeO8eemkqMQ0tFMU3EM441NpejC5iFVAGgownC8S0B+fxH\r\n" -"9dBJuHM6vpxEWw3ckZFDZQ1kd91YRgr7jY8fc0v/T0tzHWbOEVzklEIBWL1mompL\r\n" -"BCwe0/Gw+BO60bfi2MoJw8t2IcB1Qw==\r\n" -"-----END CERTIFICATE-----\r\n"; - -static bool g_testFlag = true; - namespace OHOS { + static char g_fuzzCert[] = + "-----BEGIN CERTIFICATE-----\r\n" + "MIIEMjCCAxqgAwIBAgICARAwDQYJKoZIhvcNAQELBQAwdjELMAkGA1UEBhMCQ04x\r\n" + "CzAJBgNVBAgMAkJKMQswCQYDVQQHDAJCSjELMAkGA1UECgwCSEQxDDAKBgNVBAsM\r\n" + "A2RldjELMAkGA1UEAwwCY2ExJTAjBgkqhkiG9w0BCQEWFmNhQGNyeXB0b2ZyYW1l\r\n" + "d29yay5jb20wHhcNMjIwODE5MTI0OTA2WhcNMzIwODE2MTI0OTA2WjB2MQswCQYD\r\n" + "VQQGEwJDTjELMAkGA1UECAwCQkoxCzAJBgNVBAcMAkJKMQswCQYDVQQKDAJIRDEM\r\n" + "MAoGA1UECwwDZGV2MQswCQYDVQQDDAJjYTElMCMGCSqGSIb3DQEJARYWY2FAY3J5\r\n" + "cHRvZnJhbWV3b3JrLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB\r\n" + "AJ8p0IWE7WwwbtATg+AbYQj33WNBBktU+/AVf+Tl1aAa4TOeW2/ZARc4sdwLVTxd\r\n" + "XCipFseuiGN30hwXrXFUHrcMf0w2sCkznJVZ/rQcfEO5Kb1vBz6DEEcgISYEhhqO\r\n" + "BfYBit5qfpq5R2+2R/Th/ybV+kBrUl+GssXbDAe6oZCy56lGphDvmHMUO7a13j+S\r\n" + "FmThMbI2yeyua1LagSoaBJfY1J+i7jWPmmEFR0dQ2p0EGjHTgQGhRo5VuwDHipNS\r\n" + "v0XP8OUA/PYbL/SBj1Fq4C3gtfvjeswUbzVaMoq/wCuy1qcXI80ZLe3whR24c0cX\r\n" + "YFO0uGi9egPp24fw7yYGqgECAwEAAaOByTCBxjAdBgNVHQ4EFgQUjKM7QmMBs01R\r\n" + "9uQttYN/GDkvt7UwHwYDVR0jBBgwFoAUjKM7QmMBs01R9uQttYN/GDkvt7UwEgYD\r\n" + "VR0TAQH/BAgwBgEB/wIBAjALBgNVHQ8EBAMCAQYwHQYDVR0lBBYwFAYIKwYBBQUH\r\n" + "AwEGCCsGAQUFBwMCMCEGA1UdEQQaMBiBFmNhQGNyeXB0b2ZyYW1ld29yay5jb20w\r\n" + "IQYDVR0SBBowGIEWY2FAY3J5cHRvZnJhbWV3b3JrLmNvbTANBgkqhkiG9w0BAQsF\r\n" + "AAOCAQEAh+4RE6cJ62/gLYssLkc7ESg7exKwZlmisHyBicuy/+XagOZ3cTbgQNXl\r\n" + "QoZKbw/ks/B/cInbQGYbpAm47Sudo+I/G9xj0X7gQB9wtSrbStOs6SjnLiYU0xFc\r\n" + "Fsc0j6k2SrlyiwRQcjS4POKiUS0Cm3F3DHGdj55PlBkXxudXCq2V3J3VwKf2bVjQ\r\n" + "bzz2+M/Q1m+P7FhB+JmeO8eemkqMQ0tFMU3EM441NpejC5iFVAGgownC8S0B+fxH\r\n" + "9dBJuHM6vpxEWw3ckZFDZQ1kd91YRgr7jY8fc0v/T0tzHWbOEVzklEIBWL1mompL\r\n" + "BCwe0/Gw+BO60bfi2MoJw8t2IcB1Qw==\r\n" + "-----END CERTIFICATE-----\r\n"; + + static bool g_testFlag = true; + static void TestGetEncoded(HcfX509Certificate *x509CertObj) { HcfEncodingBlob derBlob = { 0 }; @@ -71,7 +70,7 @@ namespace OHOS { if (res != HCF_SUCCESS) { return; } - res = x509CertObj->base.verify(&(x509CertObj->base), keyOut); + (void)x509CertObj->base.verify(&(x509CertObj->base), keyOut); HcfObjDestroy(keyOut); } @@ -82,35 +81,35 @@ namespace OHOS { return; } HcfBlob issuerName = { 0 }; - HcfResult ret = x509CertObj->getIssuerName(x509CertObj, &issuerName); + (void)x509CertObj->getIssuerName(x509CertObj, &issuerName); HcfBlobDataClearAndFree(&issuerName); HcfBlob subjectName = { 0 }; - ret = x509CertObj->getSubjectName(x509CertObj, &subjectName); + (void)x509CertObj->getSubjectName(x509CertObj, &subjectName); HcfBlobDataClearAndFree(&subjectName); HcfBlob notBeforeTime = { 0 }; - ret = x509CertObj->getNotBeforeTime(x509CertObj, ¬BeforeTime); + (void)x509CertObj->getNotBeforeTime(x509CertObj, ¬BeforeTime); HcfBlobDataClearAndFree(¬BeforeTime); HcfBlob notAfterTime = { 0 }; - ret = x509CertObj->getNotAfterTime(x509CertObj, ¬AfterTime); + (void)x509CertObj->getNotAfterTime(x509CertObj, ¬AfterTime); HcfBlobDataClearAndFree(¬AfterTime); HcfBlob sigOut = { 0 }; - ret = x509CertObj->getSignature(x509CertObj, &sigOut); + (void)x509CertObj->getSignature(x509CertObj, &sigOut); HcfBlobDataClearAndFree(&sigOut); HcfBlob sigAlgOid = { 0 }; - ret = x509CertObj->getSignatureAlgOid(x509CertObj, &sigAlgOid); + (void)x509CertObj->getSignatureAlgOid(x509CertObj, &sigAlgOid); HcfBlobDataClearAndFree(&sigAlgOid); HcfBlob sigAlgParamsOut = { 0 }; - ret = x509CertObj->getSignatureAlgParams(x509CertObj, &sigAlgParamsOut); + (void)x509CertObj->getSignatureAlgParams(x509CertObj, &sigAlgParamsOut); HcfBlobDataClearAndFree(&sigAlgParamsOut); HcfArray keyUsageOut = { 0 }; - ret = x509CertObj->getExtKeyUsage(x509CertObj, &keyUsageOut); + (void)x509CertObj->getExtKeyUsage(x509CertObj, &keyUsageOut); HcfArrayDataClearAndFree(&keyUsageOut); int32_t pathLen = x509CertObj->getBasicConstraints(x509CertObj); @@ -118,14 +117,14 @@ namespace OHOS { return; } HcfArray subjectAltName = { 0 }; - ret = x509CertObj->getSubjectAltNames(x509CertObj, &subjectAltName); + (void)x509CertObj->getSubjectAltNames(x509CertObj, &subjectAltName); HcfArrayDataClearAndFree(&subjectAltName); } static void CreateOneCert(void) { HcfEncodingBlob inStream = { 0 }; - inStream.data = (uint8_t *)g_fuzzCert; + inStream.data = reinterpret_cast(g_fuzzCert); inStream.encodingFormat = HCF_FORMAT_PEM; inStream.len = strlen(g_fuzzCert) + 1; HcfX509Certificate *x509CertObj = nullptr; diff --git a/test/fuzztest/certificate/x509crl_fuzzer/x509crl_fuzzer.cpp b/test/fuzztest/certificate/x509crl_fuzzer/x509crl_fuzzer.cpp index 7637a03..8b1ca52 100755 --- a/test/fuzztest/certificate/x509crl_fuzzer/x509crl_fuzzer.cpp +++ b/test/fuzztest/certificate/x509crl_fuzzer/x509crl_fuzzer.cpp @@ -107,49 +107,48 @@ namespace OHOS { HcfAsyKeyGenerator *generator = nullptr; HcfAsyKeyGeneratorCreate("RSA1024|PRIMES_3", &generator); generator->generateKeyPair(generator, nullptr, &g_keyPair); - RSA *rsaPrikey = ((HcfOpensslRsaPriKey *)g_keyPair->priKey)->sk; + RSA *rsaPrikey = (reinterpret_cast(g_keyPair->priKey))->sk; EVP_PKEY *prikey = EVP_PKEY_new(); EVP_PKEY_assign_RSA(prikey, rsaPrikey); X509_CRL *crl = X509_CRL_new(); - int ret = X509_CRL_set_version(crl, TEST_VERSION); + (void)X509_CRL_set_version(crl, TEST_VERSION); // Set Issuer X509_NAME *issuer = X509_NAME_new(); const char *tmp = "CRL issuer"; - ret = X509_NAME_add_entry_by_NID(issuer, NID_commonName, V_ASN1_PRINTABLESTRING, + (void)X509_NAME_add_entry_by_NID(issuer, NID_commonName, V_ASN1_PRINTABLESTRING, reinterpret_cast(tmp), 10, -1, 0); - ret = X509_CRL_set_issuer_name(crl, issuer); + (void)X509_CRL_set_issuer_name(crl, issuer); g_lastUpdate = ASN1_TIME_new(); time_t t = time(nullptr); ASN1_TIME_set(g_lastUpdate, t + TEST_OFFSET_TIME); - ret = X509_CRL_set_lastUpdate(crl, g_lastUpdate); + (void)X509_CRL_set_lastUpdate(crl, g_lastUpdate); g_nextUpdate = ASN1_TIME_new(); t = TEST_TIME; ASN1_TIME_set(g_nextUpdate, t); - ret = X509_CRL_set_nextUpdate(crl, g_nextUpdate); + (void)X509_CRL_set_nextUpdate(crl, g_nextUpdate); X509_REVOKED *revoked = X509_REVOKED_new(); ASN1_INTEGER *serial = ASN1_INTEGER_new(); - ret = ASN1_INTEGER_set(serial, TEST_SN); - ret = X509_REVOKED_set_serialNumber(revoked, serial); + (void)ASN1_INTEGER_set(serial, TEST_SN); + (void)X509_REVOKED_set_serialNumber(revoked, serial); g_rvTime = ASN1_TIME_new(); t = TEST_TIME; ASN1_TIME_set(g_rvTime, t); - ret = X509_CRL_set_nextUpdate(crl, g_rvTime); - ret = X509_REVOKED_set_revocationDate(revoked, g_rvTime); - ret = X509_CRL_add0_revoked(crl, revoked); + (void)X509_CRL_set_nextUpdate(crl, g_rvTime); + (void)X509_REVOKED_set_revocationDate(revoked, g_rvTime); + (void)X509_CRL_add0_revoked(crl, revoked); - ret = X509_CRL_sort(crl); - - ret = X509_CRL_sign(crl, prikey, EVP_md5()); + (void)X509_CRL_sort(crl); + (void)X509_CRL_sign(crl, prikey, EVP_md5()); int len = i2d_X509_CRL(crl, nullptr); - buf = (unsigned char *)malloc(len + TEST_OFFSET); + buf = reinterpret_cast(malloc(len + TEST_OFFSET)); p = buf; - len = i2d_X509_CRL(crl, &p); + (void)i2d_X509_CRL(crl, &p); return buf; } @@ -175,10 +174,10 @@ namespace OHOS { if (nextUpdate.data != nullptr) { HcfFree(nextUpdate.data); } - (void)x509CrlPem->base.getType((HcfCrl *)x509CrlPem); + (void)x509CrlPem->base.getType(&(x509CrlPem->base)); HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStreamCert = { 0 }; - inStreamCert.data = (uint8_t *)g_testCert; + inStreamCert.data = reinterpret_cast(g_testCert); inStreamCert.encodingFormat = HCF_FORMAT_PEM; inStreamCert.len = strlen(g_testCert) + 1; HcfResult result = HcfX509CertificateCreate(&inStreamCert, &x509Cert); @@ -190,7 +189,7 @@ namespace OHOS { if (crlEntry != nullptr) { HcfObjDestroy(crlEntry); } - (void)x509CrlPem->base.isRevoked((HcfCrl *)x509CrlPem, (HcfCertificate *)x509Cert); + (void)x509CrlPem->base.isRevoked(&(x509CrlPem->base), &(x509Cert->base)); HcfObjDestroy(x509Cert); } @@ -233,7 +232,7 @@ namespace OHOS { HcfArray entrys = { 0 }; x509CrlDer->getRevokedCerts(x509CrlDer, &entrys); if (entrys.data != nullptr) { - HcfX509CrlEntry *crlEntry = (HcfX509CrlEntry *)(entrys.data[0].data); + HcfX509CrlEntry *crlEntry = reinterpret_cast(entrys.data[0].data); HcfObjDestroy(crlEntry); } @@ -274,7 +273,7 @@ namespace OHOS { HcfX509Crl *x509CrlDer = nullptr; HcfEncodingBlob crlDerInStream = { 0 }; unsigned char *crlStream = GetCrlStream(); - crlDerInStream.data = (uint8_t *)crlStream; + crlDerInStream.data = reinterpret_cast(crlStream); crlDerInStream.encodingFormat = HCF_FORMAT_DER; crlDerInStream.len = TEST_CRL_LEN; HcfResult result = HcfX509CrlCreate(&crlDerInStream, &x509CrlDer); @@ -284,7 +283,7 @@ namespace OHOS { return false; } HcfEncodingBlob crlPemInStream = { 0 }; - crlPemInStream.data = (uint8_t *)g_testCrl; + crlPemInStream.data = reinterpret_cast(g_testCrl); crlPemInStream.encodingFormat = HCF_FORMAT_PEM; crlPemInStream.len = strlen(g_testCrl) + 1; HcfX509Crl *x509CrlPem = nullptr; diff --git a/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/hcfciphercreate_fuzzer.cpp b/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/hcfciphercreate_fuzzer.cpp index 6993d51..e088d16 100755 --- a/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/hcfciphercreate_fuzzer.cpp +++ b/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/hcfciphercreate_fuzzer.cpp @@ -27,17 +27,17 @@ #include "result.h" #include "sym_key_generator.h" -static bool g_testFlag = true; - namespace OHOS { + static bool g_testFlag = true; + static int32_t AesEncrypt(HcfCipher *cipher, HcfSymKey *key, HcfParamsSpec *params, uint8_t *cipherText, int *cipherTextLen) { uint8_t plainText[] = "this is test!"; - HcfBlob input = {.data = (uint8_t *)plainText, .len = 13}; + HcfBlob input = {.data = reinterpret_cast(plainText), .len = 13}; HcfBlob output = {}; int32_t maxLen = *cipherTextLen; - int32_t ret = cipher->init(cipher, ENCRYPT_MODE, (HcfKey *)key, params); + int32_t ret = cipher->init(cipher, ENCRYPT_MODE, &(key->key), params); if (ret != 0) { return ret; } @@ -73,10 +73,10 @@ namespace OHOS { uint8_t *cipherText, int cipherTextLen) { uint8_t plainText[] = "this is test!"; - HcfBlob input = {.data = (uint8_t *)cipherText, .len = cipherTextLen}; + HcfBlob input = {.data = cipherText, .len = cipherTextLen}; HcfBlob output = {}; int32_t maxLen = cipherTextLen; - int32_t ret = cipher->init(cipher, DECRYPT_MODE, (HcfKey *)key, params); + int32_t ret = cipher->init(cipher, DECRYPT_MODE, &(key->key), params); if (ret != 0) { return ret; } @@ -136,8 +136,8 @@ namespace OHOS { return; } - ret = AesEncrypt(cipher, key, nullptr, cipherText, &cipherTextLen); - ret = AesDecrypt(cipher, key, nullptr, cipherText, cipherTextLen); + (void)AesEncrypt(cipher, key, nullptr, cipherText, &cipherTextLen); + (void)AesDecrypt(cipher, key, nullptr, cipherText, cipherTextLen); HcfObjDestroy(generator); HcfObjDestroy(key); HcfObjDestroy(cipher); @@ -159,7 +159,7 @@ namespace OHOS { return; } - HcfBlob input = {.data = (uint8_t *)plan, .len = strlen((char *)plan)}; + HcfBlob input = {.data = reinterpret_cast(plan), .len = strlen((char *)plan)}; HcfBlob encoutput = {.data = nullptr, .len = 0}; HcfCipher *cipher = nullptr; res = HcfCipherCreate("RSA1024|PKCS1", &cipher); @@ -169,8 +169,8 @@ namespace OHOS { return; } - res = cipher->init(cipher, ENCRYPT_MODE, reinterpret_cast(keyPair->pubKey), nullptr); - res = cipher->doFinal(cipher, &input, &encoutput); + (void)cipher->init(cipher, ENCRYPT_MODE, reinterpret_cast(keyPair->pubKey), nullptr); + (void)cipher->doFinal(cipher, &input, &encoutput); HcfObjDestroy(cipher); HcfBlob decoutput = {.data = nullptr, .len = 0}; @@ -181,8 +181,8 @@ namespace OHOS { HcfObjDestroy(keyPair); return; } - res = cipher->init(cipher, DECRYPT_MODE, reinterpret_cast(keyPair->priKey), nullptr); - res = cipher->doFinal(cipher, &encoutput, &decoutput); + (void)cipher->init(cipher, DECRYPT_MODE, reinterpret_cast(keyPair->priKey), nullptr); + (void)cipher->doFinal(cipher, &encoutput, &decoutput); HcfBlobDataClearAndFree(&encoutput); HcfBlobDataClearAndFree(&decoutput); HcfObjDestroy(generator); diff --git a/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/hcfmaccreate_fuzzer.cpp b/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/hcfmaccreate_fuzzer.cpp index 77cd3e6..06e7a02 100755 --- a/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/hcfmaccreate_fuzzer.cpp +++ b/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/hcfmaccreate_fuzzer.cpp @@ -24,10 +24,10 @@ #include "result.h" #include "sym_key_generator.h" -static const int KEY_LEN = 16; -static const int TEST_DATA_LEN = 12; - namespace OHOS { + static const int KEY_LEN = 16; + static const int TEST_DATA_LEN = 12; + static void TestMac(void) { HcfMac *macObj = nullptr; @@ -36,7 +36,7 @@ namespace OHOS { return; } HcfSymKeyGenerator *generator = nullptr; - res = HcfSymKeyGeneratorCreate("AES128", &generator); + (void)HcfSymKeyGeneratorCreate("AES128", &generator); char testKey[] = "abcdefghijklmnop"; uint32_t testKeyLen = KEY_LEN; HcfSymKey *key = nullptr; @@ -46,8 +46,8 @@ namespace OHOS { char testData[] = "My test data"; uint32_t testDataLen = TEST_DATA_LEN; HcfBlob inBlob = {.data = reinterpret_cast(testData), .len = testDataLen}; - res = macObj->init(macObj, key); - res = macObj->update(macObj, &inBlob); + (void)macObj->init(macObj, key); + (void)macObj->update(macObj, &inBlob); HcfBlob outBlob = { 0 }; (void)macObj->doFinal(macObj, &outBlob); (void)macObj->getAlgoName(macObj); diff --git a/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/hcfmdcreate_fuzzer.cpp b/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/hcfmdcreate_fuzzer.cpp index 4d9f178..0cacfaf 100755 --- a/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/hcfmdcreate_fuzzer.cpp +++ b/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/hcfmdcreate_fuzzer.cpp @@ -23,9 +23,9 @@ #include "md.h" #include "result.h" -static const int TEST_DATA_LEN = 12; - namespace OHOS { + static const int TEST_DATA_LEN = 12; + static void TestMd(void) { HcfMd *mdObj = nullptr; @@ -36,7 +36,7 @@ namespace OHOS { char testData[] = "My test data"; uint32_t testDataLen = TEST_DATA_LEN; HcfBlob inBlob = {.data = reinterpret_cast(testData), .len = testDataLen}; - res = mdObj->update(mdObj, &inBlob); + (void)mdObj->update(mdObj, &inBlob); HcfBlob outBlob = { 0 }; (void)mdObj->doFinal(mdObj, &outBlob); (void)mdObj->getAlgoName(mdObj); diff --git a/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/hcfsigncreate_fuzzer.cpp b/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/hcfsigncreate_fuzzer.cpp index 104200b..19cd821 100755 --- a/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/hcfsigncreate_fuzzer.cpp +++ b/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/hcfsigncreate_fuzzer.cpp @@ -24,10 +24,10 @@ #include "result.h" #include "signature.h" -static const char *g_mockMessage = "hello world"; -const int INPUT_MSG_LEN = 12; - namespace OHOS { + static char g_mockMessage[] = "hello world"; + const int INPUT_MSG_LEN = 12; + static void TestSign(void) { HcfAsyKeyGenerator *generator = nullptr; @@ -50,11 +50,11 @@ namespace OHOS { return; } static HcfBlob mockInput = { - .data = (uint8_t *)g_mockMessage, + .data = reinterpret_cast(g_mockMessage), .len = INPUT_MSG_LEN }; - res = sign->init(sign, nullptr, ecc384KeyPair->priKey); - res = sign->update(sign, &mockInput); + (void)sign->init(sign, nullptr, ecc384KeyPair->priKey); + (void)sign->update(sign, &mockInput); HcfObjDestroy(ecc384KeyPair); HcfObjDestroy(sign); } @@ -64,7 +64,7 @@ namespace OHOS { TestSign(); HcfSign *sign = nullptr; std::string algoName(reinterpret_cast(data), size); - HcfResult res = HcfSignCreate("ECC384|SHA256", &sign); + HcfResult res = HcfSignCreate(algoName.c_str(), &sign); if (res != HCF_SUCCESS) { return false; } diff --git a/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/hcfverifycreate_fuzzer.cpp b/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/hcfverifycreate_fuzzer.cpp index 5cc589b..8cc49b1 100755 --- a/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/hcfverifycreate_fuzzer.cpp +++ b/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/hcfverifycreate_fuzzer.cpp @@ -24,10 +24,10 @@ #include "result.h" #include "signature.h" -static const char *g_mockMessage = "hello world"; -const int INPUT_MSG_LEN = 12; - namespace OHOS { + static char g_mockMessage[] = "hello world"; + const int INPUT_MSG_LEN = 12; + static void TestVerify(void) { HcfAsyKeyGenerator *generator = NULL; @@ -50,11 +50,11 @@ namespace OHOS { return; } static HcfBlob mockInput = { - .data = (uint8_t *)g_mockMessage, + .data = reinterpret_cast(g_mockMessage), .len = INPUT_MSG_LEN }; - res = sign->init(sign, NULL, ecc224KeyPair->priKey); - res = sign->update(sign, &mockInput); + (void)sign->init(sign, NULL, ecc224KeyPair->priKey); + (void)sign->update(sign, &mockInput); HcfVerify *verify = NULL; res = HcfVerifyCreate("ECC224|SHA384", &verify); @@ -67,9 +67,9 @@ namespace OHOS { .data = NULL, .len = 0 }; - res = sign->sign(sign, NULL, &out); - res = verify->init(verify, NULL, ecc224KeyPair->pubKey); - res = verify->update(verify, &mockInput); + (void)sign->sign(sign, NULL, &out); + (void)verify->init(verify, NULL, ecc224KeyPair->pubKey); + (void)verify->update(verify, &mockInput); (void)verify->verify(verify, NULL, &out); HcfObjDestroy(ecc224KeyPair); HcfObjDestroy(sign); @@ -82,7 +82,7 @@ namespace OHOS { TestVerify(); HcfVerify *verify = nullptr; std::string algoName(reinterpret_cast(data), size); - HcfResult res = HcfVerifyCreate("ECC224|SHA1", &verify); + HcfResult res = HcfVerifyCreate(algoName.c_str(), &verify); if (res != HCF_SUCCESS) { return false; } diff --git a/test/fuzztest/key/asykeygenerator_fuzzer/asykeygenerator_fuzzer.cpp b/test/fuzztest/key/asykeygenerator_fuzzer/asykeygenerator_fuzzer.cpp index 25725c8..4ef3098 100755 --- a/test/fuzztest/key/asykeygenerator_fuzzer/asykeygenerator_fuzzer.cpp +++ b/test/fuzztest/key/asykeygenerator_fuzzer/asykeygenerator_fuzzer.cpp @@ -23,9 +23,8 @@ #include "blob.h" #include "result.h" -static bool g_testFlag = true; - namespace OHOS { + static bool g_testFlag = true; static const int ECC224_PUB_KEY_LEN = 57; static const int ECC224_PRI_KEY_LEN = 28; static uint8_t g_mockEcc224PubKeyBlobData[ECC224_PUB_KEY_LEN] = { 4, 189, 186, 122, 21, 9, 8, 231, 90, 111, 68, @@ -59,7 +58,7 @@ namespace OHOS { .data = g_mockEcc224PriKeyBlobData, .len = ECC224_PRI_KEY_LEN }; - res = generator->convertKey(generator, nullptr, &mockEcc224PubKeyBlob, &mockEcc224PriKeyBlob, &convertKeyPair); + (void)generator->convertKey(generator, nullptr, &mockEcc224PubKeyBlob, &mockEcc224PriKeyBlob, &convertKeyPair); HcfObjDestroy(keyPair); HcfObjDestroy(generator); HcfObjDestroy(convertKeyPair); @@ -80,15 +79,15 @@ namespace OHOS { } HcfBlob pubKeyBlob = {.data = nullptr, .len = 0}; HcfBlob priKeyBlob = {.data = nullptr, .len = 0}; - res = keyPair->pubKey->base.getEncoded((HcfKey *)keyPair->pubKey, &pubKeyBlob); - res = keyPair->priKey->base.getEncoded((HcfKey *)keyPair->priKey, &priKeyBlob); + (void)keyPair->pubKey->base.getEncoded(&(keyPair->pubKey->base), &pubKeyBlob); + (void)keyPair->priKey->base.getEncoded(&(keyPair->priKey->base), &priKeyBlob); HcfKeyPair *dupKeyPair = nullptr; - res = generator->convertKey(generator, nullptr, &pubKeyBlob, &priKeyBlob, &dupKeyPair); - HcfPubKey *pubkey = dupKeyPair->pubKey; - (void)pubkey->base.getAlgorithm((HcfKey *)pubkey); - (void)pubkey->base.getFormat((HcfKey *)pubkey); - (void)pubkey->base.base.getClass(); + (void)generator->convertKey(generator, nullptr, &pubKeyBlob, &priKeyBlob, &dupKeyPair); + HcfPubKey *pubKey = dupKeyPair->pubKey; + (void)pubKey->base.getAlgorithm(&(pubKey->base)); + (void)pubKey->base.getFormat(&(pubKey->base)); + (void)pubKey->base.base.getClass(); HcfBlobDataFree(&pubKeyBlob); HcfBlobDataFree(&priKeyBlob); diff --git a/test/fuzztest/rand/hcfrandcreate_fuzzer/hcfrandcreate_fuzzer.cpp b/test/fuzztest/rand/hcfrandcreate_fuzzer/hcfrandcreate_fuzzer.cpp index aadbd78..e4e7780 100755 --- a/test/fuzztest/rand/hcfrandcreate_fuzzer/hcfrandcreate_fuzzer.cpp +++ b/test/fuzztest/rand/hcfrandcreate_fuzzer/hcfrandcreate_fuzzer.cpp @@ -31,9 +31,9 @@ namespace OHOS { return false; } struct HcfBlob randomBlob = { 0 }; - res = randObj->generateRandom(randObj, size, &randomBlob); + (void)randObj->generateRandom(randObj, size, &randomBlob); struct HcfBlob seedBlob = { 0 }; - res = randObj->setSeed(randObj, &seedBlob); + (void)randObj->setSeed(randObj, &seedBlob); HcfBlobDataFree(&randomBlob); HcfBlobDataFree(&seedBlob); HcfObjDestroy(randObj); diff --git a/test/unittest/src/crypto_x509_crl_test.cpp b/test/unittest/src/crypto_x509_crl_test.cpp index 1154abf..684af3e 100644 --- a/test/unittest/src/crypto_x509_crl_test.cpp +++ b/test/unittest/src/crypto_x509_crl_test.cpp @@ -1171,7 +1171,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest151, TestSize.Level0) EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(entrysOut.data, nullptr); - HcfX509CrlEntry *crlEntry = (HcfX509CrlEntry *)(entrysOut.data[0].data); + HcfX509CrlEntry *crlEntry = reinterpret_cast(entrysOut.data[0].data); HcfBlob out = { 0 }; ret = crlEntry->getRevocationDate(crlEntry, &out); EXPECT_EQ(ret, HCF_SUCCESS); -- Gitee