diff --git a/frameworks/crypto_operation/signature.c b/frameworks/crypto_operation/signature.c index 711a3a13291fa4d1a3174a89999e7f07c2e83da2..b6487f4a911cba1bec4a1dd188c0f70d4f148927 100644 --- a/frameworks/crypto_operation/signature.c +++ b/frameworks/crypto_operation/signature.c @@ -45,16 +45,6 @@ typedef struct { char algoName[HCF_MAX_ALGO_NAME_LEN]; } HcfVerifyImpl; -typedef struct { - const char *algoType; - - uint32_t digestAlg; - - int32_t keyLen; - - int32_t padding; -} HcfEcdsaParams; - typedef struct { HCF_ALG_VALUE algo; diff --git a/frameworks/js/napi/inc/napi_utils.h b/frameworks/js/napi/inc/napi_utils.h index 2790b7b07b5441cb1f7d65e68c648f07d495db41..493b4c77b92d707af5cc9faaee6803b3041e2021 100644 --- a/frameworks/js/napi/inc/napi_utils.h +++ b/frameworks/js/napi/inc/napi_utils.h @@ -52,7 +52,6 @@ bool GetStringFromJSParams(napi_env env, napi_value arg, std::string &returnStr) bool GetInt32FromJSParams(napi_env env, napi_value arg, int32_t &returnInt); bool GetUint32FromJSParams(napi_env env, napi_value arg, uint32_t &returnInt); bool GetCallbackFromJSParams(napi_env env, napi_value arg, napi_ref *returnCb); -bool ParseArrayBuffer(napi_env env, napi_value args, uint8_t **data, size_t &size); bool GetEncodingBlobFromValue(napi_env env, napi_value object, HcfEncodingBlob **encodingBlob); bool GetCertChainFromValue(napi_env env, napi_value object, HcfCertChainData **certChainData); bool CheckArgsCount(napi_env env, size_t argc, size_t expectedCount, bool isSync); diff --git a/frameworks/js/napi/src/napi_asy_key_generator.cpp b/frameworks/js/napi/src/napi_asy_key_generator.cpp index 62b5e57ca8912a1a3bcafb47351ada93988f9243..1604668a164dfa260d9088ba1ac6fcfe38a08222 100644 --- a/frameworks/js/napi/src/napi_asy_key_generator.cpp +++ b/frameworks/js/napi/src/napi_asy_key_generator.cpp @@ -323,7 +323,7 @@ static void ConvertKeyAsyncWorkReturn(napi_env env, napi_status status, void *da napi_value instance = nullptr; if (ctx->result == HCF_SUCCESS) { NapiKeyPair *napiKeyPair = new NapiKeyPair(ctx->returnKeyPair); - napi_value instance = napiKeyPair->ConvertToJsKeyPair(env); + instance = napiKeyPair->ConvertToJsKeyPair(env); napi_wrap( env, instance, napiKeyPair, diff --git a/frameworks/js/napi/src/napi_utils.cpp b/frameworks/js/napi/src/napi_utils.cpp index aae9d2ce5b2cbd8910461350f369d8f351517c8a..09eb0ad6a52df4de1f6c7fb92532201854372bd5 100644 --- a/frameworks/js/napi/src/napi_utils.cpp +++ b/frameworks/js/napi/src/napi_utils.cpp @@ -649,27 +649,6 @@ bool GetCallbackFromJSParams(napi_env env, napi_value arg, napi_ref *returnCb) return true; } -bool ParseArrayBuffer(napi_env env, napi_value args, uint8_t **data, size_t &size) -{ - napi_status status; - napi_valuetype valuetype; - napi_typeof(env, args, &valuetype); - - if (valuetype != napi_object) { - LOGE("Wrong argument type(%d). object expected.", valuetype); - return false; - } - - status = napi_get_arraybuffer_info(env, args, (void**)data, &size); - if (status != napi_ok) { - LOGE("can not get arraybuffer, error is %d", status); - (*data)[0] = -1; - return false; - } - LOGI("arraybuffer size is %zu", size); - return true; -} - static uint32_t GetJsErrValueByErrCode(int32_t errCode) { switch (errCode) {