From 4b32caab7f75cc9a43230995ed5e3a5cc97ae15b Mon Sep 17 00:00:00 2001 From: winnie-hu Date: Thu, 29 Sep 2022 08:23:17 +0800 Subject: [PATCH] fixed c4cc9ae from https://gitee.com/winnie-hu/security_crypto_framework/pulls/62 rename errorCode to runtime error Signed-off-by: winnie-hu --- frameworks/js/napi/inc/napi_crypto_framework_defines.h | 2 +- frameworks/js/napi/src/napi_init.cpp | 2 +- frameworks/js/napi/src/napi_utils.cpp | 2 +- interfaces/kits/js/@ohos.security.cryptoFramework.d.ts | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frameworks/js/napi/inc/napi_crypto_framework_defines.h b/frameworks/js/napi/inc/napi_crypto_framework_defines.h index 6ebd3c1..c60707c 100644 --- a/frameworks/js/napi/inc/napi_crypto_framework_defines.h +++ b/frameworks/js/napi/inc/napi_crypto_framework_defines.h @@ -35,7 +35,7 @@ constexpr uint32_t JS_ERR_DEFAULT_ERR = 0; constexpr uint32_t JS_ERR_INVALID_PARAMS = 401; constexpr uint32_t JS_ERR_NOT_SUPPORT = 801; constexpr uint32_t JS_ERR_OUT_OF_MEMORY = 17620001; -constexpr uint32_t JS_ERR_EXTERNAL_ERROR = 17620002; +constexpr uint32_t JS_ERR_RUNTIME_ERROR = 17620002; constexpr uint32_t JS_ERR_CRYPTO_OPERATION = 17630001; constexpr uint32_t JS_ERR_CERT_SIGNATURE_FAILURE = 17630002; constexpr uint32_t JS_ERR_CERT_NOT_YET_VALID = 17630003; diff --git a/frameworks/js/napi/src/napi_init.cpp b/frameworks/js/napi/src/napi_init.cpp index b8da764..449d548 100644 --- a/frameworks/js/napi/src/napi_init.cpp +++ b/frameworks/js/napi/src/napi_init.cpp @@ -85,7 +85,7 @@ static napi_value CreateResultCode(napi_env env) AddUint32Property(env, resultCode, "INVALID_PARAMS", JS_ERR_INVALID_PARAMS); AddUint32Property(env, resultCode, "NOT_SUPPORT", JS_ERR_NOT_SUPPORT); AddUint32Property(env, resultCode, "ERR_OUT_OF_MEMORY", JS_ERR_OUT_OF_MEMORY); - AddUint32Property(env, resultCode, "ERR_EXTERNAL_ERROR", JS_ERR_EXTERNAL_ERROR); + AddUint32Property(env, resultCode, "ERR_RUNTIME_ERROR", JS_ERR_RUNTIME_ERROR); AddUint32Property(env, resultCode, "ERR_CRYPTO_OPERATION", JS_ERR_CRYPTO_OPERATION); AddUint32Property(env, resultCode, "ERR_CERT_SIGNATURE_FAILURE", JS_ERR_CERT_SIGNATURE_FAILURE); AddUint32Property(env, resultCode, "ERR_CERT_NOT_YET_VALID", JS_ERR_CERT_NOT_YET_VALID); diff --git a/frameworks/js/napi/src/napi_utils.cpp b/frameworks/js/napi/src/napi_utils.cpp index 95c9bcb..2d4d5d4 100644 --- a/frameworks/js/napi/src/napi_utils.cpp +++ b/frameworks/js/napi/src/napi_utils.cpp @@ -659,7 +659,7 @@ static uint32_t GetJsErrValueByErrCode(int32_t errCode) case HCF_ERR_MALLOC: return JS_ERR_OUT_OF_MEMORY; case HCF_ERR_COPY: - return JS_ERR_EXTERNAL_ERROR; + return JS_ERR_RUNTIME_ERROR; case HCF_ERR_CRYPTO_OPERATION: return JS_ERR_CRYPTO_OPERATION; case HCF_ERR_CERT_SIGNATURE_FAILURE: diff --git a/interfaces/kits/js/@ohos.security.cryptoFramework.d.ts b/interfaces/kits/js/@ohos.security.cryptoFramework.d.ts index d7e59b5..69aab90 100644 --- a/interfaces/kits/js/@ohos.security.cryptoFramework.d.ts +++ b/interfaces/kits/js/@ohos.security.cryptoFramework.d.ts @@ -45,10 +45,10 @@ declare namespace cryptoFramework { */ ERR_OUT_OF_MEMORY = 17620001, - /** Indicates that internal error. + /** Indicates that runtime error. * @since 9 */ - ERR_EXTERNAL_ERROR = 17620002, + ERR_RUNTIME_ERROR = 17620002, /** Indicates that crypto operation has something wrong. * @since 9 -- Gitee