diff --git a/figures/zh-cn_crypto_framework_architecture.png b/figures/zh-cn_crypto_framework_architecture.png old mode 100755 new mode 100644 diff --git a/frameworks/js/napi/crypto/src/napi_mac.cpp b/frameworks/js/napi/crypto/src/napi_mac.cpp index 353e1f590b3dc26493070c33d721451445a0e74f..a332acdc3711d34670c8bbe95df83f48febaf2e7 100644 --- a/frameworks/js/napi/crypto/src/napi_mac.cpp +++ b/frameworks/js/napi/crypto/src/napi_mac.cpp @@ -64,13 +64,18 @@ static void FreeCryptoFwkCtx(napi_env env, MacCtx *context) HcfFree(context->inBlob->data); context->inBlob->data = nullptr; context->inBlob->len = 0; + HcfFree(context->inBlob); + context->inBlob = nullptr; } if (context->outBlob != nullptr) { HcfFree(context->outBlob->data); context->outBlob->data = nullptr; context->outBlob->len = 0; + HcfFree(context->outBlob); + context->outBlob = nullptr; } HcfFree(context); + context = nullptr; } static void ReturnCallbackResult(napi_env env, MacCtx *context, napi_value result) @@ -194,6 +199,8 @@ static void MacDoFinalExecute(napi_env env, void *data) if (context->errCode != HCF_SUCCESS) { LOGE("doFinal failed!"); context->errMsg = "doFinal failed"; + HcfFree(outBlob); + outBlob = nullptr; return; } context->outBlob = outBlob; @@ -282,6 +289,7 @@ napi_value NapiMac::MacUpdate(napi_env env, napi_callback_info info) if (context->inBlob == nullptr) { napi_throw(env, GenerateBusinessError(env, HCF_INVALID_PARAMS, "inBlob is null")); LOGE("inBlob is null!"); + FreeCryptoFwkCtx(env, context); return nullptr; } if (!CreateCallbackAndPromise(env, context, argc, ARGS_SIZE_TWO, argv[PARAM1])) { diff --git a/frameworks/js/napi/crypto/src/napi_md.cpp b/frameworks/js/napi/crypto/src/napi_md.cpp index 1416a703a934f3839dc0b1224d4fd57d7602408a..6e773706053b691ebd43bbee464d816b4c9efafd 100644 --- a/frameworks/js/napi/crypto/src/napi_md.cpp +++ b/frameworks/js/napi/crypto/src/napi_md.cpp @@ -62,13 +62,19 @@ static void FreeCryptoFwkCtx(napi_env env, MdCtx *context) HcfFree(context->inBlob->data); context->inBlob->data = nullptr; context->inBlob->len = 0; + HcfFree(context->inBlob); + context->inBlob = nullptr; } if (context->outBlob != nullptr) { HcfFree(context->outBlob->data); context->outBlob->data = nullptr; context->outBlob->len = 0; + HcfFree(context->outBlob); + context->outBlob = nullptr; } + context->errMsg = nullptr; HcfFree(context); + context = nullptr; } static void ReturnCallbackResult(napi_env env, MdCtx *context, napi_value result) @@ -163,6 +169,8 @@ static void MdDoFinalExecute(napi_env env, void *data) if (context->errCode != HCF_SUCCESS) { LOGE("doFinal failed!"); context->errMsg = "doFinal failed"; + HcfFree(outBlob); + outBlob = nullptr; return; } context->outBlob = outBlob; @@ -205,6 +213,7 @@ napi_value NapiMd::MdUpdate(napi_env env, napi_callback_info info) if (context->inBlob == nullptr) { napi_throw(env, GenerateBusinessError(env, HCF_INVALID_PARAMS, "inBlob is null")); LOGE("inBlob is null!"); + FreeCryptoFwkCtx(env, context); return nullptr; } if (!CreateCallbackAndPromise(env, context, argc, ARGS_SIZE_TWO, argv[PARAM1])) { diff --git a/frameworks/js/napi/crypto/src/napi_rand.cpp b/frameworks/js/napi/crypto/src/napi_rand.cpp index e20aa98e197f607d4c513df7b72bf175b03e8d61..23de22add594df97ef3e4509e93fe4b8cac751fd 100644 --- a/frameworks/js/napi/crypto/src/napi_rand.cpp +++ b/frameworks/js/napi/crypto/src/napi_rand.cpp @@ -62,13 +62,19 @@ static void FreeCryptoFwkCtx(napi_env env, RandCtx *context) HcfFree(context->seedBlob->data); context->seedBlob->data = nullptr; context->seedBlob->len = 0; + HcfFree(context->seedBlob); + context->seedBlob = nullptr; } if (context->randBlob != nullptr) { HcfFree(context->randBlob->data); context->randBlob->data = nullptr; context->randBlob->len = 0; + HcfFree(context->randBlob); + context->randBlob = nullptr; } + context->errMsg = nullptr; HcfFree(context); + context = nullptr; } static void ReturnCallbackResult(napi_env env, RandCtx *context, napi_value result) @@ -140,6 +146,8 @@ static void GenerateRandomExecute(napi_env env, void *data) if (context->errCode != HCF_SUCCESS) { LOGE("generateRandom failed!"); context->errMsg = "generateRandom failed"; + HcfFree(randBlob); + randBlob = nullptr; return; } context->randBlob = randBlob; diff --git a/test/fuzztest/certificate/x509certificate_fuzzer/BUILD.gn b/test/fuzztest/certificate/x509certificate_fuzzer/BUILD.gn old mode 100755 new mode 100644 diff --git a/test/fuzztest/certificate/x509certificate_fuzzer/corpus/init b/test/fuzztest/certificate/x509certificate_fuzzer/corpus/init old mode 100755 new mode 100644 diff --git a/test/fuzztest/certificate/x509certificate_fuzzer/project.xml b/test/fuzztest/certificate/x509certificate_fuzzer/project.xml old mode 100755 new mode 100644 diff --git a/test/fuzztest/certificate/x509certificate_fuzzer/x509certificate_fuzzer.cpp b/test/fuzztest/certificate/x509certificate_fuzzer/x509certificate_fuzzer.cpp old mode 100755 new mode 100644 diff --git a/test/fuzztest/certificate/x509certificate_fuzzer/x509certificate_fuzzer.h b/test/fuzztest/certificate/x509certificate_fuzzer/x509certificate_fuzzer.h old mode 100755 new mode 100644 diff --git a/test/fuzztest/certificate/x509crl_fuzzer/BUILD.gn b/test/fuzztest/certificate/x509crl_fuzzer/BUILD.gn old mode 100755 new mode 100644 diff --git a/test/fuzztest/certificate/x509crl_fuzzer/corpus/init b/test/fuzztest/certificate/x509crl_fuzzer/corpus/init old mode 100755 new mode 100644 diff --git a/test/fuzztest/certificate/x509crl_fuzzer/project.xml b/test/fuzztest/certificate/x509crl_fuzzer/project.xml old mode 100755 new mode 100644 diff --git a/test/fuzztest/certificate/x509crl_fuzzer/x509crl_fuzzer.cpp b/test/fuzztest/certificate/x509crl_fuzzer/x509crl_fuzzer.cpp old mode 100755 new mode 100644 diff --git a/test/fuzztest/certificate/x509crl_fuzzer/x509crl_fuzzer.h b/test/fuzztest/certificate/x509crl_fuzzer/x509crl_fuzzer.h old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/BUILD.gn old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/corpus/init b/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/corpus/init old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/hcfciphercreate_fuzzer.cpp b/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/hcfciphercreate_fuzzer.cpp old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/hcfciphercreate_fuzzer.h b/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/hcfciphercreate_fuzzer.h old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/project.xml b/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/project.xml old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/BUILD.gn old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/corpus/init b/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/corpus/init old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/hcfkeyagreementcreate_fuzzer.cpp b/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/hcfkeyagreementcreate_fuzzer.cpp old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/hcfkeyagreementcreate_fuzzer.h b/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/hcfkeyagreementcreate_fuzzer.h old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/project.xml b/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/project.xml old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/BUILD.gn old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/corpus/init b/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/corpus/init old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/hcfmaccreate_fuzzer.cpp b/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/hcfmaccreate_fuzzer.cpp old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/hcfmaccreate_fuzzer.h b/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/hcfmaccreate_fuzzer.h old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/project.xml b/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/project.xml old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/BUILD.gn old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/corpus/init b/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/corpus/init old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/hcfmdcreate_fuzzer.cpp b/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/hcfmdcreate_fuzzer.cpp old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/hcfmdcreate_fuzzer.h b/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/hcfmdcreate_fuzzer.h old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/project.xml b/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/project.xml old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/BUILD.gn old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/corpus/init b/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/corpus/init old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/hcfsigncreate_fuzzer.cpp b/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/hcfsigncreate_fuzzer.cpp old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/hcfsigncreate_fuzzer.h b/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/hcfsigncreate_fuzzer.h old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/project.xml b/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/project.xml old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/BUILD.gn old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/corpus/init b/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/corpus/init old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/hcfverifycreate_fuzzer.cpp b/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/hcfverifycreate_fuzzer.cpp old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/hcfverifycreate_fuzzer.h b/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/hcfverifycreate_fuzzer.h old mode 100755 new mode 100644 diff --git a/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/project.xml b/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/project.xml old mode 100755 new mode 100644 diff --git a/test/fuzztest/key/asykeygenerator_fuzzer/BUILD.gn b/test/fuzztest/key/asykeygenerator_fuzzer/BUILD.gn old mode 100755 new mode 100644 diff --git a/test/fuzztest/key/asykeygenerator_fuzzer/asykeygenerator_fuzzer.cpp b/test/fuzztest/key/asykeygenerator_fuzzer/asykeygenerator_fuzzer.cpp old mode 100755 new mode 100644 diff --git a/test/fuzztest/key/asykeygenerator_fuzzer/asykeygenerator_fuzzer.h b/test/fuzztest/key/asykeygenerator_fuzzer/asykeygenerator_fuzzer.h old mode 100755 new mode 100644 diff --git a/test/fuzztest/key/asykeygenerator_fuzzer/corpus/init b/test/fuzztest/key/asykeygenerator_fuzzer/corpus/init old mode 100755 new mode 100644 diff --git a/test/fuzztest/key/asykeygenerator_fuzzer/project.xml b/test/fuzztest/key/asykeygenerator_fuzzer/project.xml old mode 100755 new mode 100644 diff --git a/test/fuzztest/key/symkeygenerator_fuzzer/BUILD.gn b/test/fuzztest/key/symkeygenerator_fuzzer/BUILD.gn old mode 100755 new mode 100644 diff --git a/test/fuzztest/key/symkeygenerator_fuzzer/corpus/init b/test/fuzztest/key/symkeygenerator_fuzzer/corpus/init old mode 100755 new mode 100644 diff --git a/test/fuzztest/key/symkeygenerator_fuzzer/project.xml b/test/fuzztest/key/symkeygenerator_fuzzer/project.xml old mode 100755 new mode 100644 diff --git a/test/fuzztest/key/symkeygenerator_fuzzer/symkeygenerator_fuzzer.cpp b/test/fuzztest/key/symkeygenerator_fuzzer/symkeygenerator_fuzzer.cpp old mode 100755 new mode 100644 diff --git a/test/fuzztest/key/symkeygenerator_fuzzer/symkeygenerator_fuzzer.h b/test/fuzztest/key/symkeygenerator_fuzzer/symkeygenerator_fuzzer.h old mode 100755 new mode 100644 diff --git a/test/fuzztest/rand/hcfrandcreate_fuzzer/BUILD.gn b/test/fuzztest/rand/hcfrandcreate_fuzzer/BUILD.gn old mode 100755 new mode 100644 diff --git a/test/fuzztest/rand/hcfrandcreate_fuzzer/corpus/init b/test/fuzztest/rand/hcfrandcreate_fuzzer/corpus/init old mode 100755 new mode 100644 diff --git a/test/fuzztest/rand/hcfrandcreate_fuzzer/hcfrandcreate_fuzzer.cpp b/test/fuzztest/rand/hcfrandcreate_fuzzer/hcfrandcreate_fuzzer.cpp old mode 100755 new mode 100644 diff --git a/test/fuzztest/rand/hcfrandcreate_fuzzer/hcfrandcreate_fuzzer.h b/test/fuzztest/rand/hcfrandcreate_fuzzer/hcfrandcreate_fuzzer.h old mode 100755 new mode 100644 diff --git a/test/fuzztest/rand/hcfrandcreate_fuzzer/project.xml b/test/fuzztest/rand/hcfrandcreate_fuzzer/project.xml old mode 100755 new mode 100644 diff --git a/test/unittest/include/memory_mock.h b/test/unittest/include/memory_mock.h old mode 100755 new mode 100644 diff --git a/test/unittest/src/memory_mock.c b/test/unittest/src/memory_mock.c old mode 100755 new mode 100644