From 2e5d5834ddc48b06fec1fd59aa5e3680d7704a1b Mon Sep 17 00:00:00 2001 From: fuzikun Date: Wed, 14 Sep 2022 09:45:32 +0800 Subject: [PATCH 01/16] add tdd description Signed-off-by: fuzikun --- test/unittest/src/crypto_aes_cipher_test.cpp | 15 +++++++++++++-- .../src/crypto_ecc_asy_key_generator_test.cpp | 6 ++++++ test/unittest/src/crypto_md_test.cpp | 6 ++++++ test/unittest/src/crypto_rand_test.cpp | 6 ++++++ .../unittest/src/crypto_x509_certificate_test.cpp | 7 ++++++- 5 files changed, 37 insertions(+), 3 deletions(-) diff --git a/test/unittest/src/crypto_aes_cipher_test.cpp b/test/unittest/src/crypto_aes_cipher_test.cpp index c50e70c..f858dbc 100644 --- a/test/unittest/src/crypto_aes_cipher_test.cpp +++ b/test/unittest/src/crypto_aes_cipher_test.cpp @@ -115,7 +115,7 @@ static int32_t GeneratorFile(const char *fileName, int32_t genFileSize) } uint8_t buffer[FILE_BLOCK_SIZE] = {0}; std::ifstream file(fileName); - + if (file.good()) { file.close(); return 0; @@ -429,7 +429,12 @@ static int32_t AesNoUpdateDecrypt(HcfCipher *cipher, HcfSymKey *key, HcfParamsSp return ret; } - +/** + * @tc.name: AesEncryptTest.AesEncryptTest001 + * @tc.desc: Verify whether the crypto framework is normal. + * @tc.type: FUNC + * @tc.require: I5QWEO + */ HWTEST_F(AesEncryptTest, AesEncryptTest001, TestSize.Level0) { int ret = 0; @@ -476,6 +481,12 @@ clearup: EXPECT_NE(ret, 0); } +/** + * @tc.name: AesEncryptTest.AesEncryptTest002 + * @tc.desc: Verify AES128 cipher algorithm. + * @tc.type: FUNC + * @tc.require: I5QWEG + */ HWTEST_F(AesEncryptTest, AesEncryptTest002, TestSize.Level0) { int ret = 0; diff --git a/test/unittest/src/crypto_ecc_asy_key_generator_test.cpp b/test/unittest/src/crypto_ecc_asy_key_generator_test.cpp index bf27a80..7feabf4 100644 --- a/test/unittest/src/crypto_ecc_asy_key_generator_test.cpp +++ b/test/unittest/src/crypto_ecc_asy_key_generator_test.cpp @@ -129,6 +129,12 @@ static HcfObjectBase obj = { .destroy = NULL }; +/** + * @tc.name: EccAsyKeyGeneratorTest.EccAsyKeyGeneratorTest001 + * @tc.desc: Verify that the creation of the ECC224 key pair generator is normal. + * @tc.type: FUNC + * @tc.require: I5QWEI + */ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest001, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; diff --git a/test/unittest/src/crypto_md_test.cpp b/test/unittest/src/crypto_md_test.cpp index 72ddd61..b15cf91 100644 --- a/test/unittest/src/crypto_md_test.cpp +++ b/test/unittest/src/crypto_md_test.cpp @@ -66,6 +66,12 @@ static void PrintfBlobInHex(uint8_t *data, size_t dataLen) printf("\n"); } +/** + * @tc.name: CryptoFrameworkMdTest.CryptoFrameworkMdCreateTest001 + * @tc.desc: Verify that the creation of the SHA1 Md obj is normal. + * @tc.type: FUNC + * @tc.require: I5QWEM + */ HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdCreateTest001, TestSize.Level0) { int32_t ret = 0; diff --git a/test/unittest/src/crypto_rand_test.cpp b/test/unittest/src/crypto_rand_test.cpp index 53cc0d2..12b41fd 100644 --- a/test/unittest/src/crypto_rand_test.cpp +++ b/test/unittest/src/crypto_rand_test.cpp @@ -43,6 +43,12 @@ void CryptoFrameworkRandTest::TearDown() // add destroy here, this will be calle { } +/** + * @tc.name: CryptoFrameworkRandTest.CryptoFrameworkRandCreateTest001 + * @tc.desc: Verify that the creation of the random obj is normal. + * @tc.type: FUNC + * @tc.require: I5QWEN + */ HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkRandCreateTest001, TestSize.Level0) { int32_t ret = 0; diff --git a/test/unittest/src/crypto_x509_certificate_test.cpp b/test/unittest/src/crypto_x509_certificate_test.cpp index 3a3d178..625cb9f 100644 --- a/test/unittest/src/crypto_x509_certificate_test.cpp +++ b/test/unittest/src/crypto_x509_certificate_test.cpp @@ -260,7 +260,12 @@ void X509CertTest::TearDown() { } -/* Valid PEM format. */ +/** + * @tc.name: X509CertTest.GenerateCert001 + * @tc.desc: Generate valid PEM format certificate. + * @tc.type: FUNC + * @tc.require: I5QDNN + */ HWTEST_F(X509CertTest, GenerateCert001, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; -- Gitee From 05d4387774c4a24149e5d3b6d957a0ccfb0e3899 Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Wed, 14 Sep 2022 10:21:22 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyongzhong2 --- frameworks/js/napi/inc/napi_utils.h | 2 +- frameworks/js/napi/src/napi_cipher.cpp | 4 ++-- frameworks/js/napi/src/napi_utils.cpp | 2 +- test/unittest/src/crypto_3des_cipher_test.cpp | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/frameworks/js/napi/inc/napi_utils.h b/frameworks/js/napi/inc/napi_utils.h index 82b3710..16abc51 100644 --- a/frameworks/js/napi/inc/napi_utils.h +++ b/frameworks/js/napi/inc/napi_utils.h @@ -46,7 +46,7 @@ inline void AddUint32Property(napi_env env, napi_value object, const char *name, } HcfBlob *GetBlobFromNapiValue(napi_env env, napi_value arg); -bool GetParamsSpecFormNapiValue(napi_env env, napi_value arg, HcfCryptoMode opMode, HcfParamsSpec **paramsSpec); +bool GetParamsSpecFromNapiValue(napi_env env, napi_value arg, HcfCryptoMode opMode, HcfParamsSpec **paramsSpec); napi_value ConvertBlobToNapiValue(napi_env env, HcfBlob *blob); bool GetStringFromJSParams(napi_env env, napi_value arg, std::string &returnStr); diff --git a/frameworks/js/napi/src/napi_cipher.cpp b/frameworks/js/napi/src/napi_cipher.cpp index ad02ab9..8608dd2 100644 --- a/frameworks/js/napi/src/napi_cipher.cpp +++ b/frameworks/js/napi/src/napi_cipher.cpp @@ -169,9 +169,9 @@ bool BuildContextForInit(napi_env env, napi_callback_info info, CipherFwkCtx con napi_valuetype valueType; napi_typeof(env, argv[index], &valueType); if (valueType != napi_null) { - if (!GetParamsSpecFormNapiValue(env, argv[index], context->opMode, &context->paramsSpec)) { + if (!GetParamsSpecFromNapiValue(env, argv[index], context->opMode, &context->paramsSpec)) { napi_throw(env, GenerateBusinessError(env, HCF_INVALID_PARAMS, "failed to get valid params spec!")); - LOGE("GetParamsSpecFormNapiValue failed!"); + LOGE("GetParamsSpecFromNapiValue failed!"); return false; } } diff --git a/frameworks/js/napi/src/napi_utils.cpp b/frameworks/js/napi/src/napi_utils.cpp index 7ba163f..eb26f62 100644 --- a/frameworks/js/napi/src/napi_utils.cpp +++ b/frameworks/js/napi/src/napi_utils.cpp @@ -422,7 +422,7 @@ clearup: return ret; } -bool GetParamsSpecFormNapiValue(napi_env env, napi_value arg, HcfCryptoMode opMode, HcfParamsSpec **paramsSpec) +bool GetParamsSpecFromNapiValue(napi_env env, napi_value arg, HcfCryptoMode opMode, HcfParamsSpec **paramsSpec) { napi_value data = nullptr; if ((env == nullptr) || (arg == nullptr) || (paramsSpec == nullptr)) { diff --git a/test/unittest/src/crypto_3des_cipher_test.cpp b/test/unittest/src/crypto_3des_cipher_test.cpp index eda7f79..24a3415 100644 --- a/test/unittest/src/crypto_3des_cipher_test.cpp +++ b/test/unittest/src/crypto_3des_cipher_test.cpp @@ -200,7 +200,6 @@ static int32_t DesNoUpdateDecrypt(HcfCipher *cipher, HcfSymKey *key, HcfParamsSp return ret; } - HWTEST_F(DesEncryptTest, DesEncryptTest001, TestSize.Level0) { int ret = 0; @@ -1404,4 +1403,4 @@ clearup: OH_HCF_ObjDestroy((HcfObjectBase *)cipher); OH_HCF_ObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); -} \ No newline at end of file +} -- Gitee From f09eebfaa6a9f533f9fa03b4c920f0c3f35746f3 Mon Sep 17 00:00:00 2001 From: quyawei Date: Wed, 14 Sep 2022 17:53:21 +0800 Subject: [PATCH 03/16] add length limit for rand generation Signed-off-by: quyawei --- frameworks/rand/rand.c | 2 +- test/unittest/src/crypto_rand_test.cpp | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/frameworks/rand/rand.c b/frameworks/rand/rand.c index 36ca734..b4a1d97 100644 --- a/frameworks/rand/rand.c +++ b/frameworks/rand/rand.c @@ -60,7 +60,7 @@ static HcfRandSpiCreateFunc FindAbility(const char *algoName) static HcfResult GenerateRandom(HcfRand *self, int32_t numBytes, HcfBlob *random) { - if ((self == NULL) || (numBytes <= 0) || (random == NULL)) { + if ((self == NULL) || (numBytes <= 0) || (numBytes > HCF_MAX_BUFFER_LEN) || (random == NULL)) { LOGE("Invalid params!"); return HCF_INVALID_PARAMS; } diff --git a/test/unittest/src/crypto_rand_test.cpp b/test/unittest/src/crypto_rand_test.cpp index 53cc0d2..a7fae07 100644 --- a/test/unittest/src/crypto_rand_test.cpp +++ b/test/unittest/src/crypto_rand_test.cpp @@ -96,8 +96,8 @@ HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkRandGenerateTest003, TestSize.L ret = (int)HcfRandCreate(&randObj); EXPECT_EQ(ret, 0); // preset params - int32_t randomLen = 1000; - uint8_t randomBuf[1000] = {0}; + int32_t randomLen = 8192; + uint8_t randomBuf[8192] = {0}; // define randomBlob and seedBlob struct HcfBlob randomBlob = {.data = (uint8_t *)randomBuf, .len = 0}; // test generate random @@ -108,6 +108,25 @@ HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkRandGenerateTest003, TestSize.L OH_HCF_ObjDestroy(randObj); } +HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkRandGenerateTest004, TestSize.Level0) +{ + int32_t ret = 0; + // create a rand obj + HcfRand *randObj = nullptr; + ret = (int)HcfRandCreate(&randObj); + EXPECT_EQ(ret, 0); + // preset params + int32_t randomLen = 8193; + uint8_t randomBuf[8193] = {0}; + // define randomBlob and seedBlob + struct HcfBlob randomBlob = {.data = (uint8_t *)randomBuf, .len = 0}; + // test generate random + ret = randObj->generateRandom(randObj, randomLen, &randomBlob); + EXPECT_NE(ret, 0); + // destroy the API obj and blob data + OH_HCF_ObjDestroy(randObj); +} + HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkSetSeedTest001, TestSize.Level0) { int32_t ret = 0; -- Gitee From 0ae057f72cb4c280371abf9c07e764e1534a76ce Mon Sep 17 00:00:00 2001 From: lvyuanmin Date: Fri, 16 Sep 2022 16:19:44 +0800 Subject: [PATCH 04/16] update standard utils Signed-off-by: lvyuanmin --- build/config.gni | 27 +++++++--------- common/BUILD.gn | 37 ++++++++++----------- common/common.gni | 2 +- frameworks/BUILD.gn | 67 +++++++++++++++++++-------------------- frameworks/frameworks.gni | 32 +++++++------------ plugin/BUILD.gn | 43 +++++++++++++------------ plugin/plugin.gni | 25 ++++++--------- test/unittest/BUILD.gn | 8 +++-- 8 files changed, 110 insertions(+), 131 deletions(-) diff --git a/build/config.gni b/build/config.gni index 36eb12d..4f21710 100644 --- a/build/config.gni +++ b/build/config.gni @@ -1,15 +1,12 @@ -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - \ No newline at end of file +# Copyright (C) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/common/BUILD.gn b/common/BUILD.gn index 3d8e2c0..6602b75 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -11,32 +11,29 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") import("//base/security/crypto_framework/common/common.gni") +import("//build/ohos.gni") ohos_static_library("crypto_plugin_common") { - subsystem_name = "security" - part_name = "crypto_framework" - include_dirs = [ - "//utils/native/base/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - ] - include_dirs += crypto_framwork_common_inc_path - - sources = crypto_framwork_common_files + subsystem_name = "security" + part_name = "crypto_framework" + include_dirs = [ + "//commonlibrary/c_utils/base/include", + "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + ] + include_dirs += crypto_framwork_common_inc_path - defines = [ "HILOG_ENABLE" ] - cflags = [ - "-DHILOG_ENABLE", - "-fPIC", - "-Wall", - ] + sources = crypto_framwork_common_files - deps = [ - "//utils/native/base:utils", - ] + defines = [ "HILOG_ENABLE" ] + cflags = [ + "-DHILOG_ENABLE", + "-fPIC", + "-Wall", + ] - external_deps = [ + external_deps = [ + "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] } diff --git a/common/common.gni b/common/common.gni index 247823a..ceb4139 100644 --- a/common/common.gni +++ b/common/common.gni @@ -26,4 +26,4 @@ framework_common_util_files = [ "//base/security/crypto_framework/common/src/params_parser.c", ] -crypto_framwork_common_files = framework_common_util_files \ No newline at end of file +crypto_framwork_common_files = framework_common_util_files diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn index bcdbaf9..293f7d4 100644 --- a/frameworks/BUILD.gn +++ b/frameworks/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") -import("//base/security/crypto_framework/frameworks/frameworks.gni") import("//base/security/crypto_framework/common/common.gni") +import("//base/security/crypto_framework/frameworks/frameworks.gni") +import("//build/ohos.gni") config("framework_config") { include_dirs = [ @@ -27,27 +27,26 @@ config("framework_config") { } ohos_shared_library("crypto_framework_lib") { - subsystem_name = "security" - part_name = "crypto_framework" - public_configs = [ ":framework_config" ] - include_dirs = [ - "//utils/native/base/include", - ] - include_dirs += framework_inc_path + crypto_framwork_common_inc_path + subsystem_name = "security" + part_name = "crypto_framework" + public_configs = [ ":framework_config" ] + include_dirs = [ "//commonlibrary/c_utils/base/include" ] + include_dirs += framework_inc_path + crypto_framwork_common_inc_path + + sources = framework_files - sources = framework_files + cflags = [ + "-fPIC", + "-Wall", + ] - cflags = [ - "-fPIC", - "-Wall", - ] + deps = [ + "//base/security/crypto_framework:crypto_openssl_plugin_lib", + "//base/security/crypto_framework/common:crypto_plugin_common", + "//third_party/openssl:libcrypto_shared", + ] - deps = [ - "//utils/native/base:utils", - "//third_party/openssl:libcrypto_shared", - "//base/security/crypto_framework:crypto_openssl_plugin_lib", - "//base/security/crypto_framework/common:crypto_plugin_common", - ] + external_deps = [ "c_utils:utils" ] } ohos_shared_library("cryptoframework_napi") { @@ -57,7 +56,7 @@ ohos_shared_library("cryptoframework_napi") { include_dirs = [ "//base/security/crypto_framework/interfaces/kits/js", "//third_party/bounds_checking_function/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//base/security/crypto_framework/frameworks/js/napi/inc", ] include_dirs += framework_inc_path @@ -68,26 +67,26 @@ ohos_shared_library("cryptoframework_napi") { ] sources = [ + "js/napi/src/napi_asy_key_generator.cpp", + "js/napi/src/napi_cert_chain_validator.cpp", + "js/napi/src/napi_cipher.cpp", "js/napi/src/napi_init.cpp", - "js/napi/src/napi_utils.cpp", + "js/napi/src/napi_key.cpp", + "js/napi/src/napi_key_agreement.cpp", "js/napi/src/napi_key_pair.cpp", + "js/napi/src/napi_mac.cpp", + "js/napi/src/napi_md.cpp", "js/napi/src/napi_pri_key.cpp", "js/napi/src/napi_pub_key.cpp", - "js/napi/src/napi_asy_key_generator.cpp", + "js/napi/src/napi_rand.cpp", "js/napi/src/napi_sign.cpp", + "js/napi/src/napi_sym_key.cpp", + "js/napi/src/napi_sym_key_generator.cpp", + "js/napi/src/napi_utils.cpp", "js/napi/src/napi_verify.cpp", - "js/napi/src/napi_key_agreement.cpp", "js/napi/src/napi_x509_certificate.cpp", - "js/napi/src/napi_mac.cpp", - "js/napi/src/napi_md.cpp", - "js/napi/src/napi_rand.cpp", "js/napi/src/napi_x509_crl.cpp", "js/napi/src/napi_x509_crl_entry.cpp", - "js/napi/src/napi_sym_key_generator.cpp", - "js/napi/src/napi_cipher.cpp", - "js/napi/src/napi_key.cpp", - "js/napi/src/napi_sym_key.cpp", - "js/napi/src/napi_cert_chain_validator.cpp", ] deps = [ @@ -95,7 +94,5 @@ ohos_shared_library("cryptoframework_napi") { "//third_party/bounds_checking_function:libsec_static", ] - external_deps = [ - "napi:ace_napi", - ] + external_deps = [ "napi:ace_napi" ] } diff --git a/frameworks/frameworks.gni b/frameworks/frameworks.gni index 5332e62..bb71e27 100644 --- a/frameworks/frameworks.gni +++ b/frameworks/frameworks.gni @@ -44,35 +44,25 @@ framework_certificate_files = [ "${framework_path}/certificate/x509_crl.c", ] -framework_cipher_files = [ - "${framework_path}/crypto_operation/cipher.c", -] +framework_cipher_files = [ "${framework_path}/crypto_operation/cipher.c" ] -framework_signature_files = [ - "${framework_path}/crypto_operation/signature.c", -] +framework_signature_files = [ "${framework_path}/crypto_operation/signature.c" ] -framework_key_agreement_files = [ - "${framework_path}/crypto_operation/key_agreement.c", -] +framework_key_agreement_files = + [ "${framework_path}/crypto_operation/key_agreement.c" ] framework_key_files = [ "${framework_path}/key/asy_key_generator.c", "${framework_path}/key/sym_key_generator.c", ] -framework_mac_files = [ - "${framework_path}/crypto_operation/mac.c", -] +framework_mac_files = [ "${framework_path}/crypto_operation/mac.c" ] -framework_rand_files = [ - "${framework_path}/rand/rand.c", -] +framework_rand_files = [ "${framework_path}/rand/rand.c" ] -framework_md_files = [ - "${framework_path}/crypto_operation/md.c", -] +framework_md_files = [ "${framework_path}/crypto_operation/md.c" ] -framework_files = framework_certificate_files + framework_key_agreement_files + - framework_signature_files + framework_cipher_files + framework_key_files + framework_mac_files + - framework_rand_files + framework_md_files +framework_files = + framework_certificate_files + framework_key_agreement_files + + framework_signature_files + framework_cipher_files + framework_key_files + + framework_mac_files + framework_rand_files + framework_md_files diff --git a/plugin/BUILD.gn b/plugin/BUILD.gn index d41e665..a53f079 100644 --- a/plugin/BUILD.gn +++ b/plugin/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") -import("//base/security/crypto_framework/plugin/plugin.gni") import("//base/security/crypto_framework/common/common.gni") +import("//base/security/crypto_framework/plugin/plugin.gni") +import("//build/ohos.gni") config("plugin_config") { include_dirs = [ @@ -28,25 +28,26 @@ config("plugin_config") { } ohos_shared_library("crypto_openssl_plugin_lib") { - subsystem_name = "security" - part_name = "crypto_framework" - public_configs = [ ":plugin_config" ] - include_dirs = [ - "//utils/native/base/include", - "//third_party/openssl/include/", - ] - include_dirs += plugin_inc_path + crypto_framwork_common_inc_path + subsystem_name = "security" + part_name = "crypto_framework" + public_configs = [ ":plugin_config" ] + include_dirs = [ + "//commonlibrary/c_utils/base/include", + "//third_party/openssl/include/", + ] + include_dirs += plugin_inc_path + crypto_framwork_common_inc_path - sources = plugin_files + sources = plugin_files - cflags = [ - "-fPIC", - "-Wall", - ] + cflags = [ + "-fPIC", + "-Wall", + ] - deps = [ - "//utils/native/base:utils", - "//third_party/openssl:libcrypto_shared", - "//base/security/crypto_framework/common:crypto_plugin_common", - ] -} \ No newline at end of file + deps = [ + "//base/security/crypto_framework/common:crypto_plugin_common", + "//third_party/openssl:libcrypto_shared", + ] + + external_deps = [ "c_utils:utils" ] +} diff --git a/plugin/plugin.gni b/plugin/plugin.gni index 1db4d1e..245b7cf 100644 --- a/plugin/plugin.gni +++ b/plugin/plugin.gni @@ -47,9 +47,7 @@ plugin_asy_key_generator_files = [ "${plugin_path}/openssl_plugin/key/asy_key_generator/src/rsa_asy_key_generator_openssl.c", ] -plugin_key_agreement_files = [ - "${plugin_path}/openssl_plugin/crypto_operation/key_agreement/src/ecdh_openssl.c", -] +plugin_key_agreement_files = [ "${plugin_path}/openssl_plugin/crypto_operation/key_agreement/src/ecdh_openssl.c" ] plugin_certificate_files = [ "${plugin_path}/openssl_plugin/certificate/src/x509_cert_chain_validator_openssl.c", @@ -69,18 +67,15 @@ plugin_cipher_files = [ "${plugin_path}/openssl_plugin/crypto_operation/aes/src/cipher_aes_common.c", ] -plugin_hmac_files = [ - "${plugin_path}/openssl_plugin/crypto_operation/hmac/src/mac_openssl.c", -] +plugin_hmac_files = + [ "${plugin_path}/openssl_plugin/crypto_operation/hmac/src/mac_openssl.c" ] -plugin_rand_files = [ - "${plugin_path}/openssl_plugin/rand/src/rand_openssl.c", -] +plugin_rand_files = [ "${plugin_path}/openssl_plugin/rand/src/rand_openssl.c" ] -plugin_md_files = [ - "${plugin_path}/openssl_plugin/crypto_operation/md/src/md_openssl.c", -] +plugin_md_files = + [ "${plugin_path}/openssl_plugin/crypto_operation/md/src/md_openssl.c" ] -plugin_files = plugin_certificate_files + plugin_asy_key_generator_files + plugin_key_agreement_files + - plugin_sym_key_files + plugin_cipher_files + plugin_hmac_files + plugin_rand_files + - plugin_md_files + plugin_signature_files + plugin_common_files +plugin_files = plugin_certificate_files + plugin_asy_key_generator_files + + plugin_key_agreement_files + plugin_sym_key_files + + plugin_cipher_files + plugin_hmac_files + plugin_rand_files + + plugin_md_files + plugin_signature_files + plugin_common_files diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 3d502ee..4cf3840 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -23,7 +23,7 @@ ohos_unittest("crypto_framework_test") { include_dirs = [ "./include" ] include_dirs += [ - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//third_party/openssl/include/", ] include_dirs += framework_inc_path + plugin_inc_path @@ -57,10 +57,12 @@ ohos_unittest("crypto_framework_test") { "//base/security/crypto_framework:crypto_openssl_plugin_lib", "//third_party/bounds_checking_function:libsec_shared", "//third_party/openssl:libcrypto_shared", - "//utils/native/base:utils", ] defines = [ "HILOG_ENABLE" ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", + ] } -- Gitee From 3b951709ae517d024ff4d468be45f618ee16434d Mon Sep 17 00:00:00 2001 From: quyawei Date: Wed, 14 Sep 2022 17:53:21 +0800 Subject: [PATCH 05/16] codecheck fix Signed-off-by: quyawei --- frameworks/rand/rand.c | 2 +- test/unittest/src/crypto_mac_test.cpp | 118 ++++++++++++------------- test/unittest/src/crypto_md_test.cpp | 78 ++++++++-------- test/unittest/src/crypto_rand_test.cpp | 61 ++++++++----- 4 files changed, 139 insertions(+), 120 deletions(-) diff --git a/frameworks/rand/rand.c b/frameworks/rand/rand.c index 36ca734..b4a1d97 100644 --- a/frameworks/rand/rand.c +++ b/frameworks/rand/rand.c @@ -60,7 +60,7 @@ static HcfRandSpiCreateFunc FindAbility(const char *algoName) static HcfResult GenerateRandom(HcfRand *self, int32_t numBytes, HcfBlob *random) { - if ((self == NULL) || (numBytes <= 0) || (random == NULL)) { + if ((self == NULL) || (numBytes <= 0) || (numBytes > HCF_MAX_BUFFER_LEN) || (random == NULL)) { LOGE("Invalid params!"); return HCF_INVALID_PARAMS; } diff --git a/test/unittest/src/crypto_mac_test.cpp b/test/unittest/src/crypto_mac_test.cpp index 6f1b4e8..9ee1707 100644 --- a/test/unittest/src/crypto_mac_test.cpp +++ b/test/unittest/src/crypto_mac_test.cpp @@ -26,7 +26,7 @@ using namespace std; using namespace testing::ext; -class CryptoFrameworkHmacTest : public testing::Test { +class CryptoHmacTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -49,14 +49,14 @@ static char g_testBigData[] = "VqRH5dzdeeturr5zN5vE77DtqjV7kNKbDJqk4mNqyYRTXymhj "2mnJ5xfnY3z63PFk6TXU9Ga2YmHvtycXxwqMBEctQRa3zVWGVSrh3NF6jXa\r\n"; constexpr uint32_t MAX_MAC_BLOB_LEN = 5000; -void CryptoFrameworkHmacTest::SetUpTestCase() {} -void CryptoFrameworkHmacTest::TearDownTestCase() {} +void CryptoHmacTest::SetUpTestCase() {} +void CryptoHmacTest::TearDownTestCase() {} -void CryptoFrameworkHmacTest::SetUp() // add init here, this will be called before test. +void CryptoHmacTest::SetUp() // add init here, this will be called before test. { } -void CryptoFrameworkHmacTest::TearDown() // add destroy here, this will be called when test case done. +void CryptoHmacTest::TearDown() // add destroy here, this will be called when test case done. { } @@ -68,50 +68,50 @@ static void PrintfBlobInHex(uint8_t *data, size_t dataLen) printf("\n"); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacCreateTest002, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacCreateTest002, TestSize.Level0) { int32_t ret = 0; - ret = (int)HcfMacCreate("SHA1", nullptr); + ret = (int32_t)HcfMacCreate("SHA1", nullptr); EXPECT_NE(ret, 0); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacAlgoSuppTest001, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoSuppTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA1", &macObj); + ret = (int32_t)HcfMacCreate("SHA1", &macObj); EXPECT_EQ(ret, 0); EXPECT_NE(macObj, nullptr); OH_HCF_ObjDestroy(macObj); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacAlgoSuppTest002, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoSuppTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA3", &macObj); + ret = (int32_t)HcfMacCreate("SHA3", &macObj); EXPECT_NE(ret, 0); EXPECT_EQ(macObj, nullptr); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacAlgoSuppTest003, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoSuppTest003, TestSize.Level0) { int32_t ret = 0; // create a SHA obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate(nullptr, &macObj); + ret = (int32_t)HcfMacCreate(nullptr, &macObj); EXPECT_NE(ret, 0); EXPECT_EQ(macObj, nullptr); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacAlgoNameTest001, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoNameTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA1", &macObj); + ret = (int32_t)HcfMacCreate("SHA1", &macObj); EXPECT_EQ(ret, 0); EXPECT_NE(macObj, nullptr); // test api functions @@ -121,12 +121,12 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacAlgoNameTest001, TestSize.L OH_HCF_ObjDestroy(macObj); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacInitTest001, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacInitTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA1", &macObj); + ret = (int32_t)HcfMacCreate("SHA1", &macObj); EXPECT_EQ(ret, 0); // set a nullptr key HcfSymKey *key = nullptr; @@ -136,16 +136,16 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacInitTest001, TestSize.Level OH_HCF_ObjDestroy(macObj); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacInitTest002, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacInitTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA1", &macObj); + ret = (int32_t)HcfMacCreate("SHA1", &macObj); EXPECT_EQ(ret, 0); // create a symKey generator HcfSymKeyGenerator *generator = nullptr; - ret = (int)HcfSymKeyGeneratorCreate("AES128", &generator); + ret = (int32_t)HcfSymKeyGeneratorCreate("AES128", &generator); EXPECT_EQ(ret, 0); // get sym key from preset keyBlob uint8_t testKey[] = "abcdefghijklmnop"; @@ -161,12 +161,12 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacInitTest002, TestSize.Level OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacUpdateTest001, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacUpdateTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA1", &macObj); + ret = (int32_t)HcfMacCreate("SHA1", &macObj); EXPECT_EQ(ret, 0); // set input and output buf uint8_t testData[] = "My test data"; @@ -179,16 +179,16 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacUpdateTest001, TestSize.Lev OH_HCF_ObjDestroy(macObj); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacUpdateTest002, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacUpdateTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA1", &macObj); + ret = (int32_t)HcfMacCreate("SHA1", &macObj); EXPECT_EQ(ret, 0); // cteate key generator and set key text HcfSymKeyGenerator *generator = nullptr; - ret = (int)HcfSymKeyGeneratorCreate("AES128", &generator); + ret = (int32_t)HcfSymKeyGeneratorCreate("AES128", &generator); EXPECT_EQ(ret, 0); // get sym key from preset keyBlob uint8_t testKey[] = "abcdefghijklmnop"; @@ -208,16 +208,16 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacUpdateTest002, TestSize.Lev OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacUpdateTest003, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacUpdateTest003, TestSize.Level0) { int32_t ret = 0; // create a API obj with SHA1 HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA1", &macObj); + ret = (int32_t)HcfMacCreate("SHA1", &macObj); EXPECT_EQ(ret, 0); // cteate key generator and set key text HcfSymKeyGenerator *generator = nullptr; - ret = (int)HcfSymKeyGeneratorCreate("AES128", &generator); + ret = (int32_t)HcfSymKeyGeneratorCreate("AES128", &generator); EXPECT_EQ(ret, 0); // get sym key from preset keyBlob uint8_t testKey[] = "abcdefghijklmnop"; @@ -240,12 +240,12 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacUpdateTest003, TestSize.Lev OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacDoFinalTest001, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacDoFinalTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA1", &macObj); + ret = (int32_t)HcfMacCreate("SHA1", &macObj); EXPECT_EQ(ret, 0); // set input and output buf uint8_t outBuf[20] = {0}; @@ -257,16 +257,16 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacDoFinalTest001, TestSize.Le OH_HCF_ObjDestroy(macObj); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacDoFinalTest002, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacDoFinalTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA1", &macObj); + ret = (int32_t)HcfMacCreate("SHA1", &macObj); EXPECT_EQ(ret, 0); // cteate key generator and set key text HcfSymKeyGenerator *generator = nullptr; - ret = (int)HcfSymKeyGeneratorCreate("AES128", &generator); + ret = (int32_t)HcfSymKeyGeneratorCreate("AES128", &generator); EXPECT_EQ(ret, 0); // get sym key from preset keyBlob uint8_t testKey[] = "abcdefghijklmnop"; @@ -300,16 +300,16 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacDoFinalTest002, TestSize.Le printf("test finish"); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacDoFinalTest003, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacDoFinalTest003, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA1", &macObj); + ret = (int32_t)HcfMacCreate("SHA1", &macObj); EXPECT_EQ(ret, 0); // cteate key generator HcfSymKeyGenerator *generator = nullptr; - ret = (int)HcfSymKeyGeneratorCreate("AES128", &generator); + ret = (int32_t)HcfSymKeyGeneratorCreate("AES128", &generator); EXPECT_EQ(ret, 0); // get sym key from preset keyBlob uint8_t testKey[] = "abcdefghijklmnop"; @@ -338,16 +338,16 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacDoFinalTest003, TestSize.Le OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacDoFinalTest004, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacDoFinalTest004, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA256", &macObj); + ret = (int32_t)HcfMacCreate("SHA256", &macObj); EXPECT_EQ(ret, 0); // cteate key generator HcfSymKeyGenerator *generator = nullptr; - ret = (int)HcfSymKeyGeneratorCreate("AES128", &generator); + ret = (int32_t)HcfSymKeyGeneratorCreate("AES128", &generator); EXPECT_EQ(ret, 0); // get sym key from preset keyBlob uint8_t testKey[] = "abcdefghijklmnop"; @@ -375,12 +375,12 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacDoFinalTest004, TestSize.Le OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacLenTest001, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacLenTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA1", &macObj); + ret = (int32_t)HcfMacCreate("SHA1", &macObj); EXPECT_EQ(ret, 0); // test api functions ret = macObj->getMacLength(macObj); @@ -388,16 +388,16 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacLenTest001, TestSize.Level0 OH_HCF_ObjDestroy(macObj); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacLenTest002, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacLenTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA1", &macObj); + ret = (int32_t)HcfMacCreate("SHA1", &macObj); EXPECT_EQ(ret, 0); // cteate key generator HcfSymKeyGenerator *generator = nullptr; - ret = (int)HcfSymKeyGeneratorCreate("AES128", &generator); + ret = (int32_t)HcfSymKeyGeneratorCreate("AES128", &generator); EXPECT_EQ(ret, 0); // get sym key from preset keyBlob uint8_t testKey[] = "abcdefghijklmnop"; @@ -415,16 +415,16 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacLenTest002, TestSize.Level0 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacAlgoTest001, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA1", &macObj); + ret = (int32_t)HcfMacCreate("SHA1", &macObj); EXPECT_EQ(ret, 0); // create a symKey generator HcfSymKeyGenerator *generator = nullptr; - ret = (int)HcfSymKeyGeneratorCreate("AES128", &generator); + ret = (int32_t)HcfSymKeyGeneratorCreate("AES128", &generator); EXPECT_EQ(ret, 0); // set key data and convert it to key obj uint8_t testKey[] = "abcdefghijklmnop"; @@ -454,16 +454,16 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacAlgoTest001, TestSize.Level OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacAlgoTest002, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA224", &macObj); + ret = (int32_t)HcfMacCreate("SHA224", &macObj); EXPECT_EQ(ret, 0); // create a symKey generator HcfSymKeyGenerator *generator = nullptr; - ret = (int)HcfSymKeyGeneratorCreate("AES128", &generator); + ret = (int32_t)HcfSymKeyGeneratorCreate("AES128", &generator); EXPECT_EQ(ret, 0); // set key data and convert it to key obj uint8_t testKey[] = "abcdefghijklmnop"; @@ -493,16 +493,16 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacAlgoTest002, TestSize.Level OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacAlgoTest003, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest003, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA256", &macObj); + ret = (int32_t)HcfMacCreate("SHA256", &macObj); EXPECT_EQ(ret, 0); // create a symKey generator HcfSymKeyGenerator *generator = nullptr; - ret = (int)HcfSymKeyGeneratorCreate("AES128", &generator); + ret = (int32_t)HcfSymKeyGeneratorCreate("AES128", &generator); EXPECT_EQ(ret, 0); // set key data and convert it to key obj uint8_t testKey[] = "abcdefghijklmnop"; @@ -532,16 +532,16 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacAlgoTest003, TestSize.Level OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacAlgoTest004, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest004, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA384", &macObj); + ret = (int32_t)HcfMacCreate("SHA384", &macObj); EXPECT_EQ(ret, 0); // create a symKey generator HcfSymKeyGenerator *generator = nullptr; - ret = (int)HcfSymKeyGeneratorCreate("AES128", &generator); + ret = (int32_t)HcfSymKeyGeneratorCreate("AES128", &generator); EXPECT_EQ(ret, 0); // set key data and convert it to key obj uint8_t testKey[] = "abcdefghijklmnop"; @@ -571,16 +571,16 @@ HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacAlgoTest004, TestSize.Level OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoFrameworkHmacTest, CryptoFrameworkHmacAlgoTest005, TestSize.Level0) +HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest005, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMac *macObj = nullptr; - ret = (int)HcfMacCreate("SHA512", &macObj); + ret = (int32_t)HcfMacCreate("SHA512", &macObj); EXPECT_EQ(ret, 0); // create a symKey generator HcfSymKeyGenerator *generator = nullptr; - ret = (int)HcfSymKeyGeneratorCreate("AES128", &generator); + ret = (int32_t)HcfSymKeyGeneratorCreate("AES128", &generator); EXPECT_EQ(ret, 0); // set key data and convert it to key obj uint8_t testKey[] = "abcdefghijklmnop"; diff --git a/test/unittest/src/crypto_md_test.cpp b/test/unittest/src/crypto_md_test.cpp index 72ddd61..944c200 100644 --- a/test/unittest/src/crypto_md_test.cpp +++ b/test/unittest/src/crypto_md_test.cpp @@ -24,7 +24,7 @@ using namespace std; using namespace testing::ext; -class CryptoFrameworkMdTest : public testing::Test { +class CryptoMdTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -47,14 +47,14 @@ static char g_testBigData[] = "VqRH5dzdeeturr5zN5vE77DtqjV7kNKbDJqk4mNqyYRTXymhj "2mnJ5xfnY3z63PFk6TXU9Ga2YmHvtycXxwqMBEctQRa3zVWGVSrh3NF6jXa\r\n"; constexpr uint32_t MAX_MD_BLOB_LEN = 5000; -void CryptoFrameworkMdTest::SetUpTestCase() {} -void CryptoFrameworkMdTest::TearDownTestCase() {} +void CryptoMdTest::SetUpTestCase() {} +void CryptoMdTest::TearDownTestCase() {} -void CryptoFrameworkMdTest::SetUp() // add init here, this will be called before test. +void CryptoMdTest::SetUp() // add init here, this will be called before test. { } -void CryptoFrameworkMdTest::TearDown() // add destroy here, this will be called when test case done. +void CryptoMdTest::TearDown() // add destroy here, this will be called when test case done. { } @@ -66,51 +66,51 @@ static void PrintfBlobInHex(uint8_t *data, size_t dataLen) printf("\n"); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdCreateTest001, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdCreateTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj - ret = (int)HcfMdCreate("SHA1", nullptr); + ret = (int32_t)HcfMdCreate("SHA1", nullptr); EXPECT_NE(ret, 0); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoSuppTest001, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoSuppTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("SHA1", &mdObj); + ret = (int32_t)HcfMdCreate("SHA1", &mdObj); EXPECT_EQ(ret, 0); EXPECT_NE(mdObj, nullptr); OH_HCF_ObjDestroy(mdObj); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoSuppTest002, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoSuppTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA3 obj (not supported) HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("SHA3", &mdObj); + ret = (int32_t)HcfMdCreate("SHA3", &mdObj); EXPECT_NE(ret, 0); EXPECT_EQ(mdObj, nullptr); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoSuppTest003, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoSuppTest003, TestSize.Level0) { int32_t ret = 0; // create an obj with null algoInput (not supported) HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate(nullptr, &mdObj); + ret = (int32_t)HcfMdCreate(nullptr, &mdObj); EXPECT_NE(ret, 0); EXPECT_EQ(mdObj, nullptr); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoNameTest001, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoNameTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("SHA1", &mdObj); + ret = (int32_t)HcfMdCreate("SHA1", &mdObj); EXPECT_EQ(ret, 0); EXPECT_NE(mdObj, nullptr); // test api functions @@ -120,12 +120,12 @@ HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoNameTest001, TestSize.Level OH_HCF_ObjDestroy(mdObj); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdUpdateTest001, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdUpdateTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("SHA1", &mdObj); + ret = (int32_t)HcfMdCreate("SHA1", &mdObj); EXPECT_EQ(ret, 0); // define input and output data in blob form HcfBlob *inBlob= nullptr; @@ -135,12 +135,12 @@ HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdUpdateTest001, TestSize.Level0) OH_HCF_ObjDestroy(mdObj); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdUpdateTest002, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdUpdateTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("SHA1", &mdObj); + ret = (int32_t)HcfMdCreate("SHA1", &mdObj); EXPECT_EQ(ret, 0); // set input and output buf uint8_t testData[] = "My test data"; @@ -153,12 +153,12 @@ HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdUpdateTest002, TestSize.Level0) OH_HCF_ObjDestroy(mdObj); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdDoFinalTest001, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdDoFinalTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("SHA1", &mdObj); + ret = (int32_t)HcfMdCreate("SHA1", &mdObj); EXPECT_EQ(ret, 0); // set input and output buf uint8_t outBuf[20] = {0}; @@ -171,12 +171,12 @@ HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdDoFinalTest001, TestSize.Level0 OH_HCF_ObjDestroy(mdObj); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdDoFinalTest002, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdDoFinalTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("SHA1", &mdObj); + ret = (int32_t)HcfMdCreate("SHA1", &mdObj); EXPECT_EQ(ret, 0); // set input and output buf uint8_t testData[] = "My test data"; @@ -195,12 +195,12 @@ HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdDoFinalTest002, TestSize.Level0 OH_HCF_ObjDestroy(mdObj); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdDoFinalTest003, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdDoFinalTest003, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("SHA256", &mdObj); + ret = (int32_t)HcfMdCreate("SHA256", &mdObj); EXPECT_EQ(ret, 0); // set input and output buf uint8_t outBuf[20] = {0}; @@ -218,12 +218,12 @@ HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdDoFinalTest003, TestSize.Level0 OH_HCF_ObjDestroy(mdObj); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdLenTest001, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdLenTest001, TestSize.Level0) { int32_t ret = 0; // create a API obj with SHA1 HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("SHA1", &mdObj); + ret = (int32_t)HcfMdCreate("SHA1", &mdObj); EXPECT_EQ(ret, 0); // test api functions ret = mdObj->getMdLength(mdObj); @@ -231,12 +231,12 @@ HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdLenTest001, TestSize.Level0) OH_HCF_ObjDestroy(mdObj); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoTest001, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest001, TestSize.Level0) { int32_t ret = 0; // create a API obj with SHA1 HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("SHA1", &mdObj); + ret = (int32_t)HcfMdCreate("SHA1", &mdObj); EXPECT_EQ(ret, 0); // set input and output buf uint8_t testData[] = "My test data"; @@ -257,12 +257,12 @@ HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoTest001, TestSize.Level0) OH_HCF_ObjDestroy(mdObj); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoTest002, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest002, TestSize.Level0) { int32_t ret = 0; // create a API obj with SHA1 HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("SHA224", &mdObj); + ret = (int32_t)HcfMdCreate("SHA224", &mdObj); EXPECT_EQ(ret, 0); // set input and output buf @@ -287,12 +287,12 @@ HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoTest002, TestSize.Level0) OH_HCF_ObjDestroy(mdObj); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoTest003, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest003, TestSize.Level0) { int32_t ret = 0; // create a API obj with SHA1 HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("SHA256", &mdObj); + ret = (int32_t)HcfMdCreate("SHA256", &mdObj); EXPECT_EQ(ret, 0); // set input and output buf uint8_t testData[] = "My test data"; @@ -315,12 +315,12 @@ HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoTest003, TestSize.Level0) OH_HCF_ObjDestroy(mdObj); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoTest004, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest004, TestSize.Level0) { int32_t ret = 0; // create a API obj with SHA1 HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("SHA384", &mdObj); + ret = (int32_t)HcfMdCreate("SHA384", &mdObj); EXPECT_EQ(ret, 0); // set input and output buf @@ -345,12 +345,12 @@ HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoTest004, TestSize.Level0) OH_HCF_ObjDestroy(mdObj); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoTest005, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest005, TestSize.Level0) { int32_t ret = 0; // create a API obj with SHA1 HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("SHA512", &mdObj); + ret = (int32_t)HcfMdCreate("SHA512", &mdObj); EXPECT_EQ(ret, 0); // set input and output buf @@ -375,12 +375,12 @@ HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoTest005, TestSize.Level0) OH_HCF_ObjDestroy(mdObj); } -HWTEST_F(CryptoFrameworkMdTest, CryptoFrameworkMdAlgoTest006, TestSize.Level0) +HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest006, TestSize.Level0) { int32_t ret = 0; // create a API obj with SHA1 HcfMd *mdObj = nullptr; - ret = (int)HcfMdCreate("MD5", &mdObj); + ret = (int32_t)HcfMdCreate("MD5", &mdObj); EXPECT_EQ(ret, 0); // set input and output buf diff --git a/test/unittest/src/crypto_rand_test.cpp b/test/unittest/src/crypto_rand_test.cpp index 53cc0d2..e26b754 100644 --- a/test/unittest/src/crypto_rand_test.cpp +++ b/test/unittest/src/crypto_rand_test.cpp @@ -24,7 +24,7 @@ using namespace std; using namespace testing::ext; -class CryptoFrameworkRandTest : public testing::Test { +class CryptoRandTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -32,30 +32,30 @@ public: void TearDown(); }; -void CryptoFrameworkRandTest::SetUpTestCase() {} -void CryptoFrameworkRandTest::TearDownTestCase() {} +void CryptoRandTest::SetUpTestCase() {} +void CryptoRandTest::TearDownTestCase() {} -void CryptoFrameworkRandTest::SetUp() // add init here, this will be called before test. +void CryptoRandTest::SetUp() // add init here, this will be called before test. { } -void CryptoFrameworkRandTest::TearDown() // add destroy here, this will be called when test case done. +void CryptoRandTest::TearDown() // add destroy here, this will be called when test case done. { } -HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkRandCreateTest001, TestSize.Level0) +HWTEST_F(CryptoRandTest, CryptoFrameworkRandCreateTest001, TestSize.Level0) { int32_t ret = 0; - ret = (int)HcfRandCreate(nullptr); + ret = (int32_t)HcfRandCreate(nullptr); EXPECT_NE(ret, 0); } -HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkRandGenerateTest001, TestSize.Level0) +HWTEST_F(CryptoRandTest, CryptoFrameworkRandGenerateTest001, TestSize.Level0) { int32_t ret = 0; // create a rand obj HcfRand *randObj = nullptr; - ret = (int)HcfRandCreate(&randObj); + ret = (int32_t)HcfRandCreate(&randObj); EXPECT_EQ(ret, 0); // preset params int32_t randomLen = 0; @@ -68,12 +68,12 @@ HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkRandGenerateTest001, TestSize.L OH_HCF_ObjDestroy(randObj); } -HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkRandGenerateTest002, TestSize.Level0) +HWTEST_F(CryptoRandTest, CryptoFrameworkRandGenerateTest002, TestSize.Level0) { int32_t ret = 0; // create a rand obj HcfRand *randObj = nullptr; - ret = (int)HcfRandCreate(&randObj); + ret = (int32_t)HcfRandCreate(&randObj); EXPECT_EQ(ret, 0); // preset params int32_t randomLen = 32; @@ -88,16 +88,16 @@ HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkRandGenerateTest002, TestSize.L OH_HCF_ObjDestroy(randObj); } -HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkRandGenerateTest003, TestSize.Level0) +HWTEST_F(CryptoRandTest, CryptoFrameworkRandGenerateTest003, TestSize.Level0) { int32_t ret = 0; // create a rand obj HcfRand *randObj = nullptr; - ret = (int)HcfRandCreate(&randObj); + ret = (int32_t)HcfRandCreate(&randObj); EXPECT_EQ(ret, 0); // preset params - int32_t randomLen = 1000; - uint8_t randomBuf[1000] = {0}; + int32_t randomLen = 8192; + uint8_t randomBuf[8192] = {0}; // define randomBlob and seedBlob struct HcfBlob randomBlob = {.data = (uint8_t *)randomBuf, .len = 0}; // test generate random @@ -108,12 +108,31 @@ HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkRandGenerateTest003, TestSize.L OH_HCF_ObjDestroy(randObj); } -HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkSetSeedTest001, TestSize.Level0) +HWTEST_F(CryptoRandTest, CryptoFrameworkRandGenerateTest004, TestSize.Level0) { int32_t ret = 0; // create a rand obj HcfRand *randObj = nullptr; - ret = (int)HcfRandCreate(&randObj); + ret = (int32_t)HcfRandCreate(&randObj); + EXPECT_EQ(ret, 0); + // preset params + int32_t randomLen = 8193; + uint8_t randomBuf[8193] = {0}; + // define randomBlob and seedBlob + struct HcfBlob randomBlob = {.data = (uint8_t *)randomBuf, .len = 0}; + // test generate random + ret = randObj->generateRandom(randObj, randomLen, &randomBlob); + EXPECT_NE(ret, 0); + // destroy the API obj and blob data + OH_HCF_ObjDestroy(randObj); +} + +HWTEST_F(CryptoRandTest, CryptoFrameworkSetSeedTest001, TestSize.Level0) +{ + int32_t ret = 0; + // create a rand obj + HcfRand *randObj = nullptr; + ret = (int32_t)HcfRandCreate(&randObj); EXPECT_EQ(ret, 0); // define randomBlob and seedBlob struct HcfBlob *seedBlob = nullptr; @@ -124,12 +143,12 @@ HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkSetSeedTest001, TestSize.Level0 OH_HCF_ObjDestroy(randObj); } -HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkSetSeedTest002, TestSize.Level0) +HWTEST_F(CryptoRandTest, CryptoFrameworkSetSeedTest002, TestSize.Level0) { int32_t ret = 0; // create a rand obj HcfRand *randObj = nullptr; - ret = (int)HcfRandCreate(&randObj); + ret = (int32_t)HcfRandCreate(&randObj); EXPECT_EQ(ret, 0); // preset params int32_t seedLen = 32; @@ -147,12 +166,12 @@ HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkSetSeedTest002, TestSize.Level0 OH_HCF_ObjDestroy(randObj); } -HWTEST_F(CryptoFrameworkRandTest, CryptoFrameworkSetSeedTest003, TestSize.Level0) +HWTEST_F(CryptoRandTest, CryptoFrameworkSetSeedTest003, TestSize.Level0) { int32_t ret = 0; // create a rand obj HcfRand *randObj = nullptr; - ret = (int)HcfRandCreate(&randObj); + ret = (int32_t)HcfRandCreate(&randObj); EXPECT_EQ(ret, 0); // preset params int32_t seedLen = 1000; -- Gitee From d8aa7af0476708a0ec9e3b28f7358df6124827bf Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Mon, 19 Sep 2022 14:34:43 +0800 Subject: [PATCH 06/16] fix aes 3des codestyle problems Signed-off-by: wangyongzhong2 --- frameworks/crypto_operation/cipher.c | 2 +- frameworks/js/napi/inc/napi_cipher.h | 4 +- frameworks/js/napi/src/napi_cipher.cpp | 4 +- frameworks/js/napi/src/napi_key.cpp | 5 +- frameworks/js/napi/src/napi_sym_key.cpp | 1 - .../js/napi/src/napi_sym_key_generator.cpp | 4 +- frameworks/key/sym_key_generator.c | 2 +- .../crypto_operation/aes/inc/aes_openssl.h | 2 +- .../aes/src/cipher_3des_openssl.c | 2 +- .../aes/src/cipher_aes_openssl.c | 2 +- .../inc/sym_common_defines.h | 6 +- test/unittest/src/crypto_3des_cipher_test.cpp | 60 +++--- test/unittest/src/crypto_aes_cipher_test.cpp | 181 +++++++++--------- 13 files changed, 137 insertions(+), 138 deletions(-) diff --git a/frameworks/crypto_operation/cipher.c b/frameworks/crypto_operation/cipher.c index 50cd65e..8fa701b 100644 --- a/frameworks/crypto_operation/cipher.c +++ b/frameworks/crypto_operation/cipher.c @@ -131,7 +131,7 @@ static HcfResult OnSetParameter(const HcfParaConfig *config, void *cipher) return ret; } -static const char *GetCipherGeneratorClass() +static const char *GetCipherGeneratorClass(void) { return "OH_HCF_CipherGenerator"; } diff --git a/frameworks/js/napi/inc/napi_cipher.h b/frameworks/js/napi/inc/napi_cipher.h index 3c9952d..14e0773 100644 --- a/frameworks/js/napi/inc/napi_cipher.h +++ b/frameworks/js/napi/inc/napi_cipher.h @@ -25,7 +25,6 @@ namespace OHOS { namespace CryptoFramework { - class NapiCipher { public: NapiCipher(HcfCipher *cipher); @@ -45,7 +44,6 @@ public: private: HcfCipher *cipher_; }; - } // namespace CryptoFramework } // namespace OHOS -#endif +#endif \ No newline at end of file diff --git a/frameworks/js/napi/src/napi_cipher.cpp b/frameworks/js/napi/src/napi_cipher.cpp index 8608dd2..b3c8724 100644 --- a/frameworks/js/napi/src/napi_cipher.cpp +++ b/frameworks/js/napi/src/napi_cipher.cpp @@ -28,7 +28,6 @@ namespace OHOS { namespace CryptoFramework { - thread_local napi_ref NapiCipher::classRef_ = nullptr; struct CipherFwkCtxT { @@ -667,6 +666,5 @@ void NapiCipher::DefineCipherJSClass(napi_env env, napi_value exports) sizeof(classDesc) / sizeof(classDesc[0]), classDesc, &constructor); napi_create_reference(env, constructor, 1, &classRef_); } - } // CryptoFramework -} // OHOS +} // OHOS \ No newline at end of file diff --git a/frameworks/js/napi/src/napi_key.cpp b/frameworks/js/napi/src/napi_key.cpp index f4fdeec..aec899a 100644 --- a/frameworks/js/napi/src/napi_key.cpp +++ b/frameworks/js/napi/src/napi_key.cpp @@ -18,13 +18,11 @@ #include "securec.h" #include "log.h" #include "memory.h" - #include "napi_utils.h" #include "napi_crypto_framework_defines.h" namespace OHOS { namespace CryptoFramework { - thread_local napi_ref NapiKey::classRef_ = nullptr; NapiKey::NapiKey(HcfKey *hcfKey) @@ -120,6 +118,5 @@ void NapiKey::DefineHcfKeyJSClass(napi_env env) sizeof(classDesc) / sizeof(classDesc[0]), classDesc, &constructor); napi_create_reference(env, constructor, 1, &classRef_); } - } // CryptoFramework -} // OHOS +} // OHOS \ No newline at end of file diff --git a/frameworks/js/napi/src/napi_sym_key.cpp b/frameworks/js/napi/src/napi_sym_key.cpp index d3a137c..fa4efe3 100644 --- a/frameworks/js/napi/src/napi_sym_key.cpp +++ b/frameworks/js/napi/src/napi_sym_key.cpp @@ -18,7 +18,6 @@ #include "securec.h" #include "log.h" #include "memory.h" - #include "napi_utils.h" #include "napi_crypto_framework_defines.h" diff --git a/frameworks/js/napi/src/napi_sym_key_generator.cpp b/frameworks/js/napi/src/napi_sym_key_generator.cpp index 5355bd4..67047be 100644 --- a/frameworks/js/napi/src/napi_sym_key_generator.cpp +++ b/frameworks/js/napi/src/napi_sym_key_generator.cpp @@ -24,7 +24,6 @@ namespace OHOS { namespace CryptoFramework { - thread_local napi_ref NapiSymKeyGenerator::classRef_ = nullptr; struct SymKeyGeneratorFwkCtxT { @@ -456,6 +455,5 @@ void NapiSymKeyGenerator::DefineSymKeyGeneratorJSClass(napi_env env, napi_value nullptr, sizeof(classDesc) / sizeof(classDesc[0]), classDesc, &constructor); napi_create_reference(env, constructor, 1, &classRef_); } - } // CryptoFramework -} // OHOS +} // OHOS \ No newline at end of file diff --git a/frameworks/key/sym_key_generator.c b/frameworks/key/sym_key_generator.c index af8f316..b28aeb9 100644 --- a/frameworks/key/sym_key_generator.c +++ b/frameworks/key/sym_key_generator.c @@ -110,7 +110,7 @@ static HcfResult OnSetSymKeyParameter(const HcfParaConfig* config, void *attr) return ret; } -static const char *GetSymKeyGeneratorClass() +static const char *GetSymKeyGeneratorClass(void) { return "HcfSymKeyGenerator"; } diff --git a/plugin/openssl_plugin/crypto_operation/aes/inc/aes_openssl.h b/plugin/openssl_plugin/crypto_operation/aes/inc/aes_openssl.h index 157e38b..173a09b 100644 --- a/plugin/openssl_plugin/crypto_operation/aes/inc/aes_openssl.h +++ b/plugin/openssl_plugin/crypto_operation/aes/inc/aes_openssl.h @@ -16,9 +16,9 @@ #define HCF_AES_OPENSSL_H #include +#include #include "params_parser.h" #include "cipher_factory_spi.h" -#include typedef struct { EVP_CIPHER_CTX *ctx; diff --git a/plugin/openssl_plugin/crypto_operation/aes/src/cipher_3des_openssl.c b/plugin/openssl_plugin/crypto_operation/aes/src/cipher_3des_openssl.c index bdab451..c8fed98 100644 --- a/plugin/openssl_plugin/crypto_operation/aes/src/cipher_3des_openssl.c +++ b/plugin/openssl_plugin/crypto_operation/aes/src/cipher_3des_openssl.c @@ -33,7 +33,7 @@ typedef struct { CipherData *cipherData; } HcfCipherDesGeneratorSpiOpensslImpl; -static const char *GetDesGeneratorClass() +static const char *GetDesGeneratorClass(void) { return OPENSSL_3DES_CIPHER_CLASS; } diff --git a/plugin/openssl_plugin/crypto_operation/aes/src/cipher_aes_openssl.c b/plugin/openssl_plugin/crypto_operation/aes/src/cipher_aes_openssl.c index 99fd586..a9b2b8d 100644 --- a/plugin/openssl_plugin/crypto_operation/aes/src/cipher_aes_openssl.c +++ b/plugin/openssl_plugin/crypto_operation/aes/src/cipher_aes_openssl.c @@ -38,7 +38,7 @@ typedef struct { CipherData *cipherData; } HcfCipherAesGeneratorSpiOpensslImpl; -static const char *GetAesGeneratorClass() +static const char *GetAesGeneratorClass(void) { return OPENSSL_AES_CIPHER_CLASS; } diff --git a/plugin/openssl_plugin/key/sym_key_generator/inc/sym_common_defines.h b/plugin/openssl_plugin/key/sym_key_generator/inc/sym_common_defines.h index 7c1b8d9..71cd093 100644 --- a/plugin/openssl_plugin/key/sym_key_generator/inc/sym_common_defines.h +++ b/plugin/openssl_plugin/key/sym_key_generator/inc/sym_common_defines.h @@ -12,6 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +#ifndef HCF_SYM_COMMON_DEFINES_H +#define HCF_SYM_COMMON_DEFINES_H + #include "sym_key_factory_spi.h" #include "sym_key.h" #include "params_parser.h" @@ -36,4 +40,4 @@ HcfResult HcfSymKeyGeneratorSpiCreate(SymKeyAttr *attr, OH_HCF_SymKeyGeneratorSp #ifdef __cplusplus } #endif - +#endif \ No newline at end of file diff --git a/test/unittest/src/crypto_3des_cipher_test.cpp b/test/unittest/src/crypto_3des_cipher_test.cpp index 24a3415..b0de68d 100644 --- a/test/unittest/src/crypto_3des_cipher_test.cpp +++ b/test/unittest/src/crypto_3des_cipher_test.cpp @@ -28,7 +28,8 @@ using namespace std; using namespace testing::ext; -class DesEncryptTest : public testing::Test { +namespace { +class Crypto3DesCipherTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -36,14 +37,14 @@ public: void TearDown(); }; -void DesEncryptTest::SetUpTestCase() {} -void DesEncryptTest::TearDownTestCase() {} +void Crypto3DesCipherTest::SetUpTestCase() {} +void Crypto3DesCipherTest::TearDownTestCase() {} -void DesEncryptTest::SetUp() // add init here, this will be called before test. +void Crypto3DesCipherTest::SetUp() // add init here, this will be called before test. { } -void DesEncryptTest::TearDown() // add destroy here, this will be called when test case done. +void Crypto3DesCipherTest::TearDown() // add destroy here, this will be called when test case done. { } @@ -200,7 +201,7 @@ static int32_t DesNoUpdateDecrypt(HcfCipher *cipher, HcfSymKey *key, HcfParamsSp return ret; } -HWTEST_F(DesEncryptTest, DesEncryptTest001, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest001, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -247,7 +248,7 @@ clearup: EXPECT_NE(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest002, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest002, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -295,7 +296,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest003, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest003, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -343,7 +344,7 @@ clearup: } -HWTEST_F(DesEncryptTest, DesEncryptTest004, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest004, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -394,7 +395,7 @@ clearup: EXPECT_NE(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest005, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest005, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -444,7 +445,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest006, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest006, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -494,7 +495,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest007, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest007, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -546,7 +547,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest008, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest008, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -596,7 +597,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest009, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest009, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -648,7 +649,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest010, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest010, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -699,7 +700,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest011, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest011, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -750,7 +751,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest012, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest012, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -801,7 +802,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest013, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest013, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -848,7 +849,7 @@ clearup: EXPECT_NE(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest014, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest014, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -896,7 +897,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest015, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest015, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -944,7 +945,7 @@ clearup: } -HWTEST_F(DesEncryptTest, DesEncryptTest016, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest016, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -995,7 +996,7 @@ clearup: EXPECT_NE(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest017, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest017, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -1046,7 +1047,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest018, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest018, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -1097,7 +1098,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest019, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest019, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -1149,7 +1150,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest020, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest020, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -1200,7 +1201,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest021, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest021, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -1252,7 +1253,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest022, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest022, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -1303,7 +1304,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest023, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest023, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -1354,7 +1355,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(DesEncryptTest, DesEncryptTest024, TestSize.Level0) +HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest024, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -1404,3 +1405,4 @@ clearup: OH_HCF_ObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } +} \ No newline at end of file diff --git a/test/unittest/src/crypto_aes_cipher_test.cpp b/test/unittest/src/crypto_aes_cipher_test.cpp index f858dbc..aff585a 100644 --- a/test/unittest/src/crypto_aes_cipher_test.cpp +++ b/test/unittest/src/crypto_aes_cipher_test.cpp @@ -14,9 +14,9 @@ */ #include -#include "securec.h" #include #include +#include "securec.h" #include "sym_key_generator.h" #include "cipher.h" @@ -29,11 +29,13 @@ using namespace std; using namespace testing::ext; + +namespace { const int32_t FILE_BLOCK_SIZE = 1024; const int32_t RAND_MAX_NUM = 100; const bool IS_DEBUG = false; -class AesEncryptTest : public testing::Test { +class CryptoAesCipherTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -41,15 +43,15 @@ public: void TearDown(); }; -void AesEncryptTest::SetUpTestCase() {} +void CryptoAesCipherTest::SetUpTestCase() {} -void AesEncryptTest::TearDownTestCase() {} +void CryptoAesCipherTest::TearDownTestCase() {} -void AesEncryptTest::SetUp() // add init here, this will be called before test. +void CryptoAesCipherTest::SetUp() // add init here, this will be called before test. { } -void AesEncryptTest::TearDown() // add destroy here, this will be called when test case done. +void CryptoAesCipherTest::TearDown() // add destroy here, this will be called when test case done. { } @@ -430,12 +432,12 @@ static int32_t AesNoUpdateDecrypt(HcfCipher *cipher, HcfSymKey *key, HcfParamsSp } /** - * @tc.name: AesEncryptTest.AesEncryptTest001 + * @tc.name: CryptoAesCipherTest.CryptoAesCipherTest001 * @tc.desc: Verify whether the crypto framework is normal. * @tc.type: FUNC * @tc.require: I5QWEO */ -HWTEST_F(AesEncryptTest, AesEncryptTest001, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest001, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -482,12 +484,12 @@ clearup: } /** - * @tc.name: AesEncryptTest.AesEncryptTest002 + * @tc.name: CryptoAesCipherTest.CryptoAesCipherTest002 * @tc.desc: Verify AES128 cipher algorithm. * @tc.type: FUNC * @tc.require: I5QWEG */ -HWTEST_F(AesEncryptTest, AesEncryptTest002, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest002, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -532,7 +534,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest003, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest003, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -578,7 +580,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest004, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest004, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -629,7 +631,7 @@ clearup: EXPECT_NE(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest005, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest005, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -680,7 +682,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest006, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest006, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -731,7 +733,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest007, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest007, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -782,7 +784,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest008, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest008, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -833,7 +835,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest009, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest009, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -884,7 +886,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest010, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest010, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -935,7 +937,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest011, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest011, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -986,7 +988,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest012, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest012, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -1036,7 +1038,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest013, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest013, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -1087,7 +1089,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest014, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest014, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -1138,7 +1140,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest015, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest015, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -1190,7 +1192,7 @@ clearup: } -HWTEST_F(AesEncryptTest, AesEncryptTest016, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest016, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -1241,7 +1243,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest017, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest017, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -1292,7 +1294,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest018, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest018, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -1317,7 +1319,7 @@ HWTEST_F(AesEncryptTest, AesEncryptTest018, TestSize.Level0) LOGE("generateSymKey failed!"); } - ret = HcfCipherCreate("AES128|CFB1|PKCS7", &cipher);// CFB1/CFB8/CFB128 bit + ret = HcfCipherCreate("AES128|CFB1|PKCS7", &cipher); // CFB1/CFB8/CFB128 bit if (ret != 0) { LOGE("HcfCipherCreate failed!"); goto clearup; @@ -1342,7 +1344,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest019, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest019, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -1367,7 +1369,7 @@ HWTEST_F(AesEncryptTest, AesEncryptTest019, TestSize.Level0) LOGE("generateSymKey failed!"); } - ret = HcfCipherCreate("AES128|CFB8|NoPadding", &cipher);// CFB1/CFB8/CFB128 bit + ret = HcfCipherCreate("AES128|CFB8|NoPadding", &cipher); // CFB1/CFB8/CFB128 bit if (ret != 0) { LOGE("HcfCipherCreate failed!"); goto clearup; @@ -1392,7 +1394,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest020, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest020, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -1417,7 +1419,7 @@ HWTEST_F(AesEncryptTest, AesEncryptTest020, TestSize.Level0) LOGE("generateSymKey failed!"); } - ret = HcfCipherCreate("AES128|CFB8|PKCS5", &cipher);// CFB1/CFB8/CFB128 bit + ret = HcfCipherCreate("AES128|CFB8|PKCS5", &cipher); // CFB1/CFB8/CFB128 bit if (ret != 0) { LOGE("HcfCipherCreate failed!"); goto clearup; @@ -1442,7 +1444,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest021, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest021, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -1467,7 +1469,7 @@ HWTEST_F(AesEncryptTest, AesEncryptTest021, TestSize.Level0) LOGE("generateSymKey failed!"); } - ret = HcfCipherCreate("AES128|CFB8|PKCS7", &cipher);// CFB1/CFB8/CFB128 bit + ret = HcfCipherCreate("AES128|CFB8|PKCS7", &cipher); // CFB1/CFB8/CFB128 bit if (ret != 0) { LOGE("HcfCipherCreate failed!"); goto clearup; @@ -1492,7 +1494,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest022, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest022, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -1517,7 +1519,7 @@ HWTEST_F(AesEncryptTest, AesEncryptTest022, TestSize.Level0) LOGE("generateSymKey failed!"); } - ret = HcfCipherCreate("AES128|CFB128|NoPadding", &cipher);// CFB1/CFB8/CFB128 bit + ret = HcfCipherCreate("AES128|CFB128|NoPadding", &cipher); // CFB1/CFB8/CFB128 bit if (ret != 0) { LOGE("HcfCipherCreate failed!"); goto clearup; @@ -1542,7 +1544,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest023, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest023, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -1567,7 +1569,7 @@ HWTEST_F(AesEncryptTest, AesEncryptTest023, TestSize.Level0) LOGE("generateSymKey failed!"); } - ret = HcfCipherCreate("AES128|CFB128|PKCS5", &cipher);// CFB1/CFB8/CFB128 bit + ret = HcfCipherCreate("AES128|CFB128|PKCS5", &cipher); // CFB1/CFB8/CFB128 bit if (ret != 0) { LOGE("HcfCipherCreate failed!"); goto clearup; @@ -1592,7 +1594,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest024, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest024, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -1617,7 +1619,7 @@ HWTEST_F(AesEncryptTest, AesEncryptTest024, TestSize.Level0) LOGE("generateSymKey failed!"); } - ret = HcfCipherCreate("AES128|CFB128|PKCS7", &cipher);// CFB1/CFB8/CFB128 bit + ret = HcfCipherCreate("AES128|CFB128|PKCS7", &cipher); // CFB1/CFB8/CFB128 bit if (ret != 0) { LOGE("HcfCipherCreate failed!"); goto clearup; @@ -1642,7 +1644,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest025, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest025, TestSize.Level0) { int ret = 0; uint8_t aad[8] = {0}; @@ -1696,7 +1698,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest026, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest026, TestSize.Level0) { int ret = 0; uint8_t aad[8] = {0}; @@ -1750,7 +1752,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest027, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest027, TestSize.Level0) { int ret = 0; uint8_t aad[8] = {0}; @@ -1804,7 +1806,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest028, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest028, TestSize.Level0) { int ret = 0; uint8_t aad[8] = {0}; @@ -1857,7 +1859,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest029, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest029, TestSize.Level0) { int ret = 0; uint8_t aad[8] = {0}; @@ -1911,7 +1913,7 @@ clearup: } -HWTEST_F(AesEncryptTest, AesEncryptTest030, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest030, TestSize.Level0) { int ret = 0; uint8_t aad[8] = {0}; @@ -1964,7 +1966,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest031, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest031, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -2013,7 +2015,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest032, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest032, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -2059,7 +2061,7 @@ clearup: EXPECT_NE(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest033, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest033, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -2104,7 +2106,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest034, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest034, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -2150,7 +2152,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest035, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest035, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2201,7 +2203,7 @@ clearup: EXPECT_NE(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest036, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest036, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2252,7 +2254,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest037, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest037, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2303,7 +2305,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest038, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest038, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2354,7 +2356,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest039, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest039, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2405,7 +2407,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest040, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest040, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2456,7 +2458,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest041, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest041, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2507,7 +2509,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest042, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest042, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2558,7 +2560,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest043, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest043, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2608,7 +2610,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest044, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest044, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2659,7 +2661,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest045, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest045, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2710,7 +2712,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest046, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest046, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2762,7 +2764,7 @@ clearup: } -HWTEST_F(AesEncryptTest, AesEncryptTest047, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest047, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2813,7 +2815,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest048, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest048, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2864,7 +2866,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest049, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest049, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2889,7 +2891,7 @@ HWTEST_F(AesEncryptTest, AesEncryptTest049, TestSize.Level0) LOGE("generateSymKey failed!"); } - ret = HcfCipherCreate("AES128|CFB1|PKCS7", &cipher);// CFB1/CFB8/CFB128 bit + ret = HcfCipherCreate("AES128|CFB1|PKCS7", &cipher); // CFB1/CFB8/CFB128 bit if (ret != 0) { LOGE("HcfCipherCreate failed!"); goto clearup; @@ -2914,7 +2916,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest050, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest050, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2939,7 +2941,7 @@ HWTEST_F(AesEncryptTest, AesEncryptTest050, TestSize.Level0) LOGE("generateSymKey failed!"); } - ret = HcfCipherCreate("AES128|CFB8|NoPadding", &cipher);// CFB1/CFB8/CFB128 bit + ret = HcfCipherCreate("AES128|CFB8|NoPadding", &cipher); // CFB1/CFB8/CFB128 bit if (ret != 0) { LOGE("HcfCipherCreate failed!"); goto clearup; @@ -2964,7 +2966,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest051, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest051, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -2989,7 +2991,7 @@ HWTEST_F(AesEncryptTest, AesEncryptTest051, TestSize.Level0) LOGE("generateSymKey failed!"); } - ret = HcfCipherCreate("AES128|CFB8|PKCS5", &cipher);// CFB1/CFB8/CFB128 bit + ret = HcfCipherCreate("AES128|CFB8|PKCS5", &cipher); // CFB1/CFB8/CFB128 bit if (ret != 0) { LOGE("HcfCipherCreate failed!"); goto clearup; @@ -3014,7 +3016,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest052, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest052, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -3039,7 +3041,7 @@ HWTEST_F(AesEncryptTest, AesEncryptTest052, TestSize.Level0) LOGE("generateSymKey failed!"); } - ret = HcfCipherCreate("AES128|CFB8|PKCS7", &cipher);// CFB1/CFB8/CFB128 bit + ret = HcfCipherCreate("AES128|CFB8|PKCS7", &cipher); // CFB1/CFB8/CFB128 bit if (ret != 0) { LOGE("HcfCipherCreate failed!"); goto clearup; @@ -3063,7 +3065,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest053, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest053, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -3088,7 +3090,7 @@ HWTEST_F(AesEncryptTest, AesEncryptTest053, TestSize.Level0) LOGE("generateSymKey failed!"); } - ret = HcfCipherCreate("AES128|CFB128|NoPadding", &cipher);// CFB1/CFB8/CFB128 bit + ret = HcfCipherCreate("AES128|CFB128|NoPadding", &cipher); // CFB1/CFB8/CFB128 bit if (ret != 0) { LOGE("HcfCipherCreate failed!"); goto clearup; @@ -3112,7 +3114,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest054, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest054, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -3137,7 +3139,7 @@ HWTEST_F(AesEncryptTest, AesEncryptTest054, TestSize.Level0) LOGE("generateSymKey failed!"); } - ret = HcfCipherCreate("AES128|CFB128|PKCS5", &cipher);// CFB1/CFB8/CFB128 bit + ret = HcfCipherCreate("AES128|CFB128|PKCS5", &cipher); // CFB1/CFB8/CFB128 bit if (ret != 0) { LOGE("HcfCipherCreate failed!"); goto clearup; @@ -3161,7 +3163,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest055, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest055, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -3186,7 +3188,7 @@ HWTEST_F(AesEncryptTest, AesEncryptTest055, TestSize.Level0) LOGE("generateSymKey failed!"); } - ret = HcfCipherCreate("AES128|CFB128|PKCS7", &cipher);// CFB1/CFB8/CFB128 bit + ret = HcfCipherCreate("AES128|CFB128|PKCS7", &cipher); // CFB1/CFB8/CFB128 bit if (ret != 0) { LOGE("HcfCipherCreate failed!"); goto clearup; @@ -3210,7 +3212,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest056, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest056, TestSize.Level0) { int ret = 0; uint8_t aad[8] = {0}; @@ -3264,7 +3266,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest057, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest057, TestSize.Level0) { int ret = 0; uint8_t aad[8] = {0}; @@ -3318,7 +3320,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest058, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest058, TestSize.Level0) { int ret = 0; uint8_t aad[8] = {0}; @@ -3372,7 +3374,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest059, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest059, TestSize.Level0) { int ret = 0; uint8_t aad[8] = {0}; @@ -3425,7 +3427,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest060, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest060, TestSize.Level0) { int ret = 0; uint8_t aad[8] = {0}; @@ -3479,7 +3481,7 @@ clearup: } -HWTEST_F(AesEncryptTest, AesEncryptTest061, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest061, TestSize.Level0) { int ret = 0; uint8_t aad[8] = {0}; @@ -3532,7 +3534,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest062, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest062, TestSize.Level0) { int ret = 0; uint8_t cipherText[128] = {0}; @@ -3581,7 +3583,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest063, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest063, TestSize.Level0) { int ret = 0; HcfCipher *cipher = NULL; @@ -3627,7 +3629,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest064, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest064, TestSize.Level0) { int ret = 0; HcfIvParamsSpec ivSpec = {}; @@ -3679,7 +3681,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest065, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest065, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -3730,7 +3732,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest066, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest066, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -3781,7 +3783,7 @@ clearup: EXPECT_EQ(ret, 0); } -HWTEST_F(AesEncryptTest, AesEncryptTest067, TestSize.Level0) +HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest067, TestSize.Level0) { int ret = 0; uint8_t iv[16] = {0}; @@ -3831,3 +3833,4 @@ clearup: OH_HCF_ObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } +} \ No newline at end of file -- Gitee From 779e2001789952b1978a4d517922b0a4e3eff312 Mon Sep 17 00:00:00 2001 From: quyawei Date: Mon, 19 Sep 2022 11:17:49 +0800 Subject: [PATCH 07/16] code check fix Signed-off-by: quyawei --- frameworks/js/napi/inc/napi_mac.h | 2 - frameworks/js/napi/inc/napi_md.h | 2 - frameworks/js/napi/inc/napi_rand.h | 2 - frameworks/js/napi/src/napi_mac.cpp | 2 - frameworks/js/napi/src/napi_md.cpp | 2 - frameworks/js/napi/src/napi_rand.cpp | 2 - .../crypto_operation/hmac/inc/mac_openssl.h | 3 ++ .../crypto_operation/md/inc/md_openssl.h | 3 ++ plugin/openssl_plugin/rand/inc/rand_openssl.h | 3 ++ test/unittest/src/crypto_mac_test.cpp | 54 ++++++++++--------- test/unittest/src/crypto_md_test.cpp | 2 + test/unittest/src/crypto_rand_test.cpp | 2 + 12 files changed, 41 insertions(+), 38 deletions(-) diff --git a/frameworks/js/napi/inc/napi_mac.h b/frameworks/js/napi/inc/napi_mac.h index 10fe060..0af1c42 100644 --- a/frameworks/js/napi/inc/napi_mac.h +++ b/frameworks/js/napi/inc/napi_mac.h @@ -26,7 +26,6 @@ namespace OHOS { namespace CryptoFramework { - class NapiMac { public: NapiMac(HcfMac *macObj); @@ -50,7 +49,6 @@ public: private: HcfMac *macObj_ = nullptr; }; - } // namespace CryptoFramework } // namespace OHOS diff --git a/frameworks/js/napi/inc/napi_md.h b/frameworks/js/napi/inc/napi_md.h index caec507..158eec3 100644 --- a/frameworks/js/napi/inc/napi_md.h +++ b/frameworks/js/napi/inc/napi_md.h @@ -26,7 +26,6 @@ namespace OHOS { namespace CryptoFramework { - class NapiMd { public: NapiMd(HcfMd *mdObj); @@ -49,7 +48,6 @@ public: private: HcfMd *mdObj_ = nullptr; }; - } // namespace CryptoFramework } // namespace OHOS diff --git a/frameworks/js/napi/inc/napi_rand.h b/frameworks/js/napi/inc/napi_rand.h index 2a0bdfe..a4b2ebf 100644 --- a/frameworks/js/napi/inc/napi_rand.h +++ b/frameworks/js/napi/inc/napi_rand.h @@ -26,7 +26,6 @@ namespace OHOS { namespace CryptoFramework { - class NapiRand { public: NapiRand(HcfRand *randObj); @@ -48,7 +47,6 @@ public: private: HcfRand *randObj_ = nullptr; }; - } // namespace CryptoFramework } // namespace OHOS #endif diff --git a/frameworks/js/napi/src/napi_mac.cpp b/frameworks/js/napi/src/napi_mac.cpp index 0a252e6..6c07e6e 100644 --- a/frameworks/js/napi/src/napi_mac.cpp +++ b/frameworks/js/napi/src/napi_mac.cpp @@ -25,7 +25,6 @@ namespace OHOS { namespace CryptoFramework { - napi_ref NapiMac::classRef_ = nullptr; struct MacCtx { @@ -478,6 +477,5 @@ void NapiMac::DefineMacJSClass(napi_env env, napi_value exports) sizeof(classDesc) / sizeof(classDesc[0]), classDesc, &constructor); napi_create_reference(env, constructor, 1, &classRef_); } - } // CryptoFramework } // OHOS \ No newline at end of file diff --git a/frameworks/js/napi/src/napi_md.cpp b/frameworks/js/napi/src/napi_md.cpp index c2e1946..da10747 100644 --- a/frameworks/js/napi/src/napi_md.cpp +++ b/frameworks/js/napi/src/napi_md.cpp @@ -24,7 +24,6 @@ namespace OHOS { namespace CryptoFramework { - napi_ref NapiMd::classRef_ = nullptr; struct MdCtx { @@ -384,6 +383,5 @@ void NapiMd::DefineMdJSClass(napi_env env, napi_value exports) sizeof(classDesc) / sizeof(classDesc[0]), classDesc, &constructor); napi_create_reference(env, constructor, 1, &classRef_); } - } // CryptoFramework } // OHOS \ No newline at end of file diff --git a/frameworks/js/napi/src/napi_rand.cpp b/frameworks/js/napi/src/napi_rand.cpp index 9fd2d73..3b515c1 100644 --- a/frameworks/js/napi/src/napi_rand.cpp +++ b/frameworks/js/napi/src/napi_rand.cpp @@ -24,7 +24,6 @@ namespace OHOS { namespace CryptoFramework { - napi_ref NapiRand::classRef_ = nullptr; struct RandCtx { @@ -361,6 +360,5 @@ void NapiRand::DefineRandJSClass(napi_env env, napi_value exports) sizeof(classDesc) / sizeof(classDesc[0]), classDesc, &constructor); napi_create_reference(env, constructor, 1, &classRef_); } - } // CryptoFramework } // OHOS diff --git a/plugin/openssl_plugin/crypto_operation/hmac/inc/mac_openssl.h b/plugin/openssl_plugin/crypto_operation/hmac/inc/mac_openssl.h index 98f15eb..c70c390 100644 --- a/plugin/openssl_plugin/crypto_operation/hmac/inc/mac_openssl.h +++ b/plugin/openssl_plugin/crypto_operation/hmac/inc/mac_openssl.h @@ -12,6 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#ifndef HCF_HMAC_OPENSSL_H +#define HCF_HMAC_OPENSSL_H #include "mac_spi.h" @@ -24,3 +26,4 @@ HcfResult OpensslMacSpiCreate(const char *opensslAlgoName, HcfMacSpi **spiObj); #ifdef __cplusplus } #endif +#endif \ No newline at end of file diff --git a/plugin/openssl_plugin/crypto_operation/md/inc/md_openssl.h b/plugin/openssl_plugin/crypto_operation/md/inc/md_openssl.h index 705e9a7..4a62432 100644 --- a/plugin/openssl_plugin/crypto_operation/md/inc/md_openssl.h +++ b/plugin/openssl_plugin/crypto_operation/md/inc/md_openssl.h @@ -12,6 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#ifndef HCF_MD_OPENSSL_H +#define HCF_MD_OPENSSL_H #include "md_spi.h" @@ -24,3 +26,4 @@ HcfResult OpensslMdSpiCreate(const char *opensslAlgoName, HcfMdSpi **spiObj); #ifdef __cplusplus } #endif +#endif \ No newline at end of file diff --git a/plugin/openssl_plugin/rand/inc/rand_openssl.h b/plugin/openssl_plugin/rand/inc/rand_openssl.h index 83a1e22..29a7358 100644 --- a/plugin/openssl_plugin/rand/inc/rand_openssl.h +++ b/plugin/openssl_plugin/rand/inc/rand_openssl.h @@ -12,6 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#ifndef HCF_MD_OPENSSL_H +#define HCF_MD_OPENSSL_H #include "rand_spi.h" @@ -24,3 +26,4 @@ HcfResult HcfRandSpiCreate(HcfRandSpi **spiObj); #ifdef __cplusplus } #endif +#endif \ No newline at end of file diff --git a/test/unittest/src/crypto_mac_test.cpp b/test/unittest/src/crypto_mac_test.cpp index 9ee1707..8532e55 100644 --- a/test/unittest/src/crypto_mac_test.cpp +++ b/test/unittest/src/crypto_mac_test.cpp @@ -26,7 +26,8 @@ using namespace std; using namespace testing::ext; -class CryptoHmacTest : public testing::Test { +namespace { +class CryptoMacTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -49,14 +50,14 @@ static char g_testBigData[] = "VqRH5dzdeeturr5zN5vE77DtqjV7kNKbDJqk4mNqyYRTXymhj "2mnJ5xfnY3z63PFk6TXU9Ga2YmHvtycXxwqMBEctQRa3zVWGVSrh3NF6jXa\r\n"; constexpr uint32_t MAX_MAC_BLOB_LEN = 5000; -void CryptoHmacTest::SetUpTestCase() {} -void CryptoHmacTest::TearDownTestCase() {} +void CryptoMacTest::SetUpTestCase() {} +void CryptoMacTest::TearDownTestCase() {} -void CryptoHmacTest::SetUp() // add init here, this will be called before test. +void CryptoMacTest::SetUp() // add init here, this will be called before test. { } -void CryptoHmacTest::TearDown() // add destroy here, this will be called when test case done. +void CryptoMacTest::TearDown() // add destroy here, this will be called when test case done. { } @@ -68,14 +69,14 @@ static void PrintfBlobInHex(uint8_t *data, size_t dataLen) printf("\n"); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacCreateTest002, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacCreateTest002, TestSize.Level0) { int32_t ret = 0; ret = (int32_t)HcfMacCreate("SHA1", nullptr); EXPECT_NE(ret, 0); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoSuppTest001, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoSuppTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA obj @@ -86,7 +87,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoSuppTest001, TestSize.Level0) OH_HCF_ObjDestroy(macObj); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoSuppTest002, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoSuppTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA obj @@ -96,7 +97,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoSuppTest002, TestSize.Level0) EXPECT_EQ(macObj, nullptr); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoSuppTest003, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoSuppTest003, TestSize.Level0) { int32_t ret = 0; // create a SHA obj @@ -106,7 +107,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoSuppTest003, TestSize.Level0) EXPECT_EQ(macObj, nullptr); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoNameTest001, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoNameTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA obj @@ -121,7 +122,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoNameTest001, TestSize.Level0) OH_HCF_ObjDestroy(macObj); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacInitTest001, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacInitTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA obj @@ -136,7 +137,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacInitTest001, TestSize.Level0) OH_HCF_ObjDestroy(macObj); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacInitTest002, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacInitTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA obj @@ -161,7 +162,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacInitTest002, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacUpdateTest001, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacUpdateTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj @@ -179,7 +180,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacUpdateTest001, TestSize.Level0) OH_HCF_ObjDestroy(macObj); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacUpdateTest002, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacUpdateTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj @@ -208,7 +209,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacUpdateTest002, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacUpdateTest003, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacUpdateTest003, TestSize.Level0) { int32_t ret = 0; // create a API obj with SHA1 @@ -240,7 +241,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacUpdateTest003, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacDoFinalTest001, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacDoFinalTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj @@ -257,7 +258,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacDoFinalTest001, TestSize.Level0) OH_HCF_ObjDestroy(macObj); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacDoFinalTest002, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacDoFinalTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj @@ -300,7 +301,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacDoFinalTest002, TestSize.Level0) printf("test finish"); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacDoFinalTest003, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacDoFinalTest003, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj @@ -338,7 +339,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacDoFinalTest003, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacDoFinalTest004, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacDoFinalTest004, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj @@ -375,7 +376,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacDoFinalTest004, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacLenTest001, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacLenTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj @@ -388,7 +389,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacLenTest001, TestSize.Level0) OH_HCF_ObjDestroy(macObj); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacLenTest002, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacLenTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj @@ -415,7 +416,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacLenTest002, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest001, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest001, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj @@ -454,7 +455,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest001, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest002, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest002, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj @@ -493,7 +494,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest002, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest003, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest003, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj @@ -532,7 +533,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest003, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest004, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest004, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj @@ -571,7 +572,7 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest004, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest005, TestSize.Level0) +HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest005, TestSize.Level0) { int32_t ret = 0; // create a SHA1 obj @@ -608,4 +609,5 @@ HWTEST_F(CryptoHmacTest, CryptoFrameworkHmacAlgoTest005, TestSize.Level0) OH_HCF_ObjDestroy(macObj); OH_HCF_ObjDestroy(key); OH_HCF_ObjDestroy(generator); +} } \ No newline at end of file diff --git a/test/unittest/src/crypto_md_test.cpp b/test/unittest/src/crypto_md_test.cpp index 944c200..ee2da93 100644 --- a/test/unittest/src/crypto_md_test.cpp +++ b/test/unittest/src/crypto_md_test.cpp @@ -24,6 +24,7 @@ using namespace std; using namespace testing::ext; +namespace { class CryptoMdTest : public testing::Test { public: static void SetUpTestCase(); @@ -403,4 +404,5 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest006, TestSize.Level0) // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); OH_HCF_ObjDestroy(mdObj); +} } \ No newline at end of file diff --git a/test/unittest/src/crypto_rand_test.cpp b/test/unittest/src/crypto_rand_test.cpp index e26b754..a31f6e9 100644 --- a/test/unittest/src/crypto_rand_test.cpp +++ b/test/unittest/src/crypto_rand_test.cpp @@ -24,6 +24,7 @@ using namespace std; using namespace testing::ext; +namespace { class CryptoRandTest : public testing::Test { public: static void SetUpTestCase(); @@ -187,4 +188,5 @@ HWTEST_F(CryptoRandTest, CryptoFrameworkSetSeedTest003, TestSize.Level0) // destroy the API obj and blob data HcfBlobDataClearAndFree(&seedBlob); OH_HCF_ObjDestroy(randObj); +} } \ No newline at end of file -- Gitee From abe20f6e3b6c00ee152aa005ce8be75e4a0e912d Mon Sep 17 00:00:00 2001 From: fuzikun Date: Fri, 16 Sep 2022 17:22:29 +0800 Subject: [PATCH 08/16] fix codestyle problem Signed-off-by: fuzikun --- common/inc/log.h | 1 - frameworks/js/napi/inc/napi_utils.h | 2 - .../js/napi/src/napi_asy_key_generator.cpp | 2 - frameworks/js/napi/src/napi_init.cpp | 2 - frameworks/js/napi/src/napi_key_agreement.cpp | 1 - frameworks/js/napi/src/napi_key_pair.cpp | 3 - frameworks/js/napi/src/napi_pri_key.cpp | 9 +- frameworks/js/napi/src/napi_pub_key.cpp | 9 +- frameworks/js/napi/src/napi_sign.cpp | 1 - frameworks/js/napi/src/napi_sym_key.cpp | 2 - frameworks/js/napi/src/napi_utils.cpp | 6 +- frameworks/js/napi/src/napi_verify.cpp | 1 - frameworks/key/asy_key_generator.c | 2 +- .../src/x509_cert_chain_validator_openssl.c | 3 +- .../src/x509_certificate_openssl.c | 1 - .../common/inc/plugin_defines.h | 16 - .../common/inc/rsa_openssl_common.h | 7 +- .../common/src/rsa_openssl_common.c | 2 +- .../rsa/inc/cipher_rsa_openssl.h | 7 +- .../signature/inc/signature_rsa_openssl.h | 4 + .../src/crypto_ecc_asy_key_generator_test.cpp | 244 +++++++------- .../src/crypto_ecc_key_agreement_test.cpp | 90 +++--- test/unittest/src/crypto_ecc_sign_test.cpp | 306 +++++++++--------- test/unittest/src/crypto_ecc_verify_test.cpp | 302 ++++++++--------- 24 files changed, 502 insertions(+), 521 deletions(-) delete mode 100644 plugin/openssl_plugin/common/inc/plugin_defines.h diff --git a/common/inc/log.h b/common/inc/log.h index 80405eb..084cd9f 100644 --- a/common/inc/log.h +++ b/common/inc/log.h @@ -50,7 +50,6 @@ void HcfLogPrint(HcfLogLevel level, const char *funName, const char *fmt, ...); #else #include -#include #define LOGD(fmt, ...) printf("[HCF][D][%s]: " fmt "\n", __FUNCTION__, ##__VA_ARGS__) #define LOGI(fmt, ...) printf("[HCF][I][%s]: " fmt "\n", __FUNCTION__, ##__VA_ARGS__) diff --git a/frameworks/js/napi/inc/napi_utils.h b/frameworks/js/napi/inc/napi_utils.h index 16abc51..2790b7b 100644 --- a/frameworks/js/napi/inc/napi_utils.h +++ b/frameworks/js/napi/inc/napi_utils.h @@ -27,7 +27,6 @@ namespace OHOS { namespace CryptoFramework { - #define PARAMS_NUM_ONE 1 #define PARAMS_NUM_TWO 2 #define PARAMS_NUM_THREE 3 @@ -63,7 +62,6 @@ napi_value NapiGetNull(napi_env env); napi_value ConvertArrayToNapiValue(napi_env env, HcfArray *array); napi_value ConvertEncodingBlobToNapiValue(napi_env env, HcfEncodingBlob *encodingBlob); napi_value GenerateBusinessError(napi_env env, int32_t errCode, const char *errMsg); - } // namespace CryptoFramework } // namespace OHOS #endif diff --git a/frameworks/js/napi/src/napi_asy_key_generator.cpp b/frameworks/js/napi/src/napi_asy_key_generator.cpp index 32b246b..62b5e57 100644 --- a/frameworks/js/napi/src/napi_asy_key_generator.cpp +++ b/frameworks/js/napi/src/napi_asy_key_generator.cpp @@ -27,7 +27,6 @@ namespace OHOS { namespace CryptoFramework { - struct GenKeyPairCtx { napi_env env = nullptr; @@ -530,6 +529,5 @@ void NapiAsyKeyGenerator::DefineAsyKeyGeneratorJSClass(napi_env env, napi_value nullptr, sizeof(classDesc) / sizeof(classDesc[0]), classDesc, &constructor); napi_create_reference(env, constructor, 1, &classRef_); } - } // CryptoFramework } // OHOS diff --git a/frameworks/js/napi/src/napi_init.cpp b/frameworks/js/napi/src/napi_init.cpp index 09836fc..dd31ca1 100644 --- a/frameworks/js/napi/src/napi_init.cpp +++ b/frameworks/js/napi/src/napi_init.cpp @@ -15,7 +15,6 @@ #include "securec.h" #include "log.h" -#include "math.h" #include "memory.h" #include "napi_x509_certificate.h" @@ -156,6 +155,5 @@ extern "C" __attribute__((constructor)) void RegisterModule(void) { napi_module_register(&cryptoFrameworkModule); } - } // namespace CryptoFramework } // namespace OHOS diff --git a/frameworks/js/napi/src/napi_key_agreement.cpp b/frameworks/js/napi/src/napi_key_agreement.cpp index 754e5d7..a61aa35 100644 --- a/frameworks/js/napi/src/napi_key_agreement.cpp +++ b/frameworks/js/napi/src/napi_key_agreement.cpp @@ -26,7 +26,6 @@ namespace OHOS { namespace CryptoFramework { - struct KeyAgreementCtx { napi_env env = nullptr; diff --git a/frameworks/js/napi/src/napi_key_pair.cpp b/frameworks/js/napi/src/napi_key_pair.cpp index 08343f1..a35c047 100644 --- a/frameworks/js/napi/src/napi_key_pair.cpp +++ b/frameworks/js/napi/src/napi_key_pair.cpp @@ -17,7 +17,6 @@ #include "securec.h" #include "log.h" -#include "memory.h" #include "napi_crypto_framework_defines.h" #include "napi_pri_key.h" #include "napi_pub_key.h" @@ -26,7 +25,6 @@ namespace OHOS { namespace CryptoFramework { - thread_local napi_ref NapiKeyPair::classRef_ = nullptr; NapiKeyPair::NapiKeyPair(HcfKeyPair *keyPair) @@ -95,6 +93,5 @@ void NapiKeyPair::DefineKeyPairJSClass(napi_env env) sizeof(classDesc) / sizeof(classDesc[0]), classDesc, &constructor); napi_create_reference(env, constructor, 1, &classRef_); } - } // CryptoFramework } // OHOS diff --git a/frameworks/js/napi/src/napi_pri_key.cpp b/frameworks/js/napi/src/napi_pri_key.cpp index 0d2e127..8d13c7e 100644 --- a/frameworks/js/napi/src/napi_pri_key.cpp +++ b/frameworks/js/napi/src/napi_pri_key.cpp @@ -15,16 +15,14 @@ #include "napi_pri_key.h" -#include "securec.h" #include "log.h" #include "memory.h" - #include "napi_crypto_framework_defines.h" #include "napi_utils.h" +#include "securec.h" namespace OHOS { namespace CryptoFramework { - thread_local napi_ref NapiPriKey::classRef_ = nullptr; NapiPriKey::NapiPriKey(HcfPriKey *priKey) @@ -90,7 +88,9 @@ napi_value NapiPriKey::JsGetEncoded(napi_env env, napi_callback_info info) return nullptr; } - return ConvertBlobToNapiValue(env, &returnBlob); + napi_value instance = ConvertBlobToNapiValue(env, &returnBlob); + HcfFree(returnBlob.data); + return instance; } napi_value NapiPriKey::JsClearMem(napi_env env, napi_callback_info info) @@ -117,6 +117,5 @@ void NapiPriKey::DefinePriKeyJSClass(napi_env env) sizeof(classDesc) / sizeof(classDesc[0]), classDesc, &constructor); napi_create_reference(env, constructor, 1, &classRef_); } - } // CryptoFramework } // OHOS diff --git a/frameworks/js/napi/src/napi_pub_key.cpp b/frameworks/js/napi/src/napi_pub_key.cpp index b7676c8..6e91f71 100644 --- a/frameworks/js/napi/src/napi_pub_key.cpp +++ b/frameworks/js/napi/src/napi_pub_key.cpp @@ -15,16 +15,14 @@ #include "napi_pub_key.h" -#include "securec.h" #include "log.h" #include "memory.h" #include "napi_crypto_framework_defines.h" - #include "napi_utils.h" +#include "securec.h" namespace OHOS { namespace CryptoFramework { - thread_local napi_ref NapiPubKey::classRef_ = nullptr; NapiPubKey::NapiPubKey(HcfPubKey *pubKey) @@ -89,7 +87,9 @@ napi_value NapiPubKey::JsGetEncoded(napi_env env, napi_callback_info info) return nullptr; } - return ConvertBlobToNapiValue(env, &returnBlob); + napi_value instance = ConvertBlobToNapiValue(env, &returnBlob); + HcfFree(returnBlob.data); + return instance; } void NapiPubKey::DefinePubKeyJSClass(napi_env env) @@ -102,6 +102,5 @@ void NapiPubKey::DefinePubKeyJSClass(napi_env env) sizeof(classDesc) / sizeof(classDesc[0]), classDesc, &constructor); napi_create_reference(env, constructor, 1, &classRef_); } - } // CryptoFramework } // OHOS diff --git a/frameworks/js/napi/src/napi_sign.cpp b/frameworks/js/napi/src/napi_sign.cpp index 132b458..fca9d9f 100644 --- a/frameworks/js/napi/src/napi_sign.cpp +++ b/frameworks/js/napi/src/napi_sign.cpp @@ -26,7 +26,6 @@ namespace OHOS { namespace CryptoFramework { - struct SignInitCtx { napi_env env = nullptr; diff --git a/frameworks/js/napi/src/napi_sym_key.cpp b/frameworks/js/napi/src/napi_sym_key.cpp index d3a137c..3e2187c 100644 --- a/frameworks/js/napi/src/napi_sym_key.cpp +++ b/frameworks/js/napi/src/napi_sym_key.cpp @@ -24,7 +24,6 @@ namespace OHOS { namespace CryptoFramework { - thread_local napi_ref NapiSymKey::classRef_ = nullptr; NapiSymKey::NapiSymKey(HcfSymKey *symKey) @@ -121,6 +120,5 @@ void NapiSymKey::DefineSymKeyJSClass(napi_env env) sizeof(classDesc) / sizeof(classDesc[0]), classDesc, &constructor); napi_create_reference(env, constructor, 1, &classRef_); } - } // CryptoFramework } // OHOS diff --git a/frameworks/js/napi/src/napi_utils.cpp b/frameworks/js/napi/src/napi_utils.cpp index eb26f62..aae9d2c 100644 --- a/frameworks/js/napi/src/napi_utils.cpp +++ b/frameworks/js/napi/src/napi_utils.cpp @@ -26,7 +26,6 @@ namespace OHOS { namespace CryptoFramework { - using namespace std; napi_value NapiGetNull(napi_env env) @@ -356,7 +355,7 @@ static bool GetGcmParamsSpec(napi_env env, napi_value arg, HcfCryptoMode opMode, *paramsSpec = (HcfParamsSpec *)gcmParamsSpec; ret = true; clearup: - if (ret != true) { + if (!ret) { HcfBlobDataFree(iv); HcfBlobDataFree(aad); HcfBlobDataFree(tag); @@ -410,7 +409,7 @@ static bool GetCcmParamsSpec(napi_env env, napi_value arg, HcfCryptoMode opMode, *paramsSpec = (HcfParamsSpec *)ccmParamsSpec; ret = true; clearup: - if (ret != true) { + if (!ret) { HcfBlobDataFree(iv); HcfBlobDataFree(aad); HcfBlobDataFree(tag); @@ -741,6 +740,5 @@ napi_value GetResourceName(napi_env env, const char *name) napi_create_string_utf8(env, name, NAPI_AUTO_LENGTH, &resourceName); return resourceName; } - } // namespace CryptoFramework } // namespace OHOS diff --git a/frameworks/js/napi/src/napi_verify.cpp b/frameworks/js/napi/src/napi_verify.cpp index d5276e3..0916731 100644 --- a/frameworks/js/napi/src/napi_verify.cpp +++ b/frameworks/js/napi/src/napi_verify.cpp @@ -26,7 +26,6 @@ namespace OHOS { namespace CryptoFramework { - struct VerifyInitCtx { napi_env env = nullptr; diff --git a/frameworks/key/asy_key_generator.c b/frameworks/key/asy_key_generator.c index 6cf055c..8db4833 100644 --- a/frameworks/key/asy_key_generator.c +++ b/frameworks/key/asy_key_generator.c @@ -152,7 +152,7 @@ static HcfResult ParseAsyKeyGenParams(const HcfParaConfig* config, void *params) } // export interfaces -static const char *GetAsyKeyGeneratorClass() +static const char *GetAsyKeyGeneratorClass(void) { return "HcfAsyKeyGenerator"; } diff --git a/plugin/openssl_plugin/certificate/src/x509_cert_chain_validator_openssl.c b/plugin/openssl_plugin/certificate/src/x509_cert_chain_validator_openssl.c index 37447d7..4c13188 100644 --- a/plugin/openssl_plugin/certificate/src/x509_cert_chain_validator_openssl.c +++ b/plugin/openssl_plugin/certificate/src/x509_cert_chain_validator_openssl.c @@ -29,9 +29,8 @@ #include "config.h" #include "log.h" #include "memory.h" -#include "plugin_defines.h" -#include "result.h" #include "utils.h" +#include "result.h" #include "openssl_common.h" #define X509_CERT_CHAIN_VALIDATOR_OPENSSL_CLASS "X509CertChainValidatorOpensslClass" diff --git a/plugin/openssl_plugin/certificate/src/x509_certificate_openssl.c b/plugin/openssl_plugin/certificate/src/x509_certificate_openssl.c index c519430..443d88f 100644 --- a/plugin/openssl_plugin/certificate/src/x509_certificate_openssl.c +++ b/plugin/openssl_plugin/certificate/src/x509_certificate_openssl.c @@ -24,7 +24,6 @@ #include "config.h" #include "log.h" #include "memory.h" -#include "plugin_defines.h" #include "result.h" #include "utils.h" #include "x509_certificate.h" diff --git a/plugin/openssl_plugin/common/inc/plugin_defines.h b/plugin/openssl_plugin/common/inc/plugin_defines.h deleted file mode 100644 index ded7efc..0000000 --- a/plugin/openssl_plugin/common/inc/plugin_defines.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define HCF_OPENSSL_SUCCESS 1 // openssl interface return 1, means success. \ No newline at end of file diff --git a/plugin/openssl_plugin/common/inc/rsa_openssl_common.h b/plugin/openssl_plugin/common/inc/rsa_openssl_common.h index c81ac18..ef07817 100644 --- a/plugin/openssl_plugin/common/inc/rsa_openssl_common.h +++ b/plugin/openssl_plugin/common/inc/rsa_openssl_common.h @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifndef HCF_RSA_OPENSSL_COMMON_H +#define HCF_RSA_OPENSSL_COMMON_H + #include "openssl/rsa.h" #include "result.h" #include "stdbool.h" @@ -30,4 +33,6 @@ HcfResult DuplicateRsa(const RSA *rsa, bool needPrivate, RSA **dupRsa); #ifdef __cplusplus } -#endif \ No newline at end of file +#endif + +#endif diff --git a/plugin/openssl_plugin/common/src/rsa_openssl_common.c b/plugin/openssl_plugin/common/src/rsa_openssl_common.c index 55450ae..7fad10e 100644 --- a/plugin/openssl_plugin/common/src/rsa_openssl_common.c +++ b/plugin/openssl_plugin/common/src/rsa_openssl_common.c @@ -14,7 +14,7 @@ */ #include "rsa_openssl_common.h" #include "log.h" -#include "plugin_defines.h" +#include "openssl_common.h" static HcfResult DuplicateBigNumFromRSA(BIGNUM **n, BIGNUM **e, BIGNUM **d, bool needPrivate, const RSA *rsa) { diff --git a/plugin/openssl_plugin/crypto_operation/rsa/inc/cipher_rsa_openssl.h b/plugin/openssl_plugin/crypto_operation/rsa/inc/cipher_rsa_openssl.h index 731a5e5..e427f38 100644 --- a/plugin/openssl_plugin/crypto_operation/rsa/inc/cipher_rsa_openssl.h +++ b/plugin/openssl_plugin/crypto_operation/rsa/inc/cipher_rsa_openssl.h @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifndef HCF_CIPHER_RSA_OPENSSL_H +#define HCF_CIPHER_RSA_OPENSSL_H + #include "cipher_factory_spi.h" #ifdef __cplusplus @@ -24,4 +27,6 @@ HcfResult HcfCipherRsaCipherSpiCreate(CipherAttr *params, OH_HCF_CipherGenerator #ifdef __cplusplus } -#endif \ No newline at end of file +#endif + +#endif diff --git a/plugin/openssl_plugin/crypto_operation/signature/inc/signature_rsa_openssl.h b/plugin/openssl_plugin/crypto_operation/signature/inc/signature_rsa_openssl.h index dda9d5b..331c985 100644 --- a/plugin/openssl_plugin/crypto_operation/signature/inc/signature_rsa_openssl.h +++ b/plugin/openssl_plugin/crypto_operation/signature/inc/signature_rsa_openssl.h @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifndef HCF_SIGNATURE_RSA_OPENSSL_H +#define HCF_SIGNATURE_RSA_OPENSSL_H + #include "signature_spi.h" #include "params_parser.h" #include "result.h" @@ -34,3 +37,4 @@ HcfResult HcfVerifySpiRsaCreate(HcfSignatureParams *params, HcfVerifySpi **retur } #endif +#endif diff --git a/test/unittest/src/crypto_ecc_asy_key_generator_test.cpp b/test/unittest/src/crypto_ecc_asy_key_generator_test.cpp index 7feabf4..7bb0fc9 100644 --- a/test/unittest/src/crypto_ecc_asy_key_generator_test.cpp +++ b/test/unittest/src/crypto_ecc_asy_key_generator_test.cpp @@ -22,7 +22,8 @@ using namespace std; using namespace testing::ext; -class EccAsyKeyGeneratorTest : public testing::Test { +namespace { +class CryptoEccAsyKeyGeneratorTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -30,19 +31,19 @@ public: void TearDown(); }; -void EccAsyKeyGeneratorTest::SetUpTestCase() {} -void EccAsyKeyGeneratorTest::TearDownTestCase() {} -void EccAsyKeyGeneratorTest::SetUp() {} -void EccAsyKeyGeneratorTest::TearDown() {} +void CryptoEccAsyKeyGeneratorTest::SetUpTestCase() {} +void CryptoEccAsyKeyGeneratorTest::TearDownTestCase() {} +void CryptoEccAsyKeyGeneratorTest::SetUp() {} +void CryptoEccAsyKeyGeneratorTest::TearDown() {} -#define ECC224_PUB_KEY_LEN 57 -#define ECC224_PRI_KEY_LEN 28 -#define ECC256_PUB_KEY_LEN 65 -#define ECC256_PRI_KEY_LEN 32 -#define ECC384_PUB_KEY_LEN 97 -#define ECC384_PRI_KEY_LEN 48 -#define ECC512_PUB_KEY_LEN 133 -#define ECC512_PRI_KEY_LEN 65 +const int ECC224_PUB_KEY_LEN = 57; +const int ECC224_PRI_KEY_LEN = 28; +const int ECC256_PUB_KEY_LEN = 65; +const int ECC256_PRI_KEY_LEN = 32; +const int ECC384_PUB_KEY_LEN = 97; +const int ECC384_PRI_KEY_LEN = 48; +const int ECC512_PUB_KEY_LEN = 133; +const int ECC512_PRI_KEY_LEN = 65; static uint8_t mockEcc224PubKeyBlobData[ECC224_PUB_KEY_LEN] = { 4, 189, 186, 122, 21, 9, 8, 231, 90, 111, 68, 222, 207, 200, 53, 114, 236, 246, 204, 9, 171, 197, 57, 173, 138, 38, 180, 217, 55, 234, 181, 87, 143, 199, 250, 222, @@ -130,12 +131,12 @@ static HcfObjectBase obj = { }; /** - * @tc.name: EccAsyKeyGeneratorTest.EccAsyKeyGeneratorTest001 + * @tc.name: CryptoEccAsyKeyGeneratorTest.CryptoEccAsyKeyGeneratorTest001 * @tc.desc: Verify that the creation of the ECC224 key pair generator is normal. * @tc.type: FUNC * @tc.require: I5QWEI */ -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest001, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest001, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -146,7 +147,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest001, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest002, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest002, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC256", &generator); @@ -157,7 +158,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest002, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest003, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest003, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC384", &generator); @@ -168,7 +169,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest003, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest004, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest004, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC512", &generator); @@ -179,7 +180,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest004, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest005, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest005, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate(nullptr, &generator); @@ -188,7 +189,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest005, TestSize.Level0) ASSERT_EQ(generator, nullptr); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest006, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest006, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCD" @@ -198,7 +199,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest006, TestSize.Level0) ASSERT_EQ(generator, nullptr); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest007, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest007, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC225", &generator); @@ -207,14 +208,14 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest007, TestSize.Level0) ASSERT_EQ(generator, nullptr); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest008, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest008, TestSize.Level0) { int32_t res = HcfAsyKeyGeneratorCreate("ECC224", NULL); ASSERT_EQ(res, HCF_INVALID_PARAMS); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest101, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest101, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -228,7 +229,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest101, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest102, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest102, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -239,7 +240,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest102, TestSize.Level0) generator->base.destroy((HcfObjectBase *)generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest103, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest103, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -252,7 +253,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest103, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest104, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest104, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -265,7 +266,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest104, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest105, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest105, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -280,7 +281,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest105, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest106, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest106, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -295,7 +296,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest106, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest107, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest107, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -310,7 +311,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest107, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest201, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest201, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -328,7 +329,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest201, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest202, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest202, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC256", &generator); @@ -346,7 +347,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest202, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest203, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest203, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC384", &generator); @@ -364,7 +365,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest203, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest204, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest204, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC512", &generator); @@ -382,7 +383,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest204, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest205, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest205, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -399,7 +400,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest205, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest206, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest206, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -416,7 +417,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest206, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest207, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest207, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -431,7 +432,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest207, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest301, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest301, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -450,7 +451,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest301, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest302, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest302, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -466,7 +467,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest302, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest303, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest303, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -483,7 +484,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest303, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest304, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest304, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -500,7 +501,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest304, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest305, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest305, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -518,7 +519,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest305, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest306, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest306, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -536,7 +537,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest306, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest307, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest307, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -553,7 +554,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest307, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest308, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest308, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -570,7 +571,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest308, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest309, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest309, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -589,7 +590,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest309, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest310, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest310, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -608,7 +609,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest310, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest311, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest311, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -627,7 +628,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest311, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest312, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest312, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -646,7 +647,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest312, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest313, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest313, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -665,7 +666,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest313, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest314, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest314, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -684,7 +685,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest314, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest315, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest315, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -711,7 +712,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest315, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest316, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest316, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -736,7 +737,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest316, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest317, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest317, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -761,7 +762,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest317, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest318, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest318, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -780,7 +781,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest318, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest319, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest319, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -797,7 +798,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest319, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest320, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest320, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -814,7 +815,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest320, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest321, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest321, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -831,7 +832,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest321, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest322, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest322, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -850,7 +851,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest322, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest323, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest323, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -868,7 +869,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest323, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest324, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest324, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -885,7 +886,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest324, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest325, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest325, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -902,7 +903,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest325, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest326, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest326, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -921,7 +922,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest326, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest327, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest327, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -940,7 +941,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest327, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest328, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest328, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -959,7 +960,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest328, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest329, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest329, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -978,7 +979,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest329, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest330, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest330, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -997,7 +998,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest330, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest331, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest331, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1016,7 +1017,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest331, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest332, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest332, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1043,7 +1044,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest332, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest333, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest333, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1068,7 +1069,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest333, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest334, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest334, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1093,7 +1094,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest334, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest335, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest335, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1112,7 +1113,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest335, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest401, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest401, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1127,7 +1128,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest401, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest402, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest402, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC256", &generator); @@ -1142,7 +1143,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest402, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest403, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest403, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC384", &generator); @@ -1157,7 +1158,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest403, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest404, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest404, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC512", &generator); @@ -1172,7 +1173,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest404, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest405, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest405, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1186,7 +1187,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest405, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest406, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest406, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1201,7 +1202,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest406, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest407, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest407, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1216,7 +1217,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest407, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest408, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest408, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1231,7 +1232,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest408, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest409, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest409, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1245,7 +1246,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest409, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest410, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest410, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1257,7 +1258,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest410, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest501, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest501, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1276,7 +1277,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest501, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest502, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest502, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1292,7 +1293,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest502, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest503, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest503, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1309,7 +1310,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest503, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest504, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest504, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1326,7 +1327,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest504, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest505, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest505, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1344,7 +1345,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest505, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest506, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest506, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1362,7 +1363,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest506, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest507, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest507, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1379,7 +1380,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest507, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest508, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest508, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1396,7 +1397,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest508, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest509, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest509, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1415,7 +1416,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest509, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest510, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest510, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1434,7 +1435,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest510, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest511, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest511, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1453,7 +1454,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest511, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest512, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest512, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1472,7 +1473,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest512, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest513, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest513, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1491,7 +1492,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest513, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest514, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest514, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1510,7 +1511,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest514, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest515, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest515, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1537,7 +1538,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest515, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest516, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest516, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1562,7 +1563,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest516, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest517, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest517, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1587,7 +1588,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest517, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest518, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest518, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1606,7 +1607,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest518, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest519, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest519, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1623,7 +1624,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest519, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest520, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest520, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1640,7 +1641,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest520, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest521, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest521, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1657,7 +1658,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest521, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest522, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest522, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1676,7 +1677,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest522, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest523, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest523, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1694,7 +1695,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest523, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest524, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest524, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1711,7 +1712,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest524, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest525, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest525, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1728,7 +1729,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest525, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest526, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest526, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1747,7 +1748,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest526, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest527, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest527, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1766,7 +1767,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest527, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest528, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest528, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1785,7 +1786,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest528, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest529, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest529, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1804,7 +1805,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest529, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest530, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest530, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1823,7 +1824,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest530, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest531, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest531, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1842,7 +1843,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest531, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest532, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest532, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1869,7 +1870,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest532, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest533, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest533, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1894,7 +1895,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest533, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest534, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest534, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1919,7 +1920,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest534, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest535, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest535, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1938,7 +1939,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest535, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest536, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest536, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -1956,8 +1957,6 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest536, TestSize.Level0) res = keyPair->pubKey->base.getEncoded(&(keyPair->pubKey->base), &pubKeyBlob); ASSERT_EQ(res, HCF_SUCCESS); - ASSERT_NE(pubKeyBlob.data, nullptr); - ASSERT_NE(pubKeyBlob.len, 0); HcfBlob priKeyBlob = { .data = NULL, @@ -1966,8 +1965,6 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest536, TestSize.Level0) res = keyPair->priKey->base.getEncoded(&(keyPair->priKey->base), &priKeyBlob); ASSERT_EQ(res, HCF_SUCCESS); - ASSERT_NE(priKeyBlob.data, nullptr); - ASSERT_NE(priKeyBlob.len, 0); HcfKeyPair *outKeyPair = NULL; res = generator->convertKey(generator, NULL, &pubKeyBlob, &priKeyBlob, &outKeyPair); @@ -2004,7 +2001,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest536, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest537, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest537, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -2050,7 +2047,7 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest537, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest538, TestSize.Level0) +HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest538, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -2095,3 +2092,4 @@ HWTEST_F(EccAsyKeyGeneratorTest, EccAsyKeyGeneratorTest538, TestSize.Level0) OH_HCF_ObjDestroy(keyPair); OH_HCF_ObjDestroy(generator); } +} diff --git a/test/unittest/src/crypto_ecc_key_agreement_test.cpp b/test/unittest/src/crypto_ecc_key_agreement_test.cpp index b075540..a57ed1d 100644 --- a/test/unittest/src/crypto_ecc_key_agreement_test.cpp +++ b/test/unittest/src/crypto_ecc_key_agreement_test.cpp @@ -22,17 +22,8 @@ using namespace std; using namespace testing::ext; -static const char *GetMockClass(void) -{ - return "HcfSymKeyGenerator"; -} - -static HcfObjectBase obj = { - .getClass = GetMockClass, - .destroy = NULL -}; - -class KeyAgreementTest : public testing::Test { +namespace { +class CryptoEccKeyAgreementTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -45,15 +36,15 @@ public: static HcfKeyPair *ecc512KeyPair_; }; -HcfKeyPair *KeyAgreementTest::ecc224KeyPair_ = nullptr; -HcfKeyPair *KeyAgreementTest::ecc256KeyPair_ = nullptr; -HcfKeyPair *KeyAgreementTest::ecc384KeyPair_ = nullptr; -HcfKeyPair *KeyAgreementTest::ecc512KeyPair_ = nullptr; +HcfKeyPair *CryptoEccKeyAgreementTest::ecc224KeyPair_ = nullptr; +HcfKeyPair *CryptoEccKeyAgreementTest::ecc256KeyPair_ = nullptr; +HcfKeyPair *CryptoEccKeyAgreementTest::ecc384KeyPair_ = nullptr; +HcfKeyPair *CryptoEccKeyAgreementTest::ecc512KeyPair_ = nullptr; -void KeyAgreementTest::SetUp() {} -void KeyAgreementTest::TearDown() {} +void CryptoEccKeyAgreementTest::SetUp() {} +void CryptoEccKeyAgreementTest::TearDown() {} -void KeyAgreementTest::SetUpTestCase() +void CryptoEccKeyAgreementTest::SetUpTestCase() { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -112,7 +103,7 @@ void KeyAgreementTest::SetUpTestCase() OH_HCF_ObjDestroy(generator4); } -void KeyAgreementTest::TearDownTestCase() +void CryptoEccKeyAgreementTest::TearDownTestCase() { OH_HCF_ObjDestroy(ecc224KeyPair_); OH_HCF_ObjDestroy(ecc256KeyPair_); @@ -120,7 +111,17 @@ void KeyAgreementTest::TearDownTestCase() OH_HCF_ObjDestroy(ecc512KeyPair_); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest001, TestSize.Level0) +static const char *GetMockClass(void) +{ + return "HcfSymKeyGenerator"; +} + +static HcfObjectBase obj = { + .getClass = GetMockClass, + .destroy = NULL +}; + +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest001, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC224", &keyAgreement); @@ -131,7 +132,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest001, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest002, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest002, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -142,7 +143,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest002, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest003, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest003, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC384", &keyAgreement); @@ -153,7 +154,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest003, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest004, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest004, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC512", &keyAgreement); @@ -164,7 +165,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest004, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest005, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest005, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate(NULL, &keyAgreement); @@ -173,7 +174,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest005, TestSize.Level0) ASSERT_EQ(keyAgreement, nullptr); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest006, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest006, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCD" @@ -183,7 +184,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest006, TestSize.Level0) ASSERT_EQ(keyAgreement, nullptr); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest007, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest007, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC257", &keyAgreement); @@ -192,14 +193,14 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest007, TestSize.Level0) ASSERT_EQ(keyAgreement, nullptr); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest008, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest008, TestSize.Level0) { int32_t res = HcfKeyAgreementCreate("ECC256", NULL); ASSERT_EQ(res, HCF_INVALID_PARAMS); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest101, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest101, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -214,7 +215,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest101, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest102, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest102, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -225,7 +226,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest102, TestSize.Level0) keyAgreement->base.destroy((HcfObjectBase *)keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest103, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest103, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -238,7 +239,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest103, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest104, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest104, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -251,7 +252,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest104, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest105, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest105, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -266,7 +267,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest105, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest106, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest106, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -281,7 +282,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest106, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest107, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest107, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -296,7 +297,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest107, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest201, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest201, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC224", &keyAgreement); @@ -318,7 +319,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest201, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest202, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest202, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -340,7 +341,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest202, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest203, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest203, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC384", &keyAgreement); @@ -362,7 +363,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest203, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest204, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest204, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC512", &keyAgreement); @@ -384,7 +385,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest204, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest205, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest205, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -405,7 +406,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest205, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest206, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest206, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -426,7 +427,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest206, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest207, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest207, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -447,7 +448,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest207, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest208, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest208, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -468,7 +469,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest208, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest209, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest209, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -489,7 +490,7 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest209, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } -HWTEST_F(KeyAgreementTest, KeyAgreementTest210, TestSize.Level0) +HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest210, TestSize.Level0) { HcfKeyAgreement *keyAgreement = NULL; int32_t res = HcfKeyAgreementCreate("ECC256", &keyAgreement); @@ -503,3 +504,4 @@ HWTEST_F(KeyAgreementTest, KeyAgreementTest210, TestSize.Level0) OH_HCF_ObjDestroy(keyAgreement); } +} diff --git a/test/unittest/src/crypto_ecc_sign_test.cpp b/test/unittest/src/crypto_ecc_sign_test.cpp index bd91c18..21455b8 100644 --- a/test/unittest/src/crypto_ecc_sign_test.cpp +++ b/test/unittest/src/crypto_ecc_sign_test.cpp @@ -25,17 +25,8 @@ using namespace std; using namespace testing::ext; -static const char *GetMockClass(void) -{ - return "HcfMock"; -} - -static HcfObjectBase obj = { - .getClass = GetMockClass, - .destroy = NULL -}; - -class EccSignTest : public testing::Test { +namespace { +class CryptoEccSignTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -48,10 +39,10 @@ public: static HcfKeyPair *ecc512KeyPair_; }; -HcfKeyPair *EccSignTest::ecc224KeyPair_ = nullptr; -HcfKeyPair *EccSignTest::ecc256KeyPair_ = nullptr; -HcfKeyPair *EccSignTest::ecc384KeyPair_ = nullptr; -HcfKeyPair *EccSignTest::ecc512KeyPair_ = nullptr; +HcfKeyPair *CryptoEccSignTest::ecc224KeyPair_ = nullptr; +HcfKeyPair *CryptoEccSignTest::ecc256KeyPair_ = nullptr; +HcfKeyPair *CryptoEccSignTest::ecc384KeyPair_ = nullptr; +HcfKeyPair *CryptoEccSignTest::ecc512KeyPair_ = nullptr; static const char *g_mockMessage = "hello world"; static HcfBlob mockInput = { @@ -59,10 +50,10 @@ static HcfBlob mockInput = { .len = 12 }; -void EccSignTest::SetUp() {} -void EccSignTest::TearDown() {} +void CryptoEccSignTest::SetUp() {} +void CryptoEccSignTest::TearDown() {} -void EccSignTest::SetUpTestCase() +void CryptoEccSignTest::SetUpTestCase() { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -121,7 +112,7 @@ void EccSignTest::SetUpTestCase() OH_HCF_ObjDestroy(generator4); } -void EccSignTest::TearDownTestCase() +void CryptoEccSignTest::TearDownTestCase() { OH_HCF_ObjDestroy(ecc224KeyPair_); OH_HCF_ObjDestroy(ecc256KeyPair_); @@ -129,7 +120,17 @@ void EccSignTest::TearDownTestCase() OH_HCF_ObjDestroy(ecc512KeyPair_); } -HWTEST_F(EccSignTest, EccSignTest001, TestSize.Level0) +static const char *GetMockClass(void) +{ + return "HcfMock"; +} + +static HcfObjectBase obj = { + .getClass = GetMockClass, + .destroy = NULL +}; + +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest001, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA1", &sign); @@ -140,7 +141,7 @@ HWTEST_F(EccSignTest, EccSignTest001, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest002, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest002, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA224", &sign); @@ -151,7 +152,7 @@ HWTEST_F(EccSignTest, EccSignTest002, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest003, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest003, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA256", &sign); @@ -162,7 +163,7 @@ HWTEST_F(EccSignTest, EccSignTest003, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest004, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest004, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA384", &sign); @@ -173,7 +174,7 @@ HWTEST_F(EccSignTest, EccSignTest004, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest005, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest005, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA512", &sign); @@ -184,7 +185,7 @@ HWTEST_F(EccSignTest, EccSignTest005, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest006, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest006, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA1", &sign); @@ -195,7 +196,7 @@ HWTEST_F(EccSignTest, EccSignTest006, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest007, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest007, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA224", &sign); @@ -206,7 +207,7 @@ HWTEST_F(EccSignTest, EccSignTest007, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest008, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest008, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -217,7 +218,7 @@ HWTEST_F(EccSignTest, EccSignTest008, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest009, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest009, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA384", &sign); @@ -228,7 +229,7 @@ HWTEST_F(EccSignTest, EccSignTest009, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest010, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest010, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA512", &sign); @@ -239,7 +240,7 @@ HWTEST_F(EccSignTest, EccSignTest010, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest011, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest011, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA1", &sign); @@ -250,7 +251,7 @@ HWTEST_F(EccSignTest, EccSignTest011, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest012, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest012, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA224", &sign); @@ -261,7 +262,7 @@ HWTEST_F(EccSignTest, EccSignTest012, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest013, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest013, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA256", &sign); @@ -272,7 +273,7 @@ HWTEST_F(EccSignTest, EccSignTest013, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest014, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest014, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA384", &sign); @@ -283,7 +284,7 @@ HWTEST_F(EccSignTest, EccSignTest014, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest015, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest015, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA512", &sign); @@ -294,7 +295,7 @@ HWTEST_F(EccSignTest, EccSignTest015, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest016, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest016, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA1", &sign); @@ -305,7 +306,7 @@ HWTEST_F(EccSignTest, EccSignTest016, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest017, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest017, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA224", &sign); @@ -316,7 +317,7 @@ HWTEST_F(EccSignTest, EccSignTest017, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest018, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest018, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA256", &sign); @@ -327,7 +328,7 @@ HWTEST_F(EccSignTest, EccSignTest018, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest019, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest019, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA384", &sign); @@ -338,7 +339,7 @@ HWTEST_F(EccSignTest, EccSignTest019, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest020, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest020, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA512", &sign); @@ -349,7 +350,7 @@ HWTEST_F(EccSignTest, EccSignTest020, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest021, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest021, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate(NULL, &sign); @@ -358,7 +359,7 @@ HWTEST_F(EccSignTest, EccSignTest021, TestSize.Level0) ASSERT_EQ(sign, nullptr); } -HWTEST_F(EccSignTest, EccSignTest022, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest022, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCD" @@ -368,7 +369,7 @@ HWTEST_F(EccSignTest, EccSignTest022, TestSize.Level0) ASSERT_EQ(sign, nullptr); } -HWTEST_F(EccSignTest, EccSignTest023, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest023, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC257|SHA256", &sign); @@ -377,7 +378,7 @@ HWTEST_F(EccSignTest, EccSignTest023, TestSize.Level0) ASSERT_EQ(sign, nullptr); } -HWTEST_F(EccSignTest, EccSignTest024, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest024, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA257", &sign); @@ -386,7 +387,7 @@ HWTEST_F(EccSignTest, EccSignTest024, TestSize.Level0) ASSERT_EQ(sign, nullptr); } -HWTEST_F(EccSignTest, EccSignTest025, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest025, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|MD5", &sign); @@ -395,7 +396,7 @@ HWTEST_F(EccSignTest, EccSignTest025, TestSize.Level0) ASSERT_EQ(sign, nullptr); } -HWTEST_F(EccSignTest, EccSignTest026, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest026, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256SHA256", &sign); @@ -404,14 +405,14 @@ HWTEST_F(EccSignTest, EccSignTest026, TestSize.Level0) ASSERT_EQ(sign, nullptr); } -HWTEST_F(EccSignTest, EccSignTest027, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest027, TestSize.Level0) { int32_t res = HcfSignCreate("ECC256|SHA256", NULL); ASSERT_EQ(res, HCF_INVALID_PARAMS); } -HWTEST_F(EccSignTest, EccSignTest101, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest101, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -426,7 +427,7 @@ HWTEST_F(EccSignTest, EccSignTest101, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest102, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest102, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -437,7 +438,7 @@ HWTEST_F(EccSignTest, EccSignTest102, TestSize.Level0) sign->base.destroy((HcfObjectBase *)sign); } -HWTEST_F(EccSignTest, EccSignTest103, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest103, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -450,7 +451,7 @@ HWTEST_F(EccSignTest, EccSignTest103, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest104, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest104, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -463,7 +464,7 @@ HWTEST_F(EccSignTest, EccSignTest104, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest105, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest105, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -478,7 +479,7 @@ HWTEST_F(EccSignTest, EccSignTest105, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest106, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest106, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -493,7 +494,7 @@ HWTEST_F(EccSignTest, EccSignTest106, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest107, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest107, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -508,7 +509,7 @@ HWTEST_F(EccSignTest, EccSignTest107, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest201, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest201, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA1", &sign); @@ -523,7 +524,7 @@ HWTEST_F(EccSignTest, EccSignTest201, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest202, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest202, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA224", &sign); @@ -538,7 +539,7 @@ HWTEST_F(EccSignTest, EccSignTest202, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest203, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest203, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA256", &sign); @@ -553,7 +554,7 @@ HWTEST_F(EccSignTest, EccSignTest203, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest204, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest204, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA384", &sign); @@ -568,7 +569,7 @@ HWTEST_F(EccSignTest, EccSignTest204, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest205, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest205, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA512", &sign); @@ -583,7 +584,7 @@ HWTEST_F(EccSignTest, EccSignTest205, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest206, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest206, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA1", &sign); @@ -598,7 +599,7 @@ HWTEST_F(EccSignTest, EccSignTest206, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest207, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest207, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA224", &sign); @@ -613,7 +614,7 @@ HWTEST_F(EccSignTest, EccSignTest207, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest208, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest208, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -628,7 +629,7 @@ HWTEST_F(EccSignTest, EccSignTest208, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest209, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest209, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA384", &sign); @@ -643,7 +644,7 @@ HWTEST_F(EccSignTest, EccSignTest209, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest210, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest210, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA512", &sign); @@ -658,7 +659,7 @@ HWTEST_F(EccSignTest, EccSignTest210, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest211, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest211, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA1", &sign); @@ -673,7 +674,7 @@ HWTEST_F(EccSignTest, EccSignTest211, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest212, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest212, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA224", &sign); @@ -688,7 +689,7 @@ HWTEST_F(EccSignTest, EccSignTest212, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest213, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest213, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA256", &sign); @@ -703,7 +704,7 @@ HWTEST_F(EccSignTest, EccSignTest213, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest214, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest214, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA384", &sign); @@ -718,7 +719,7 @@ HWTEST_F(EccSignTest, EccSignTest214, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest215, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest215, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA512", &sign); @@ -733,7 +734,7 @@ HWTEST_F(EccSignTest, EccSignTest215, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest216, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest216, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA1", &sign); @@ -748,7 +749,7 @@ HWTEST_F(EccSignTest, EccSignTest216, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest217, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest217, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA224", &sign); @@ -763,7 +764,7 @@ HWTEST_F(EccSignTest, EccSignTest217, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest218, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest218, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA256", &sign); @@ -778,7 +779,7 @@ HWTEST_F(EccSignTest, EccSignTest218, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest219, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest219, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA384", &sign); @@ -793,7 +794,7 @@ HWTEST_F(EccSignTest, EccSignTest219, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest220, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest220, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA512", &sign); @@ -808,7 +809,7 @@ HWTEST_F(EccSignTest, EccSignTest220, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest221, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest221, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -823,7 +824,7 @@ HWTEST_F(EccSignTest, EccSignTest221, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest222, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest222, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -838,7 +839,7 @@ HWTEST_F(EccSignTest, EccSignTest222, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest223, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest223, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -853,7 +854,7 @@ HWTEST_F(EccSignTest, EccSignTest223, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest224, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest224, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -868,7 +869,7 @@ HWTEST_F(EccSignTest, EccSignTest224, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest301, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest301, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA1", &sign); @@ -887,7 +888,7 @@ HWTEST_F(EccSignTest, EccSignTest301, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest302, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest302, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA224", &sign); @@ -906,7 +907,7 @@ HWTEST_F(EccSignTest, EccSignTest302, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest303, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest303, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA256", &sign); @@ -925,7 +926,7 @@ HWTEST_F(EccSignTest, EccSignTest303, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest304, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest304, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA384", &sign); @@ -944,7 +945,7 @@ HWTEST_F(EccSignTest, EccSignTest304, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest305, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest305, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA512", &sign); @@ -963,7 +964,7 @@ HWTEST_F(EccSignTest, EccSignTest305, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest306, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest306, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA1", &sign); @@ -982,7 +983,7 @@ HWTEST_F(EccSignTest, EccSignTest306, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest307, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest307, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA224", &sign); @@ -1001,7 +1002,7 @@ HWTEST_F(EccSignTest, EccSignTest307, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest308, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest308, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -1020,7 +1021,7 @@ HWTEST_F(EccSignTest, EccSignTest308, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest309, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest309, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA384", &sign); @@ -1039,7 +1040,7 @@ HWTEST_F(EccSignTest, EccSignTest309, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest310, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest310, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA512", &sign); @@ -1058,7 +1059,7 @@ HWTEST_F(EccSignTest, EccSignTest310, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest311, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest311, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA1", &sign); @@ -1077,7 +1078,7 @@ HWTEST_F(EccSignTest, EccSignTest311, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest312, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest312, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA224", &sign); @@ -1096,7 +1097,7 @@ HWTEST_F(EccSignTest, EccSignTest312, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest313, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest313, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA256", &sign); @@ -1115,7 +1116,7 @@ HWTEST_F(EccSignTest, EccSignTest313, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest314, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest314, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA384", &sign); @@ -1134,7 +1135,7 @@ HWTEST_F(EccSignTest, EccSignTest314, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest315, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest315, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA512", &sign); @@ -1153,7 +1154,7 @@ HWTEST_F(EccSignTest, EccSignTest315, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest316, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest316, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA1", &sign); @@ -1172,7 +1173,7 @@ HWTEST_F(EccSignTest, EccSignTest316, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest317, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest317, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA224", &sign); @@ -1191,7 +1192,7 @@ HWTEST_F(EccSignTest, EccSignTest317, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest318, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest318, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA256", &sign); @@ -1210,7 +1211,7 @@ HWTEST_F(EccSignTest, EccSignTest318, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest319, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest319, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA384", &sign); @@ -1229,7 +1230,7 @@ HWTEST_F(EccSignTest, EccSignTest319, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest320, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest320, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA512", &sign); @@ -1248,7 +1249,7 @@ HWTEST_F(EccSignTest, EccSignTest320, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest321, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest321, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -1267,7 +1268,7 @@ HWTEST_F(EccSignTest, EccSignTest321, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest322, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest322, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -1286,7 +1287,7 @@ HWTEST_F(EccSignTest, EccSignTest322, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest323, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest323, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -1305,7 +1306,7 @@ HWTEST_F(EccSignTest, EccSignTest323, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest324, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest324, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -1328,7 +1329,7 @@ HWTEST_F(EccSignTest, EccSignTest324, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest325, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest325, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -1351,7 +1352,7 @@ HWTEST_F(EccSignTest, EccSignTest325, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest401, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest401, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA1", &sign); @@ -1381,7 +1382,7 @@ HWTEST_F(EccSignTest, EccSignTest401, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest402, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest402, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA224", &sign); @@ -1411,7 +1412,7 @@ HWTEST_F(EccSignTest, EccSignTest402, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest403, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest403, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA256", &sign); @@ -1441,7 +1442,7 @@ HWTEST_F(EccSignTest, EccSignTest403, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest404, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest404, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA384", &sign); @@ -1471,7 +1472,7 @@ HWTEST_F(EccSignTest, EccSignTest404, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest405, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest405, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA512", &sign); @@ -1501,7 +1502,7 @@ HWTEST_F(EccSignTest, EccSignTest405, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest406, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest406, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA1", &sign); @@ -1531,7 +1532,7 @@ HWTEST_F(EccSignTest, EccSignTest406, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest407, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest407, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA224", &sign); @@ -1561,7 +1562,7 @@ HWTEST_F(EccSignTest, EccSignTest407, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest408, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest408, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -1591,7 +1592,7 @@ HWTEST_F(EccSignTest, EccSignTest408, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest409, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest409, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA384", &sign); @@ -1621,7 +1622,7 @@ HWTEST_F(EccSignTest, EccSignTest409, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest410, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest410, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA512", &sign); @@ -1651,7 +1652,7 @@ HWTEST_F(EccSignTest, EccSignTest410, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest411, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest411, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA1", &sign); @@ -1681,7 +1682,7 @@ HWTEST_F(EccSignTest, EccSignTest411, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest412, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest412, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA224", &sign); @@ -1711,7 +1712,7 @@ HWTEST_F(EccSignTest, EccSignTest412, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest413, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest413, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA256", &sign); @@ -1741,7 +1742,7 @@ HWTEST_F(EccSignTest, EccSignTest413, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest414, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest414, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA384", &sign); @@ -1771,7 +1772,7 @@ HWTEST_F(EccSignTest, EccSignTest414, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest415, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest415, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA512", &sign); @@ -1801,7 +1802,7 @@ HWTEST_F(EccSignTest, EccSignTest415, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest416, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest416, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA1", &sign); @@ -1831,7 +1832,7 @@ HWTEST_F(EccSignTest, EccSignTest416, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest417, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest417, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA224", &sign); @@ -1861,7 +1862,7 @@ HWTEST_F(EccSignTest, EccSignTest417, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest418, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest418, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA256", &sign); @@ -1891,7 +1892,7 @@ HWTEST_F(EccSignTest, EccSignTest418, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest419, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest419, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA384", &sign); @@ -1921,7 +1922,7 @@ HWTEST_F(EccSignTest, EccSignTest419, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest420, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest420, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA512", &sign); @@ -1951,7 +1952,7 @@ HWTEST_F(EccSignTest, EccSignTest420, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest421, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest421, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA1", &sign); @@ -1977,7 +1978,7 @@ HWTEST_F(EccSignTest, EccSignTest421, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest422, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest422, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA224", &sign); @@ -2003,7 +2004,7 @@ HWTEST_F(EccSignTest, EccSignTest422, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest423, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest423, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA256", &sign); @@ -2029,7 +2030,7 @@ HWTEST_F(EccSignTest, EccSignTest423, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest424, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest424, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA384", &sign); @@ -2055,7 +2056,7 @@ HWTEST_F(EccSignTest, EccSignTest424, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest425, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest425, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA512", &sign); @@ -2081,7 +2082,7 @@ HWTEST_F(EccSignTest, EccSignTest425, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest426, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest426, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA1", &sign); @@ -2107,7 +2108,7 @@ HWTEST_F(EccSignTest, EccSignTest426, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest427, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest427, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA224", &sign); @@ -2133,7 +2134,7 @@ HWTEST_F(EccSignTest, EccSignTest427, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest428, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest428, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -2159,7 +2160,7 @@ HWTEST_F(EccSignTest, EccSignTest428, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest429, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest429, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA384", &sign); @@ -2185,7 +2186,7 @@ HWTEST_F(EccSignTest, EccSignTest429, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest430, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest430, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA512", &sign); @@ -2211,7 +2212,7 @@ HWTEST_F(EccSignTest, EccSignTest430, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest431, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest431, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA1", &sign); @@ -2237,7 +2238,7 @@ HWTEST_F(EccSignTest, EccSignTest431, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest432, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest432, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA224", &sign); @@ -2263,7 +2264,7 @@ HWTEST_F(EccSignTest, EccSignTest432, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest433, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest433, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA256", &sign); @@ -2289,7 +2290,7 @@ HWTEST_F(EccSignTest, EccSignTest433, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest434, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest434, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA384", &sign); @@ -2315,7 +2316,7 @@ HWTEST_F(EccSignTest, EccSignTest434, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest435, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest435, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA512", &sign); @@ -2341,7 +2342,7 @@ HWTEST_F(EccSignTest, EccSignTest435, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest436, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest436, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA1", &sign); @@ -2367,7 +2368,7 @@ HWTEST_F(EccSignTest, EccSignTest436, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest437, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest437, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA224", &sign); @@ -2393,7 +2394,7 @@ HWTEST_F(EccSignTest, EccSignTest437, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest438, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest438, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA256", &sign); @@ -2419,7 +2420,7 @@ HWTEST_F(EccSignTest, EccSignTest438, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest439, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest439, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA384", &sign); @@ -2445,7 +2446,7 @@ HWTEST_F(EccSignTest, EccSignTest439, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest440, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest440, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA512", &sign); @@ -2471,7 +2472,7 @@ HWTEST_F(EccSignTest, EccSignTest440, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest441, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest441, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -2498,7 +2499,7 @@ HWTEST_F(EccSignTest, EccSignTest441, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest442, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest442, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -2525,7 +2526,7 @@ HWTEST_F(EccSignTest, EccSignTest442, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest443, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest443, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -2548,7 +2549,7 @@ HWTEST_F(EccSignTest, EccSignTest443, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest444, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest444, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -2575,7 +2576,7 @@ HWTEST_F(EccSignTest, EccSignTest444, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest445, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest445, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -2602,7 +2603,7 @@ HWTEST_F(EccSignTest, EccSignTest445, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest446, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest446, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -2625,7 +2626,7 @@ HWTEST_F(EccSignTest, EccSignTest446, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest447, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest447, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -2692,7 +2693,7 @@ HWTEST_F(EccSignTest, EccSignTest447, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccSignTest, EccSignTest448, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest448, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -2727,7 +2728,7 @@ HWTEST_F(EccSignTest, EccSignTest448, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest927, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest927, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -2769,7 +2770,7 @@ HWTEST_F(EccSignTest, EccSignTest927, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(EccSignTest, EccSignTest928, TestSize.Level0) +HWTEST_F(CryptoEccSignTest, CryptoEccSignTest928, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -2812,3 +2813,4 @@ HWTEST_F(EccSignTest, EccSignTest928, TestSize.Level0) free(out.data); OH_HCF_ObjDestroy(sign); } +} diff --git a/test/unittest/src/crypto_ecc_verify_test.cpp b/test/unittest/src/crypto_ecc_verify_test.cpp index c8f6e0d..34c38ec 100644 --- a/test/unittest/src/crypto_ecc_verify_test.cpp +++ b/test/unittest/src/crypto_ecc_verify_test.cpp @@ -25,17 +25,8 @@ using namespace std; using namespace testing::ext; -static const char *GetMockClass(void) -{ - return "HcfMock"; -} - -static HcfObjectBase obj = { - .getClass = GetMockClass, - .destroy = NULL -}; - -class EccVerifyTest : public testing::Test { +namespace { +class CryptoEccVerifyTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -48,10 +39,10 @@ public: static HcfKeyPair *ecc512KeyPair_; }; -HcfKeyPair *EccVerifyTest::ecc224KeyPair_ = nullptr; -HcfKeyPair *EccVerifyTest::ecc256KeyPair_ = nullptr; -HcfKeyPair *EccVerifyTest::ecc384KeyPair_ = nullptr; -HcfKeyPair *EccVerifyTest::ecc512KeyPair_ = nullptr; +HcfKeyPair *CryptoEccVerifyTest::ecc224KeyPair_ = nullptr; +HcfKeyPair *CryptoEccVerifyTest::ecc256KeyPair_ = nullptr; +HcfKeyPair *CryptoEccVerifyTest::ecc384KeyPair_ = nullptr; +HcfKeyPair *CryptoEccVerifyTest::ecc512KeyPair_ = nullptr; static const char *g_mockMessage = "hello world"; static HcfBlob mockInput = { @@ -59,10 +50,10 @@ static HcfBlob mockInput = { .len = 12 }; -void EccVerifyTest::SetUp() {} -void EccVerifyTest::TearDown() {} +void CryptoEccVerifyTest::SetUp() {} +void CryptoEccVerifyTest::TearDown() {} -void EccVerifyTest::SetUpTestCase() +void CryptoEccVerifyTest::SetUpTestCase() { HcfAsyKeyGenerator *generator = NULL; int32_t res = HcfAsyKeyGeneratorCreate("ECC224", &generator); @@ -121,7 +112,7 @@ void EccVerifyTest::SetUpTestCase() OH_HCF_ObjDestroy(generator4); } -void EccVerifyTest::TearDownTestCase() +void CryptoEccVerifyTest::TearDownTestCase() { OH_HCF_ObjDestroy(ecc224KeyPair_); OH_HCF_ObjDestroy(ecc256KeyPair_); @@ -129,7 +120,17 @@ void EccVerifyTest::TearDownTestCase() OH_HCF_ObjDestroy(ecc512KeyPair_); } -HWTEST_F(EccVerifyTest, EccVerifyTest001, TestSize.Level0) +static const char *GetMockClass(void) +{ + return "HcfMock"; +} + +static HcfObjectBase obj = { + .getClass = GetMockClass, + .destroy = NULL +}; + +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest001, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA1", &verify); @@ -140,7 +141,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest001, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest002, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest002, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA224", &verify); @@ -151,7 +152,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest002, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest003, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest003, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA256", &verify); @@ -162,7 +163,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest003, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest004, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest004, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA384", &verify); @@ -173,7 +174,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest004, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest005, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest005, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA512", &verify); @@ -184,7 +185,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest005, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest006, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest006, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA1", &verify); @@ -195,7 +196,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest006, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest007, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest007, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA224", &verify); @@ -206,7 +207,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest007, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest008, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest008, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -217,7 +218,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest008, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest009, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest009, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA384", &verify); @@ -228,7 +229,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest009, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest010, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest010, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA512", &verify); @@ -239,7 +240,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest010, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest011, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest011, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA1", &verify); @@ -250,7 +251,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest011, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest012, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest012, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA224", &verify); @@ -261,7 +262,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest012, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest013, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest013, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA256", &verify); @@ -272,7 +273,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest013, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest014, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest014, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA384", &verify); @@ -283,7 +284,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest014, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest015, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest015, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA512", &verify); @@ -294,7 +295,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest015, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest016, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest016, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA1", &verify); @@ -305,7 +306,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest016, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest017, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest017, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA224", &verify); @@ -316,7 +317,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest017, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest018, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest018, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA256", &verify); @@ -327,7 +328,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest018, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest019, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest019, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA384", &verify); @@ -338,7 +339,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest019, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest020, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest020, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA512", &verify); @@ -349,7 +350,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest020, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest021, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest021, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate(NULL, &verify); @@ -358,7 +359,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest021, TestSize.Level0) ASSERT_EQ(verify, nullptr); } -HWTEST_F(EccVerifyTest, EccVerifyTest022, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest022, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCDABCD" @@ -368,7 +369,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest022, TestSize.Level0) ASSERT_EQ(verify, nullptr); } -HWTEST_F(EccVerifyTest, EccVerifyTest023, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest023, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC257|SHA256", &verify); @@ -377,7 +378,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest023, TestSize.Level0) ASSERT_EQ(verify, nullptr); } -HWTEST_F(EccVerifyTest, EccVerifyTest024, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest024, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA257", &verify); @@ -386,7 +387,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest024, TestSize.Level0) ASSERT_EQ(verify, nullptr); } -HWTEST_F(EccVerifyTest, EccVerifyTest025, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest025, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|MD5", &verify); @@ -395,7 +396,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest025, TestSize.Level0) ASSERT_EQ(verify, nullptr); } -HWTEST_F(EccVerifyTest, EccVerifyTest026, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest026, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256SHA256", &verify); @@ -404,14 +405,14 @@ HWTEST_F(EccVerifyTest, EccVerifyTest026, TestSize.Level0) ASSERT_EQ(verify, nullptr); } -HWTEST_F(EccVerifyTest, EccVerifyTest027, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest027, TestSize.Level0) { int32_t res = HcfVerifyCreate("ECC256|SHA256", NULL); ASSERT_EQ(res, HCF_INVALID_PARAMS); } -HWTEST_F(EccVerifyTest, EccVerifyTest101, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest101, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -426,7 +427,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest101, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest102, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest102, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -437,7 +438,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest102, TestSize.Level0) verify->base.destroy((HcfObjectBase *)verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest103, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest103, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -450,7 +451,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest103, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest104, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest104, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -463,7 +464,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest104, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest105, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest105, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -478,7 +479,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest105, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest106, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest106, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -493,7 +494,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest106, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest107, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest107, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -508,7 +509,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest107, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest201, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest201, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA1", &verify); @@ -523,7 +524,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest201, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest202, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest202, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA224", &verify); @@ -538,7 +539,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest202, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest203, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest203, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA256", &verify); @@ -553,7 +554,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest203, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest204, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest204, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA384", &verify); @@ -568,7 +569,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest204, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest205, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest205, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA512", &verify); @@ -583,7 +584,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest205, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest206, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest206, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA1", &verify); @@ -598,7 +599,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest206, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest207, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest207, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA224", &verify); @@ -613,7 +614,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest207, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest208, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest208, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -628,7 +629,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest208, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest209, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest209, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA384", &verify); @@ -643,7 +644,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest209, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest210, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest210, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA512", &verify); @@ -658,7 +659,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest210, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest211, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest211, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA1", &verify); @@ -673,7 +674,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest211, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest212, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest212, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA224", &verify); @@ -688,7 +689,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest212, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest213, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest213, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA256", &verify); @@ -703,7 +704,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest213, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest214, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest214, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA384", &verify); @@ -718,7 +719,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest214, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest215, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest215, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA512", &verify); @@ -733,7 +734,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest215, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest216, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest216, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA1", &verify); @@ -748,7 +749,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest216, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest217, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest217, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA224", &verify); @@ -763,7 +764,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest217, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest218, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest218, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA256", &verify); @@ -778,7 +779,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest218, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest219, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest219, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA384", &verify); @@ -793,7 +794,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest219, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest220, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest220, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA512", &verify); @@ -808,7 +809,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest220, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest221, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest221, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -823,7 +824,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest221, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest222, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest222, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -838,7 +839,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest222, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest223, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest223, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -853,7 +854,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest223, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest224, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest224, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -868,7 +869,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest224, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest301, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest301, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA1", &verify); @@ -887,7 +888,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest301, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest302, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest302, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA224", &verify); @@ -906,7 +907,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest302, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest303, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest303, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA256", &verify); @@ -925,7 +926,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest303, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest304, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest304, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA384", &verify); @@ -944,7 +945,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest304, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest305, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest305, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC224|SHA512", &verify); @@ -963,7 +964,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest305, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest306, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest306, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA1", &verify); @@ -982,7 +983,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest306, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest307, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest307, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA224", &verify); @@ -1001,7 +1002,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest307, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest308, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest308, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -1020,7 +1021,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest308, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest309, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest309, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA384", &verify); @@ -1039,7 +1040,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest309, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest310, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest310, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA512", &verify); @@ -1058,7 +1059,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest310, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest311, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest311, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA1", &verify); @@ -1077,7 +1078,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest311, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest312, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest312, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA224", &verify); @@ -1096,7 +1097,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest312, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest313, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest313, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA256", &verify); @@ -1115,7 +1116,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest313, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest314, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest314, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA384", &verify); @@ -1134,7 +1135,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest314, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest315, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest315, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC384|SHA512", &verify); @@ -1153,7 +1154,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest315, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest316, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest316, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA1", &verify); @@ -1172,7 +1173,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest316, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest317, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest317, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA224", &verify); @@ -1191,7 +1192,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest317, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest318, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest318, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA256", &verify); @@ -1210,7 +1211,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest318, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest319, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest319, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA384", &verify); @@ -1229,7 +1230,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest319, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest320, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest320, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC512|SHA512", &verify); @@ -1248,7 +1249,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest320, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest321, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest321, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -1267,7 +1268,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest321, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest322, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest322, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -1286,7 +1287,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest322, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest323, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest323, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -1305,7 +1306,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest323, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest324, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest324, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -1328,7 +1329,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest324, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest325, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest325, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -1351,7 +1352,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest325, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest401, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest401, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA1", &sign); @@ -1400,7 +1401,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest401, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest402, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest402, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA224", &sign); @@ -1449,7 +1450,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest402, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest403, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest403, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA256", &sign); @@ -1498,7 +1499,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest403, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest404, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest404, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA384", &sign); @@ -1547,7 +1548,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest404, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest405, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest405, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA512", &sign); @@ -1596,7 +1597,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest405, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest406, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest406, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA1", &sign); @@ -1645,7 +1646,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest406, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest407, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest407, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA224", &sign); @@ -1694,7 +1695,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest407, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest408, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest408, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -1743,7 +1744,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest408, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest409, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest409, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA384", &sign); @@ -1792,7 +1793,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest409, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest410, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest410, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA512", &sign); @@ -1841,7 +1842,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest410, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest411, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest411, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA1", &sign); @@ -1890,7 +1891,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest411, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest412, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest412, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA224", &sign); @@ -1939,7 +1940,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest412, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest413, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest413, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA256", &sign); @@ -1988,7 +1989,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest413, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest414, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest414, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA384", &sign); @@ -2037,7 +2038,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest414, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest415, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest415, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA512", &sign); @@ -2086,7 +2087,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest415, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest416, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest416, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA1", &sign); @@ -2135,7 +2136,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest416, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest417, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest417, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA224", &sign); @@ -2184,7 +2185,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest417, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest418, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest418, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA256", &sign); @@ -2233,7 +2234,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest418, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest419, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest419, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA384", &sign); @@ -2282,7 +2283,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest419, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest420, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest420, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA512", &sign); @@ -2331,7 +2332,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest420, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest421, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest421, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA1", &sign); @@ -2372,7 +2373,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest421, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest422, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest422, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA224", &sign); @@ -2413,7 +2414,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest422, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest423, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest423, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA256", &sign); @@ -2454,7 +2455,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest423, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest424, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest424, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA384", &sign); @@ -2495,7 +2496,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest424, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest425, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest425, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC224|SHA512", &sign); @@ -2536,7 +2537,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest425, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest426, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest426, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA1", &sign); @@ -2577,7 +2578,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest426, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest427, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest427, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA224", &sign); @@ -2618,7 +2619,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest427, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest428, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest428, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -2659,7 +2660,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest428, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest429, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest429, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA384", &sign); @@ -2700,7 +2701,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest429, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest430, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest430, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA512", &sign); @@ -2741,7 +2742,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest430, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest431, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest431, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA1", &sign); @@ -2782,7 +2783,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest431, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest432, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest432, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA224", &sign); @@ -2823,7 +2824,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest432, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest433, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest433, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA256", &sign); @@ -2864,7 +2865,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest433, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest434, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest434, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA384", &sign); @@ -2905,7 +2906,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest434, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest435, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest435, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC384|SHA512", &sign); @@ -2946,7 +2947,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest435, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest436, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest436, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA1", &sign); @@ -2987,7 +2988,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest436, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest437, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest437, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA224", &sign); @@ -3028,7 +3029,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest437, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest438, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest438, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA256", &sign); @@ -3069,7 +3070,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest438, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest439, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest439, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA384", &sign); @@ -3110,7 +3111,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest439, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest440, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest440, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC512|SHA512", &sign); @@ -3151,7 +3152,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest440, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest441, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest441, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -3200,7 +3201,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest441, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest442, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest442, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -3249,7 +3250,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest442, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest443, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest443, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -3294,7 +3295,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest443, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest444, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest444, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -3343,7 +3344,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest444, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest445, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest445, TestSize.Level0) { HcfSign *sign = NULL; int32_t res = HcfSignCreate("ECC256|SHA256", &sign); @@ -3392,7 +3393,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest445, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest446, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest446, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -3415,7 +3416,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest446, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest447, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest447, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -3442,7 +3443,7 @@ HWTEST_F(EccVerifyTest, EccVerifyTest447, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(EccVerifyTest, EccVerifyTest448, TestSize.Level0) +HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest448, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("ECC256|SHA256", &verify); @@ -3468,3 +3469,4 @@ HWTEST_F(EccVerifyTest, EccVerifyTest448, TestSize.Level0) OH_HCF_ObjDestroy(verify); } +} -- Gitee From 612e1b4054fc79b4313ce50602b3658147b92de5 Mon Sep 17 00:00:00 2001 From: wutiantian <1159609162@qq.com> Date: Tue, 20 Sep 2022 11:14:14 +0800 Subject: [PATCH 09/16] rsa csec Signed-off-by: wutiantian <1159609162@qq.com> --- .../algorithm_parameter/algorithm_parameter.h | 2 - .../common/inc/rsa_openssl_common.h | 3 +- .../rsa/inc/cipher_rsa_openssl.h | 4 +- .../rsa/src/cipher_rsa_openssl.c | 7 +- .../signature/inc/signature_rsa_openssl.h | 3 +- .../signature/src/signature_rsa_openssl.c | 4 +- .../inc/rsa_asy_key_generator_openssl.h | 4 + .../src/rsa_asy_key_generator_openssl.c | 18 ++-- .../src/crypto_rsa_asy_key_generator_test.cpp | 100 ++++++++--------- test/unittest/src/crypto_rsa_cipher_test.cpp | 102 +++++++++--------- test/unittest/src/crypto_rsa_sign_test.cpp | 65 +++++------ test/unittest/src/crypto_rsa_verify_test.cpp | 36 ++++--- 12 files changed, 177 insertions(+), 171 deletions(-) diff --git a/interfaces/innerkits/algorithm_parameter/algorithm_parameter.h b/interfaces/innerkits/algorithm_parameter/algorithm_parameter.h index a1e535c..c0d3dd3 100644 --- a/interfaces/innerkits/algorithm_parameter/algorithm_parameter.h +++ b/interfaces/innerkits/algorithm_parameter/algorithm_parameter.h @@ -16,8 +16,6 @@ #ifndef HCF_ALGORITHM_PARAMETER_H #define HCF_ALGORITHM_PARAMETER_H -#include - /** * @brief Provides an HcfParamsSpec instance. * diff --git a/plugin/openssl_plugin/common/inc/rsa_openssl_common.h b/plugin/openssl_plugin/common/inc/rsa_openssl_common.h index ef07817..009c762 100644 --- a/plugin/openssl_plugin/common/inc/rsa_openssl_common.h +++ b/plugin/openssl_plugin/common/inc/rsa_openssl_common.h @@ -34,5 +34,4 @@ HcfResult DuplicateRsa(const RSA *rsa, bool needPrivate, RSA **dupRsa); #ifdef __cplusplus } #endif - -#endif +#endif \ No newline at end of file diff --git a/plugin/openssl_plugin/crypto_operation/rsa/inc/cipher_rsa_openssl.h b/plugin/openssl_plugin/crypto_operation/rsa/inc/cipher_rsa_openssl.h index e427f38..5684edc 100644 --- a/plugin/openssl_plugin/crypto_operation/rsa/inc/cipher_rsa_openssl.h +++ b/plugin/openssl_plugin/crypto_operation/rsa/inc/cipher_rsa_openssl.h @@ -24,9 +24,7 @@ extern "C" { HcfResult HcfCipherRsaCipherSpiCreate(CipherAttr *params, OH_HCF_CipherGeneratorSpi **generator); - #ifdef __cplusplus } #endif - -#endif +#endif \ No newline at end of file diff --git a/plugin/openssl_plugin/crypto_operation/rsa/src/cipher_rsa_openssl.c b/plugin/openssl_plugin/crypto_operation/rsa/src/cipher_rsa_openssl.c index 69ab3e1..f962461 100644 --- a/plugin/openssl_plugin/crypto_operation/rsa/src/cipher_rsa_openssl.c +++ b/plugin/openssl_plugin/crypto_operation/rsa/src/cipher_rsa_openssl.c @@ -25,7 +25,7 @@ #include "string.h" #include "utils.h" -static const char *EngineGetClass(); +static const char *EngineGetClass(void); typedef struct { OH_HCF_CipherGeneratorSpi super; @@ -60,7 +60,6 @@ static HcfResult CheckCipherInitParams(enum HcfCryptoMode opMode, HcfKey *key) return HCF_SUCCESS; } - static HcfResult DuplicateRsaFromKey(HcfKey *key, enum HcfCryptoMode opMode, RSA **dupRsa) { HcfResult ret = HCF_SUCCESS; @@ -93,7 +92,7 @@ static HcfResult InitEvpPkeyCtx(HcfCipherRsaGeneratorSpiImpl *impl, HcfKey *key, return ret; } EVP_PKEY *pkey = EVP_PKEY_new(); - if (key == NULL) { + if (pkey == NULL) { LOGE("New EVP_PKEY fail."); HcfPrintOpensslError(); return HCF_ERR_CRYPTO_OPERATION; @@ -285,7 +284,7 @@ static void EngineDestroySpiImpl(HcfObjectBase *generator) generator = NULL; } -static const char *EngineGetClass() +static const char *EngineGetClass(void) { return OPENSSL_RSA_CIPHER_CLASS; } diff --git a/plugin/openssl_plugin/crypto_operation/signature/inc/signature_rsa_openssl.h b/plugin/openssl_plugin/crypto_operation/signature/inc/signature_rsa_openssl.h index 331c985..512e588 100644 --- a/plugin/openssl_plugin/crypto_operation/signature/inc/signature_rsa_openssl.h +++ b/plugin/openssl_plugin/crypto_operation/signature/inc/signature_rsa_openssl.h @@ -36,5 +36,4 @@ HcfResult HcfVerifySpiRsaCreate(HcfSignatureParams *params, HcfVerifySpi **retur #ifdef __cplusplus } #endif - -#endif +#endif \ No newline at end of file diff --git a/plugin/openssl_plugin/crypto_operation/signature/src/signature_rsa_openssl.c b/plugin/openssl_plugin/crypto_operation/signature/src/signature_rsa_openssl.c index d8ff234..2393c27 100644 --- a/plugin/openssl_plugin/crypto_operation/signature/src/signature_rsa_openssl.c +++ b/plugin/openssl_plugin/crypto_operation/signature/src/signature_rsa_openssl.c @@ -14,7 +14,7 @@ */ #include "signature_rsa_openssl.h" -#include "string.h" +#include #include #include "algorithm_parameter.h" @@ -53,7 +53,7 @@ typedef struct { InitFlag initFlag; } HcfVerifySpiRsaOpensslImpl; -static const char *GetRsaSignClass() +static const char *GetRsaSignClass(void) { return OPENSSL_RSA_SIGN_CLASS; } diff --git a/plugin/openssl_plugin/key/asy_key_generator/inc/rsa_asy_key_generator_openssl.h b/plugin/openssl_plugin/key/asy_key_generator/inc/rsa_asy_key_generator_openssl.h index d3e029e..2b7a4de 100644 --- a/plugin/openssl_plugin/key/asy_key_generator/inc/rsa_asy_key_generator_openssl.h +++ b/plugin/openssl_plugin/key/asy_key_generator/inc/rsa_asy_key_generator_openssl.h @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifndef HCF_RSA_ASY_KEY_GENERATOR_OPENSSL_H +#define HCF_RSA_ASY_KEY_GENERATOR_OPENSSL_H + #include "asy_key_generator_spi.h" #include "params_parser.h" #include "result.h" @@ -26,3 +29,4 @@ HcfResult HcfAsyKeyGeneratorSpiRsaCreate(HcfAsyKeyGenParams *params, HcfAsyKeyGe #ifdef __cplusplus } #endif +#endif \ No newline at end of file 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 3330b63..ccbd61e 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 @@ -131,17 +131,17 @@ static HcfResult DuplicatePkAndSkFromRSA(const RSA *rsa, RSA **pubKey, RSA **pri return HCF_SUCCESS; } -static const char *GetOpensslPubkeyClass() +static const char *GetOpensslPubkeyClass(void) { return OPENSSL_RSA_PUBKEY_CLASS; } -static const char *GetOpensslPrikeyClass() +static const char *GetOpensslPrikeyClass(void) { return OPENSSL_RSA_PRIKEY_CLASS; } -static const char *GetOpensslKeyPairClass() +static const char *GetOpensslKeyPairClass(void) { return OPENSSL_RSA_KEYPAIR_CLASS; } @@ -282,12 +282,12 @@ static HcfResult GetPriKeyEncoded(HcfKey *self, HcfBlob *returnBlob) return RsaSaveKeyMaterial(impl->sk, impl->bits, returnBlob, true); } -static const char *GetKeyFormat() +static const char *GetKeyFormat(void) { return OPENSSL_RSA_KEY_FORMAT; } -static const char *GetAlgorithm() +static const char *GetAlgorithm(void) { return OPENSSL_RSA_ALGORITHM; } @@ -456,7 +456,7 @@ static HcfResult EngineGenerateKeyPair(HcfAsyKeyGeneratorSpi *self, HcfKeyPair * return GenerateKeyPairByOpenssl(impl->params, keyPair); } -static const char *GetKeyGeneratorClass() +static const char *GetKeyGeneratorClass(void) { return OPENSSL_RSA_GENERATOR_CLASS; } @@ -541,8 +541,10 @@ static HcfResult ParseRsaBnFromBin(const HcfBlob *key, BIGNUM **n, BIGNUM **e, B *d = BN_bin2bn(bufBlob.data, keyMaterial->dSize, NULL); } } while (0); - (void)memset_s(bufBlob.data, bufBlob.len, 0, - (((keyMaterial->keySize) + OPENSSL_BITS_PER_BYTE - 1) / OPENSSL_BITS_PER_BYTE)); + if (memset_s(bufBlob.data, bufBlob.len, 0, + (((keyMaterial->keySize) + OPENSSL_BITS_PER_BYTE - 1) / OPENSSL_BITS_PER_BYTE)) != HCF_SUCCESS) { + LOGE("memset bufBlob fail. possibly leaving sensitive information."); + } HcfFree(bufBlob.data); return ret; } diff --git a/test/unittest/src/crypto_rsa_asy_key_generator_test.cpp b/test/unittest/src/crypto_rsa_asy_key_generator_test.cpp index f0c9eea..56d3723 100644 --- a/test/unittest/src/crypto_rsa_asy_key_generator_test.cpp +++ b/test/unittest/src/crypto_rsa_asy_key_generator_test.cpp @@ -23,7 +23,8 @@ using namespace std; using namespace testing::ext; -class RsaAsyKeyGeneratorTest : public testing::Test { +namespace { +class CryptoCryptoRsaAsyKeyGeneratorTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -31,13 +32,13 @@ public: void TearDown(); }; -void RsaAsyKeyGeneratorTest::SetUpTestCase() {} -void RsaAsyKeyGeneratorTest::TearDownTestCase() {} -void RsaAsyKeyGeneratorTest::SetUp() {} -void RsaAsyKeyGeneratorTest::TearDown() {} +void CryptoCryptoRsaAsyKeyGeneratorTest::SetUpTestCase() {} +void CryptoCryptoRsaAsyKeyGeneratorTest::TearDownTestCase() {} +void CryptoCryptoRsaAsyKeyGeneratorTest::SetUp() {} +void CryptoCryptoRsaAsyKeyGeneratorTest::TearDown() {} // HcfAsyKeyGeneratorCreate correct case: no primes -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest100, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest100, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA512", &generator); @@ -50,7 +51,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest100, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest110, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest110, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA768", &generator); @@ -63,7 +64,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest110, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest120, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest120, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024", &generator); @@ -77,7 +78,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest120, TestSize.Level0) } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest130, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest130, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA2048", &generator); @@ -90,7 +91,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest130, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest140, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest140, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA3072", &generator); @@ -103,7 +104,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest140, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest150, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest150, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA4096", &generator); @@ -117,7 +118,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest150, TestSize.Level0) } // HcfAsyKeyGeneratorCreate correct case: with primes -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest200, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest200, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA512|PRIMES_2", &generator); @@ -130,7 +131,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest200, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest210, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest210, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA768|PRIMES_2", &generator); @@ -143,7 +144,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest210, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest220, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest220, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024|PRIMES_2", &generator); @@ -156,7 +157,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest220, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest230, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest230, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024|PRIMES_3", &generator); @@ -169,7 +170,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest230, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest240, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest240, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA2048|PRIMES_2", &generator); @@ -182,7 +183,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest240, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest250, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest250, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA2048|PRIMES_3", &generator); @@ -195,7 +196,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest250, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest260, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest260, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA3072|PRIMES_3", &generator); @@ -208,7 +209,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest260, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest270, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest270, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA4096|PRIMES_4", &generator); @@ -222,7 +223,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest270, TestSize.Level0) } // HcfAsyKeyGeneratorCreate Incorrect case : algname is null -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest300, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest300, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate(NULL, &generator); @@ -231,7 +232,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest300, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest310, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest310, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("111111111111111111111111111111111111111111111111111111111111111111111111" @@ -241,13 +242,13 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest310, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest320, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest320, TestSize.Level0) { HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024", NULL); EXPECT_NE(res, HCF_SUCCESS); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest330, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest330, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA12315", &generator); @@ -256,7 +257,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest330, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest340, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest340, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA512|PRIMES_777", &generator); @@ -265,7 +266,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest340, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest350, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest350, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA512|PRIMES_3", &generator); @@ -274,7 +275,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest350, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest360, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest360, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA768|PRIMES_3", &generator); @@ -283,7 +284,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest360, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest370, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest370, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024|PRIMES_4", &generator); @@ -292,7 +293,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest370, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest380, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest380, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA3072|PRIMES_4", &generator); @@ -301,7 +302,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest380, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest390, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest390, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA4096|PRIMES_5", &generator); @@ -310,7 +311,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest390, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest400, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest400, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024", &generator); @@ -321,13 +322,13 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest400, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest410, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest410, TestSize.Level0) { OH_HCF_ObjDestroy(NULL); } // generateKeyPair correct case -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest500, TestSize.Level0) +HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest500, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024|PRIMES_2", &generator); @@ -359,7 +360,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest500, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest510, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest510, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA2048|PRIMES_2", &generator); @@ -392,7 +393,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest510, TestSize.Level0) } // generateKeyPair conrrect case: use getEncode encode pubkey and prikey -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest520, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest520, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024", &generator); @@ -433,7 +434,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest520, TestSize.Level0) } // generateKeyPair correct case: getEncode encode pubkey -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest530, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest530, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024", &generator); @@ -463,7 +464,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest530, TestSize.Level0) } // generateKeyPair correct case: getEncode encode prikey -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest540, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest540, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024", &generator); @@ -494,7 +495,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest540, TestSize.Level0) OH_HCF_ObjDestroy(dupKeyPair); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest550, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest550, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA3072", &generator); @@ -534,7 +535,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest550, TestSize.Level0) OH_HCF_ObjDestroy(dupKeyPair); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest560, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest560, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA4096", &generator); @@ -574,7 +575,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest560, TestSize.Level0) OH_HCF_ObjDestroy(dupKeyPair); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest570, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest570, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA512", &generator); @@ -614,7 +615,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest570, TestSize.Level0) OH_HCF_ObjDestroy(dupKeyPair); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest580, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest580, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA768", &generator); @@ -655,7 +656,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest580, TestSize.Level0) } // generateKeyPair incorrect case: user wrong ECC class, ignore in this version -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest600, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest600, TestSize.Level0) { HcfAsyKeyGenerator *eccGenerator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("ECC224", &eccGenerator); @@ -676,7 +677,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest600, TestSize.Level0) } // generateKeyPair incorrect case: generator class is null -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest610, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest610, TestSize.Level0) { HcfAsyKeyGenerator *rsaGenerator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024", &rsaGenerator); @@ -692,7 +693,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest610, TestSize.Level0) } // generateKeyPair incorrect case: keypair is null -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest620, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest620, TestSize.Level0) { HcfAsyKeyGenerator *rsaGenerator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024", &rsaGenerator); @@ -706,7 +707,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest620, TestSize.Level0) } // convertKey correct case -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest700, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest700, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA2048", &generator); @@ -747,7 +748,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest700, TestSize.Level0) } // convertKey incorrect case: input ECC class -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest710, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest710, TestSize.Level0) { HcfAsyKeyGenerator *eccGenerator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("ECC224", &eccGenerator); @@ -770,7 +771,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest710, TestSize.Level0) // convertKey incorrect case: input null generator -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest720, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest720, TestSize.Level0) { HcfAsyKeyGenerator *rsaGenerator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024", &rsaGenerator); @@ -799,7 +800,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest720, TestSize.Level0) } // convertKey incorrect case: input null dupkeypair -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest730, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest730, TestSize.Level0) { HcfAsyKeyGenerator *rsaGenerator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024", &rsaGenerator); @@ -828,7 +829,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest730, TestSize.Level0) } // Incorrect case: use wrong bits or primes -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest800, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest800, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1111", &generator); @@ -837,7 +838,7 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest800, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest810, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest810, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024|Primessf", &generator); @@ -845,3 +846,4 @@ HWTEST_F(RsaAsyKeyGeneratorTest, RsaAsyKeyGeneratorTest810, TestSize.Level0) EXPECT_EQ(generator, nullptr); OH_HCF_ObjDestroy(generator); } +} \ No newline at end of file diff --git a/test/unittest/src/crypto_rsa_cipher_test.cpp b/test/unittest/src/crypto_rsa_cipher_test.cpp index 32d8243..28848e2 100644 --- a/test/unittest/src/crypto_rsa_cipher_test.cpp +++ b/test/unittest/src/crypto_rsa_cipher_test.cpp @@ -24,7 +24,8 @@ using namespace std; using namespace testing::ext; -class RsaCipherTest : public testing::Test { +namespace { +class CryptoRsaCipherTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -32,13 +33,13 @@ public: void TearDown(); }; -void RsaCipherTest::SetUpTestCase() {} -void RsaCipherTest::TearDownTestCase() {} -void RsaCipherTest::SetUp() {} -void RsaCipherTest::TearDown() {} +void CryptoRsaCipherTest::SetUpTestCase() {} +void CryptoRsaCipherTest::TearDownTestCase() {} +void CryptoRsaCipherTest::SetUp() {} +void CryptoRsaCipherTest::TearDown() {} // HcfCipherCreate correct case: RSAXXX + padding -HWTEST_F(RsaCipherTest, RsaCipherTest100, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest100, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -53,7 +54,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest100, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest110, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest110, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -68,7 +69,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest110, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest120, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest120, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -83,7 +84,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest120, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest130, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest130, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -98,7 +99,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest130, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest140, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest140, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -113,7 +114,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest140, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest150, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest150, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -128,7 +129,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest150, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest160, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest160, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -143,7 +144,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest160, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest170, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest170, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -158,7 +159,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest170, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest180, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest180, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -173,7 +174,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest180, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest190, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest190, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -188,7 +189,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest190, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest200, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest200, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -203,7 +204,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest200, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest210, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest210, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -218,7 +219,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest210, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest220, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest220, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -233,7 +234,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest220, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest230, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest230, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -248,7 +249,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest230, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest240, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest240, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -263,7 +264,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest240, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest250, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest250, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -278,7 +279,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest250, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest260, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest260, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -293,7 +294,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest260, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest270, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest270, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -308,7 +309,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest270, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest280, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest280, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -325,14 +326,14 @@ HWTEST_F(RsaCipherTest, RsaCipherTest280, TestSize.Level0) // HcfCipherCreate Incorrect case -HWTEST_F(RsaCipherTest, RsaCipherTest300, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest300, TestSize.Level0) { HcfResult res = HCF_SUCCESS; res = HcfCipherCreate("RSA2048|PKCS1_OAEP|SHA256|MGF1_SHA256", NULL); EXPECT_NE(res, HCF_SUCCESS); } -HWTEST_F(RsaCipherTest, RsaCipherTest310, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest310, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -341,7 +342,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest310, TestSize.Level0) EXPECT_EQ(cipher, nullptr); } -HWTEST_F(RsaCipherTest, RsaCipherTest320, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest320, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -351,7 +352,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest320, TestSize.Level0) EXPECT_EQ(cipher, nullptr); } -HWTEST_F(RsaCipherTest, RsaCipherTest330, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest330, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -360,7 +361,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest330, TestSize.Level0) EXPECT_EQ(cipher, nullptr); } -HWTEST_F(RsaCipherTest, RsaCipherTest340, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest340, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -369,7 +370,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest340, TestSize.Level0) EXPECT_EQ(cipher, nullptr); } -HWTEST_F(RsaCipherTest, RsaCipherTest350, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest350, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -378,7 +379,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest350, TestSize.Level0) EXPECT_EQ(cipher, nullptr); } -HWTEST_F(RsaCipherTest, RsaCipherTest360, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest360, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -388,7 +389,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest360, TestSize.Level0) } // destroyCipher -HWTEST_F(RsaCipherTest, RsaCipherTest400, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest400, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -401,7 +402,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest400, TestSize.Level0) } // init correct case -HWTEST_F(RsaCipherTest, RsaCipherTest500, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest500, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfAsyKeyGenerator *generator = NULL; @@ -422,7 +423,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest500, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest510, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest510, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfAsyKeyGenerator *generator = NULL; @@ -444,7 +445,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest510, TestSize.Level0) } // init incorrect case -HWTEST_F(RsaCipherTest, RsaCipherTest600, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest600, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfAsyKeyGenerator *generator = NULL; @@ -465,7 +466,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest600, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest610, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest610, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfAsyKeyGenerator *generator = NULL; @@ -486,7 +487,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest610, TestSize.Level0) OH_HCF_ObjDestroy(cipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest620, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest620, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfAsyKeyGenerator *generator = NULL; @@ -508,7 +509,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest620, TestSize.Level0) } // incorrect case: use diff class, we ignore it in this version -HWTEST_F(RsaCipherTest, RsaCipherTest630, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest630, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfAsyKeyGenerator *generator = NULL; @@ -534,7 +535,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest630, TestSize.Level0) OH_HCF_ObjDestroy(aesCipher); } -HWTEST_F(RsaCipherTest, RsaCipherTest640, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest640, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfCipher *cipher = NULL; @@ -546,7 +547,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest640, TestSize.Level0) } // correct case: update not support -HWTEST_F(RsaCipherTest, RsaCipherTest700, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest700, TestSize.Level0) { uint8_t plan[] = "this is rsa cipher test!\0"; HcfResult res = HCF_SUCCESS; @@ -574,7 +575,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest700, TestSize.Level0) } // dofinal correct case -HWTEST_F(RsaCipherTest, RsaCipherTest800, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest800, TestSize.Level0) { HcfResult res = HCF_SUCCESS; uint8_t plan[] = "this is rsa cipher test!\0"; @@ -618,7 +619,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest800, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaCipherTest, RsaCipherTest810, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest810, TestSize.Level0) { HcfResult res = HCF_SUCCESS; uint8_t plan[] = "this is rsa cipher test!\0"; @@ -662,7 +663,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest810, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaCipherTest, RsaCipherTest820, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest820, TestSize.Level0) { HcfResult res = HCF_SUCCESS; uint8_t plan[] = "this is rsa cipher test!\0"; @@ -707,7 +708,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest820, TestSize.Level0) } // incorrect case: algName out of boundary -HWTEST_F(RsaCipherTest, RsaCipherTest830, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest830, TestSize.Level0) { HcfResult res = HCF_SUCCESS; uint8_t plan[] = "this is rsa cipher test aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" @@ -754,7 +755,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest830, TestSize.Level0) // Incorrect case: use OAEP pading without mgf1md -HWTEST_F(RsaCipherTest, RsaCipherTest840, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest840, TestSize.Level0) { HcfResult res = HCF_SUCCESS; @@ -773,7 +774,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest840, TestSize.Level0) } // Incorrect case: use OAEP pading without md -HWTEST_F(RsaCipherTest, RsaCipherTest845, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest845, TestSize.Level0) { HcfResult res = HCF_SUCCESS; @@ -792,7 +793,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest845, TestSize.Level0) } // Correct case: test genEncoded and convert key -HWTEST_F(RsaCipherTest, RsaCipherTest850, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest850, TestSize.Level0) { uint8_t plan[] = "this is rsa cipher test!\0"; HcfAsyKeyGenerator *generator = NULL; @@ -849,7 +850,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest850, TestSize.Level0) // correct case: test OAEP Plaintext boundary: // RSA_size - (md_result_len * mgf1md_result_len) - 2 = 128 - (32 + 32) - 2 = 62 -HWTEST_F(RsaCipherTest, RsaCipherTest860, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest860, TestSize.Level0) { HcfResult res = HCF_SUCCESS; uint8_t plan1[] = "00112233445566778899aabbccddeeff0aaaaaaaaaaaaaaaaaaaaaaaaaa"; @@ -895,7 +896,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest860, TestSize.Level0) } // correct case: test nopadding boundary < RSA_size(rsa) -HWTEST_F(RsaCipherTest, RsaCipherTest870, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest870, TestSize.Level0) { HcfResult res = HCF_SUCCESS; uint8_t plan1[] = "00112233445566778899aabbccddeeff00112233445566778899aabbccddeeffasdasdbccddeeff0011223344556600" @@ -940,7 +941,7 @@ HWTEST_F(RsaCipherTest, RsaCipherTest870, TestSize.Level0) } // correct case: test PKCS1 boundary < RSA_size(rsa) - 11 -HWTEST_F(RsaCipherTest, RsaCipherTest880, TestSize.Level0) +HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest880, TestSize.Level0) { HcfResult res = HCF_SUCCESS; uint8_t plan1[] = "00112233445566778899aabbccddeeff00112233445566778899aabbccddeeffasdasdbccddeeff0011223344556600" @@ -982,3 +983,4 @@ HWTEST_F(RsaCipherTest, RsaCipherTest880, TestSize.Level0) OH_HCF_ObjDestroy(keyPair); OH_HCF_ObjDestroy(generator); } +} diff --git a/test/unittest/src/crypto_rsa_sign_test.cpp b/test/unittest/src/crypto_rsa_sign_test.cpp index 5fb5d69..20b24c8 100644 --- a/test/unittest/src/crypto_rsa_sign_test.cpp +++ b/test/unittest/src/crypto_rsa_sign_test.cpp @@ -24,7 +24,8 @@ using namespace std; using namespace testing::ext; -class RsaSignTest : public testing::Test { +namespace { +class CryptoRsaSignTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -32,13 +33,13 @@ public: void TearDown(); }; -void RsaSignTest::SetUp() {} -void RsaSignTest::TearDown() {} -void RsaSignTest::SetUpTestCase() {} -void RsaSignTest::TearDownTestCase() {} +void CryptoRsaSignTest::SetUp() {} +void CryptoRsaSignTest::TearDown() {} +void CryptoRsaSignTest::SetUpTestCase() {} +void CryptoRsaSignTest::TearDownTestCase() {} // HcfSignCreate correct_case -HWTEST_F(RsaSignTest, RsaSignTest100, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest100, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfSign *sign = NULL; @@ -53,7 +54,7 @@ HWTEST_F(RsaSignTest, RsaSignTest100, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(RsaSignTest, RsaSignTest110, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest110, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfSign *sign = NULL; @@ -68,7 +69,7 @@ HWTEST_F(RsaSignTest, RsaSignTest110, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(RsaSignTest, RsaSignTest120, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest120, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfSign *sign = NULL; @@ -83,7 +84,7 @@ HWTEST_F(RsaSignTest, RsaSignTest120, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(RsaSignTest, RsaSignTest130, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest130, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfSign *sign = NULL; @@ -98,7 +99,7 @@ HWTEST_F(RsaSignTest, RsaSignTest130, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(RsaSignTest, RsaSignTest140, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest140, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfSign *sign = NULL; @@ -113,7 +114,7 @@ HWTEST_F(RsaSignTest, RsaSignTest140, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(RsaSignTest, RsaSignTest150, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest150, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfSign *sign = NULL; @@ -128,7 +129,7 @@ HWTEST_F(RsaSignTest, RsaSignTest150, TestSize.Level0) OH_HCF_ObjDestroy(sign); } -HWTEST_F(RsaSignTest, RsaSignTest160, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest160, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfSign *sign = NULL; @@ -144,7 +145,7 @@ HWTEST_F(RsaSignTest, RsaSignTest160, TestSize.Level0) } // HcfSignCreate Incorrect case -HWTEST_F(RsaSignTest, RsaSignTest200, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest200, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfSign *sign = NULL; @@ -153,7 +154,7 @@ HWTEST_F(RsaSignTest, RsaSignTest200, TestSize.Level0) EXPECT_EQ(sign, nullptr); } -HWTEST_F(RsaSignTest, RsaSignTest210, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest210, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfSign *sign = NULL; @@ -162,7 +163,7 @@ HWTEST_F(RsaSignTest, RsaSignTest210, TestSize.Level0) EXPECT_EQ(sign, nullptr); } -HWTEST_F(RsaSignTest, RsaSignTest220, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest220, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfSign *sign = NULL; @@ -172,7 +173,7 @@ HWTEST_F(RsaSignTest, RsaSignTest220, TestSize.Level0) EXPECT_EQ(sign, nullptr); } -HWTEST_F(RsaSignTest, RsaSignTest230, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest230, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfSign *sign = NULL; @@ -181,7 +182,7 @@ HWTEST_F(RsaSignTest, RsaSignTest230, TestSize.Level0) EXPECT_EQ(sign, nullptr); } -HWTEST_F(RsaSignTest, RsaSignTest240, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest240, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfSign *sign = NULL; @@ -190,7 +191,7 @@ HWTEST_F(RsaSignTest, RsaSignTest240, TestSize.Level0) EXPECT_EQ(sign, nullptr); } -HWTEST_F(RsaSignTest, RsaSignTest250, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest250, TestSize.Level0) { HcfResult res = HCF_SUCCESS; HcfSign *sign = NULL; @@ -199,7 +200,7 @@ HWTEST_F(RsaSignTest, RsaSignTest250, TestSize.Level0) EXPECT_EQ(sign, nullptr); } -HWTEST_F(RsaSignTest, RsaSignTest260, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest260, TestSize.Level0) { HcfResult res = HCF_SUCCESS; res = HcfSignCreate("RSA1024|PSS|SHA256aa|MGF1_SHA256", NULL); @@ -207,7 +208,7 @@ HWTEST_F(RsaSignTest, RsaSignTest260, TestSize.Level0) } // correct case: sign and update -HWTEST_F(RsaSignTest, RsaSignTest300, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest300, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test."; HcfAsyKeyGenerator *generator = NULL; @@ -232,7 +233,7 @@ HWTEST_F(RsaSignTest, RsaSignTest300, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaSignTest, RsaSignTest310, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest310, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test."; HcfAsyKeyGenerator *generator = NULL; @@ -257,7 +258,7 @@ HWTEST_F(RsaSignTest, RsaSignTest310, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaSignTest, RsaSignTest320, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest320, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test."; HcfAsyKeyGenerator *generator = NULL; @@ -282,7 +283,7 @@ HWTEST_F(RsaSignTest, RsaSignTest320, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaSignTest, RsaSignTest330, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest330, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test."; HcfAsyKeyGenerator *generator = NULL; @@ -307,7 +308,7 @@ HWTEST_F(RsaSignTest, RsaSignTest330, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaSignTest, RsaSignTest340, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest340, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test."; HcfAsyKeyGenerator *generator = NULL; @@ -332,7 +333,7 @@ HWTEST_F(RsaSignTest, RsaSignTest340, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaSignTest, RsaSignTest350, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest350, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test."; HcfAsyKeyGenerator *generator = NULL; @@ -357,7 +358,7 @@ HWTEST_F(RsaSignTest, RsaSignTest350, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaSignTest, RsaSignTest360, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest360, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test."; HcfAsyKeyGenerator *generator = NULL; @@ -382,7 +383,7 @@ HWTEST_F(RsaSignTest, RsaSignTest360, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaSignTest, RsaSignTest370, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest370, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test."; HcfAsyKeyGenerator *generator = NULL; @@ -407,7 +408,7 @@ HWTEST_F(RsaSignTest, RsaSignTest370, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaSignTest, RsaSignTest380, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest380, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test."; HcfAsyKeyGenerator *generator = NULL; @@ -432,7 +433,7 @@ HWTEST_F(RsaSignTest, RsaSignTest380, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaSignTest, RsaSignTest390, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest390, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test."; HcfAsyKeyGenerator *generator = NULL; @@ -457,7 +458,7 @@ HWTEST_F(RsaSignTest, RsaSignTest390, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaSignTest, RsaSignTest400, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest400, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test."; HcfAsyKeyGenerator *generator = NULL; @@ -482,7 +483,7 @@ HWTEST_F(RsaSignTest, RsaSignTest400, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaSignTest, RsaSignTest410, TestSize.Level0) +HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest410, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test."; HcfAsyKeyGenerator *generator = NULL; @@ -506,4 +507,4 @@ HWTEST_F(RsaSignTest, RsaSignTest410, TestSize.Level0) OH_HCF_ObjDestroy(keyPair); OH_HCF_ObjDestroy(generator); } - +} diff --git a/test/unittest/src/crypto_rsa_verify_test.cpp b/test/unittest/src/crypto_rsa_verify_test.cpp index f7e1f40..814b88c 100644 --- a/test/unittest/src/crypto_rsa_verify_test.cpp +++ b/test/unittest/src/crypto_rsa_verify_test.cpp @@ -25,7 +25,8 @@ using namespace std; using namespace testing::ext; -class RsaVerifyTest : public testing::Test { +namespace { +class CryptoRsaVerifyTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -33,12 +34,12 @@ public: void TearDown(); }; -void RsaVerifyTest::SetUp() {} -void RsaVerifyTest::TearDown() {} -void RsaVerifyTest::SetUpTestCase() {} -void RsaVerifyTest::TearDownTestCase() {} +void CryptoRsaVerifyTest::SetUp() {} +void CryptoRsaVerifyTest::TearDown() {} +void CryptoRsaVerifyTest::SetUpTestCase() {} +void CryptoRsaVerifyTest::TearDownTestCase() {} -HWTEST_F(RsaVerifyTest, RsaVerifyTest100, TestSize.Level0) +HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest100, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("RSA1024|PSS|SHA256", &verify); @@ -48,7 +49,7 @@ HWTEST_F(RsaVerifyTest, RsaVerifyTest100, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(RsaVerifyTest, RsaVerifyTest110, TestSize.Level0) +HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest110, TestSize.Level0) { HcfVerify *verify = NULL; int32_t res = HcfVerifyCreate("RSA1024|PSS|SHA256|MGF1_SHA256", &verify); @@ -58,7 +59,7 @@ HWTEST_F(RsaVerifyTest, RsaVerifyTest110, TestSize.Level0) OH_HCF_ObjDestroy(verify); } -HWTEST_F(RsaVerifyTest, RsaVerifyTest200, TestSize.Level0) +HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest200, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test."; HcfAsyKeyGenerator *generator = NULL; @@ -93,7 +94,7 @@ HWTEST_F(RsaVerifyTest, RsaVerifyTest200, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaVerifyTest, RsaVerifyTest210, TestSize.Level0) +HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest210, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa."; @@ -131,7 +132,7 @@ HWTEST_F(RsaVerifyTest, RsaVerifyTest210, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaVerifyTest, RsaVerifyTest220, TestSize.Level0) +HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest220, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa."; @@ -169,7 +170,7 @@ HWTEST_F(RsaVerifyTest, RsaVerifyTest220, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaVerifyTest, RsaVerifyTest230, TestSize.Level0) +HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest230, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa."; @@ -207,7 +208,7 @@ HWTEST_F(RsaVerifyTest, RsaVerifyTest230, TestSize.Level0) OH_HCF_ObjDestroy(generator); } -HWTEST_F(RsaVerifyTest, RsaVerifyTest240, TestSize.Level0) +HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest240, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa."; @@ -248,7 +249,7 @@ HWTEST_F(RsaVerifyTest, RsaVerifyTest240, TestSize.Level0) } // Incorrect case: different mode -HWTEST_F(RsaVerifyTest, RsaVerifyTest250, TestSize.Level0) +HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest250, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa."; @@ -287,7 +288,7 @@ HWTEST_F(RsaVerifyTest, RsaVerifyTest250, TestSize.Level0) } // Incorrect case: different mgf1md -HWTEST_F(RsaVerifyTest, RsaVerifyTest260, TestSize.Level0) +HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest260, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa."; @@ -327,7 +328,7 @@ HWTEST_F(RsaVerifyTest, RsaVerifyTest260, TestSize.Level0) // Incorrect case: different pkcs1 md, verifu fail -HWTEST_F(RsaVerifyTest, RsaVerifyTest270, TestSize.Level0) +HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest270, TestSize.Level0) { uint8_t plan[] = "this is rsa verify test aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa."; @@ -366,7 +367,7 @@ HWTEST_F(RsaVerifyTest, RsaVerifyTest270, TestSize.Level0) } // check update_func in PSS padding -HWTEST_F(RsaVerifyTest, RsaVerifyTest280, TestSize.Level0) +HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest280, TestSize.Level0) { uint8_t plan1[] = "this is rsa verify test plane1 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa."; @@ -413,7 +414,7 @@ HWTEST_F(RsaVerifyTest, RsaVerifyTest280, TestSize.Level0) } // check update in PKCS1 padding -HWTEST_F(RsaVerifyTest, RsaVerifyTest290, TestSize.Level0) +HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest290, TestSize.Level0) { uint8_t plan1[] = "this is rsa verify test plane1 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa."; @@ -466,3 +467,4 @@ HWTEST_F(RsaVerifyTest, RsaVerifyTest290, TestSize.Level0) OH_HCF_ObjDestroy(keyPair); OH_HCF_ObjDestroy(generator); } +} -- Gitee From e55203943d754f20b850f3615d44d205140bc0d9 Mon Sep 17 00:00:00 2001 From: winnie-hu Date: Mon, 19 Sep 2022 23:17:51 +0800 Subject: [PATCH 10/16] fix cert csec Signed-off-by: winnie-hu --- frameworks/certificate/cert_chain_validator.c | 2 +- .../js/napi/inc/napi_cert_chain_validator.h | 2 - .../napi/inc/napi_crypto_framework_defines.h | 1 - .../js/napi/inc/napi_x509_certificate.h | 8 +- frameworks/js/napi/inc/napi_x509_crl.h | 2 - frameworks/js/napi/inc/napi_x509_crl_entry.h | 2 - .../js/napi/src/napi_cert_chain_validator.cpp | 2 - frameworks/js/napi/src/napi_init.cpp | 2 +- .../js/napi/src/napi_x509_certificate.cpp | 100 +++++---- frameworks/js/napi/src/napi_x509_crl.cpp | 6 +- .../js/napi/src/napi_x509_crl_entry.cpp | 2 - .../inc/x509_cert_chain_validator_openssl.h | 5 +- .../inc/x509_certificate_openssl.h | 4 +- .../certificate/inc/x509_crl_entry_openssl.h | 6 +- .../certificate/inc/x509_crl_openssl.h | 6 +- test/unittest/BUILD.gn | 2 +- ...crypto_x509_cert_chain_validator_test.cpp} | 20 +- .../src/crypto_x509_certificate_test.cpp | 106 +++++----- test/unittest/src/crypto_x509_crl_test.cpp | 198 +++++++++--------- 19 files changed, 232 insertions(+), 244 deletions(-) rename test/unittest/src/{x509_cert_chain_validator_test.cpp => crypto_x509_cert_chain_validator_test.cpp} (95%) diff --git a/frameworks/certificate/cert_chain_validator.c b/frameworks/certificate/cert_chain_validator.c index d10427a..0c9e1fa 100644 --- a/frameworks/certificate/cert_chain_validator.c +++ b/frameworks/certificate/cert_chain_validator.c @@ -62,7 +62,7 @@ static const HcfCertChainValidatorFuncSet *FindAbility(const char *algorithm) return NULL; } -static const char *GetCertChainValidatorClass() +static const char *GetCertChainValidatorClass(void) { return "HcfCertChainValidator"; } diff --git a/frameworks/js/napi/inc/napi_cert_chain_validator.h b/frameworks/js/napi/inc/napi_cert_chain_validator.h index a31fcaa..b31d7cf 100644 --- a/frameworks/js/napi/inc/napi_cert_chain_validator.h +++ b/frameworks/js/napi/inc/napi_cert_chain_validator.h @@ -24,7 +24,6 @@ namespace OHOS { namespace CryptoFramework { - class NapiCertChainValidator { public: NapiCertChainValidator(HcfCertChainValidator *certChainValidator); @@ -45,7 +44,6 @@ public: private: HcfCertChainValidator *certChainValidator_ = nullptr; }; - } // namespace CryptoFramework } // namespace OHOS diff --git a/frameworks/js/napi/inc/napi_crypto_framework_defines.h b/frameworks/js/napi/inc/napi_crypto_framework_defines.h index 544ce6f..f9fb9b7 100644 --- a/frameworks/js/napi/inc/napi_crypto_framework_defines.h +++ b/frameworks/js/napi/inc/napi_crypto_framework_defines.h @@ -66,7 +66,6 @@ enum CfAsyncType { ASYNC_TYPE_CALLBACK = 1, ASYNC_TYPE_PROMISE = 2 }; - } // namespace CryptoFramework } // namespace OHOS diff --git a/frameworks/js/napi/inc/napi_x509_certificate.h b/frameworks/js/napi/inc/napi_x509_certificate.h index e8b9bb2..1200e80 100644 --- a/frameworks/js/napi/inc/napi_x509_certificate.h +++ b/frameworks/js/napi/inc/napi_x509_certificate.h @@ -24,11 +24,10 @@ namespace OHOS { namespace CryptoFramework { - -class NapiX509Cert { +class NapiX509Certificate { public: - NapiX509Cert(HcfX509Certificate *x509Cert); - ~NapiX509Cert(); + NapiX509Certificate(HcfX509Certificate *x509Cert); + ~NapiX509Certificate(); static void DefineX509CertJSClass(napi_env env, napi_value exports); static napi_value NapiCreateX509Cert(napi_env env, napi_callback_info info); @@ -68,7 +67,6 @@ public: private: HcfX509Certificate *x509Cert_ = nullptr; }; - } // namespace CryptoFramework } // namespace OHOS diff --git a/frameworks/js/napi/inc/napi_x509_crl.h b/frameworks/js/napi/inc/napi_x509_crl.h index dceb319..fdc0c7c 100644 --- a/frameworks/js/napi/inc/napi_x509_crl.h +++ b/frameworks/js/napi/inc/napi_x509_crl.h @@ -24,7 +24,6 @@ namespace OHOS { namespace CryptoFramework { - class NapiX509Crl { public: NapiX509Crl(HcfX509Crl *x509Crl); @@ -63,7 +62,6 @@ public: private: HcfX509Crl *x509Crl_ = nullptr; }; - } // namespace CryptoFramework } // namespace OHOS diff --git a/frameworks/js/napi/inc/napi_x509_crl_entry.h b/frameworks/js/napi/inc/napi_x509_crl_entry.h index 658908f..6a80a98 100644 --- a/frameworks/js/napi/inc/napi_x509_crl_entry.h +++ b/frameworks/js/napi/inc/napi_x509_crl_entry.h @@ -24,7 +24,6 @@ namespace OHOS { namespace CryptoFramework { - class NapiX509CrlEntry { public: NapiX509CrlEntry(HcfX509CrlEntry *x509CrlEntry); @@ -49,7 +48,6 @@ public: private: HcfX509CrlEntry *x509CrlEntry_ = nullptr; }; - } // namespace CryptoFramework } // namespace OHOS diff --git a/frameworks/js/napi/src/napi_cert_chain_validator.cpp b/frameworks/js/napi/src/napi_cert_chain_validator.cpp index e1c58f7..ea223ce 100644 --- a/frameworks/js/napi/src/napi_cert_chain_validator.cpp +++ b/frameworks/js/napi/src/napi_cert_chain_validator.cpp @@ -27,7 +27,6 @@ namespace OHOS { namespace CryptoFramework { - napi_ref NapiCertChainValidator::classRef_ = nullptr; struct CfCtx { @@ -262,6 +261,5 @@ void NapiCertChainValidator::DefineCertChainValidatorJSClass(napi_env env, napi_ sizeof(validatorDesc) / sizeof(validatorDesc[0]), validatorDesc, &constructor); napi_create_reference(env, constructor, 1, &classRef_); } - } // namespace CryptoFramework } // namespace OHOS \ No newline at end of file diff --git a/frameworks/js/napi/src/napi_init.cpp b/frameworks/js/napi/src/napi_init.cpp index dd31ca1..d9ceede 100644 --- a/frameworks/js/napi/src/napi_init.cpp +++ b/frameworks/js/napi/src/napi_init.cpp @@ -134,7 +134,7 @@ static napi_value ModuleExport(napi_env env, napi_value exports) NapiCipher::DefineCipherJSClass(env, exports); NapiSymKey::DefineSymKeyJSClass(env); NapiKey::DefineHcfKeyJSClass(env); - NapiX509Cert::DefineX509CertJSClass(env, exports); + NapiX509Certificate::DefineX509CertJSClass(env, exports); NapiX509CrlEntry::DefineX509CrlEntryJSClass(env); NapiX509Crl::DefineX509CrlJSClass(env, exports); LOGI("module init end."); diff --git a/frameworks/js/napi/src/napi_x509_certificate.cpp b/frameworks/js/napi/src/napi_x509_certificate.cpp index 3e24823..32cd395 100644 --- a/frameworks/js/napi/src/napi_x509_certificate.cpp +++ b/frameworks/js/napi/src/napi_x509_certificate.cpp @@ -28,8 +28,7 @@ namespace OHOS { namespace CryptoFramework { - -napi_ref NapiX509Cert::classRef_ = nullptr; +napi_ref NapiX509Certificate::classRef_ = nullptr; struct CfCtx { CfAsyncType asyncType = ASYNC_TYPE_CALLBACK; @@ -39,7 +38,7 @@ struct CfCtx { napi_async_work asyncWork = nullptr; HcfEncodingBlob *encodingBlob = nullptr; - NapiX509Cert *certClass = nullptr; + NapiX509Certificate *certClass = nullptr; HcfPubKey *pubKey = nullptr; std::string date; @@ -50,12 +49,12 @@ struct CfCtx { HcfPubKey *returnPubKey = nullptr; }; -NapiX509Cert::NapiX509Cert(HcfX509Certificate *x509Cert) +NapiX509Certificate::NapiX509Certificate(HcfX509Certificate *x509Cert) { this->x509Cert_ = x509Cert; } -NapiX509Cert::~NapiX509Cert() +NapiX509Certificate::~NapiX509Certificate() { OH_HCF_ObjDestroy(this->x509Cert_); } @@ -239,7 +238,7 @@ void GetPublicKeyComplete(napi_env env, napi_status status, void *data) FreeCryptoFwkCtx(env, context); } -napi_value NapiX509Cert::Verify(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::Verify(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_TWO; napi_value argv[ARGS_SIZE_TWO] = { 0 }; @@ -286,7 +285,7 @@ napi_value NapiX509Cert::Verify(napi_env env, napi_callback_info info) } } -napi_value NapiX509Cert::GetEncoded(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetEncoded(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ONE; napi_value argv[ARGS_SIZE_ONE] = { 0 }; @@ -323,7 +322,7 @@ napi_value NapiX509Cert::GetEncoded(napi_env env, napi_callback_info info) } } -napi_value NapiX509Cert::GetPublicKey(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetPublicKey(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ONE; napi_value argv[ARGS_SIZE_ONE] = { 0 }; @@ -360,7 +359,7 @@ napi_value NapiX509Cert::GetPublicKey(napi_env env, napi_callback_info info) } } -napi_value NapiX509Cert::CheckValidityWithDate(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::CheckValidityWithDate(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_TWO; napi_value argv[ARGS_SIZE_TWO] = { 0 }; @@ -403,7 +402,7 @@ napi_value NapiX509Cert::CheckValidityWithDate(napi_env env, napi_callback_info } } -napi_value NapiX509Cert::GetVersion(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetVersion(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_value thisVar = nullptr; @@ -419,7 +418,7 @@ napi_value NapiX509Cert::GetVersion(napi_env env, napi_callback_info info) } -napi_value NapiX509Cert::GetSerialNumber(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetSerialNumber(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_value thisVar = nullptr; @@ -434,7 +433,7 @@ napi_value NapiX509Cert::GetSerialNumber(napi_env env, napi_callback_info info) return result; } -napi_value NapiX509Cert::GetIssuerName(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetIssuerName(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_value thisVar = nullptr; @@ -464,7 +463,7 @@ napi_value NapiX509Cert::GetIssuerName(napi_env env, napi_callback_info info) return returnValue; } -napi_value NapiX509Cert::GetSubjectName(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetSubjectName(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_value thisVar = nullptr; @@ -494,7 +493,7 @@ napi_value NapiX509Cert::GetSubjectName(napi_env env, napi_callback_info info) return returnValue; } -napi_value NapiX509Cert::GetNotBeforeTime(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetNotBeforeTime(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_value thisVar = nullptr; @@ -525,7 +524,7 @@ napi_value NapiX509Cert::GetNotBeforeTime(napi_env env, napi_callback_info info) return result; } -napi_value NapiX509Cert::GetNotAfterTime(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetNotAfterTime(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_value thisVar = nullptr; @@ -556,7 +555,7 @@ napi_value NapiX509Cert::GetNotAfterTime(napi_env env, napi_callback_info info) return result; } -napi_value NapiX509Cert::GetSignature(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetSignature(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_value thisVar = nullptr; @@ -586,7 +585,7 @@ napi_value NapiX509Cert::GetSignature(napi_env env, napi_callback_info info) return returnValue; } -napi_value NapiX509Cert::GetSigAlgName(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetSigAlgName(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_value thisVar = nullptr; @@ -617,7 +616,7 @@ napi_value NapiX509Cert::GetSigAlgName(napi_env env, napi_callback_info info) return result; } -napi_value NapiX509Cert::GetSigAlgOID(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetSigAlgOID(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_value thisVar = nullptr; @@ -647,7 +646,7 @@ napi_value NapiX509Cert::GetSigAlgOID(napi_env env, napi_callback_info info) return result; } -napi_value NapiX509Cert::GetSigAlgParams(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetSigAlgParams(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_value thisVar = nullptr; @@ -677,7 +676,7 @@ napi_value NapiX509Cert::GetSigAlgParams(napi_env env, napi_callback_info info) return returnValue; } -napi_value NapiX509Cert::GetKeyUsage(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetKeyUsage(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_value thisVar = nullptr; @@ -706,7 +705,7 @@ napi_value NapiX509Cert::GetKeyUsage(napi_env env, napi_callback_info info) return returnValue; } -napi_value NapiX509Cert::GetExtendedKeyUsage(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetExtendedKeyUsage(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_get_cb_info(env, info, &argc, nullptr, nullptr, nullptr); @@ -736,7 +735,7 @@ napi_value NapiX509Cert::GetExtendedKeyUsage(napi_env env, napi_callback_info in } -napi_value NapiX509Cert::GetBasicConstraints(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetBasicConstraints(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_value thisVar = nullptr; @@ -752,7 +751,7 @@ napi_value NapiX509Cert::GetBasicConstraints(napi_env env, napi_callback_info in return result; } -napi_value NapiX509Cert::GetSubjectAlternativeNames(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetSubjectAlternativeNames(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_get_cb_info(env, info, &argc, nullptr, nullptr, nullptr); @@ -781,7 +780,7 @@ napi_value NapiX509Cert::GetSubjectAlternativeNames(napi_env env, napi_callback_ return returnValue; } -napi_value NapiX509Cert::GetIssuerAlternativeNames(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::GetIssuerAlternativeNames(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_ZERO; napi_get_cb_info(env, info, &argc, nullptr, nullptr, nullptr); @@ -814,7 +813,7 @@ static napi_value NapiVerify(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -827,7 +826,7 @@ static napi_value NapiGetEncoded(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -840,7 +839,7 @@ static napi_value NapiGetPublicKey(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -853,7 +852,7 @@ static napi_value NapiCheckValidityWithDate(napi_env env, napi_callback_info inf { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -866,7 +865,7 @@ static napi_value NapiGetVersion(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -879,7 +878,7 @@ static napi_value NapiGetSerialNumber(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -892,7 +891,7 @@ static napi_value NapiGetIssuerName(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -905,7 +904,7 @@ static napi_value NapiGetSubjectName(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -918,7 +917,7 @@ static napi_value NapiGetNotBeforeTime(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -931,7 +930,7 @@ static napi_value NapiGetNotAfterTime(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -944,7 +943,7 @@ static napi_value NapiGetSignature(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -957,7 +956,7 @@ static napi_value NapiGetSigAlgName(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -970,7 +969,7 @@ static napi_value NapiGetSigAlgOID(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -983,7 +982,7 @@ static napi_value NapiGetSigAlgParams(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -996,7 +995,7 @@ static napi_value NapiGetKeyUsage(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -1009,7 +1008,7 @@ static napi_value NapiGetExtendedKeyUsage(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -1022,7 +1021,7 @@ static napi_value NapiGetBasicConstraints(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -1035,7 +1034,7 @@ static napi_value NapiGetSubjectAlternativeNames(napi_env env, napi_callback_inf { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -1048,7 +1047,7 @@ static napi_value NapiGetIssuerAlternativeNames(napi_env env, napi_callback_info { napi_value thisVar = nullptr; napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr); - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, thisVar, reinterpret_cast(&x509Cert)); if (x509Cert == nullptr) { LOGE("x509Cert is nullptr!"); @@ -1057,13 +1056,13 @@ static napi_value NapiGetIssuerAlternativeNames(napi_env env, napi_callback_info return x509Cert->GetIssuerAlternativeNames(env, info); } -void NapiX509Cert::CreateX509CertExecute(napi_env env, void *data) +void NapiX509Certificate::CreateX509CertExecute(napi_env env, void *data) { CfCtx *context = static_cast(data); context->errCode = HcfX509CertificateCreate(context->encodingBlob, &context->cert); } -void NapiX509Cert::CreateX509CertComplete(napi_env env, napi_status status, void *data) +void NapiX509Certificate::CreateX509CertComplete(napi_env env, napi_status status, void *data) { CfCtx *context = static_cast(data); if (context->errCode != HCF_SUCCESS) { @@ -1073,11 +1072,11 @@ void NapiX509Cert::CreateX509CertComplete(napi_env env, napi_status status, void return; } napi_value instance = CreateX509Cert(env); - NapiX509Cert *x509CertClass = new NapiX509Cert(context->cert); + NapiX509Certificate *x509CertClass = new NapiX509Certificate(context->cert); napi_wrap( env, instance, x509CertClass, [](napi_env env, void *data, void *hint) { - NapiX509Cert *certClass = (NapiX509Cert *)data; + NapiX509Certificate *certClass = (NapiX509Certificate *)data; delete certClass; return; }, @@ -1086,7 +1085,7 @@ void NapiX509Cert::CreateX509CertComplete(napi_env env, napi_status status, void FreeCryptoFwkCtx(env, context); } -napi_value NapiX509Cert::NapiCreateX509Cert(napi_env env, napi_callback_info info) +napi_value NapiX509Certificate::NapiCreateX509Cert(napi_env env, napi_callback_info info) { size_t argc = ARGS_SIZE_TWO; napi_value argv[ARGS_SIZE_TWO] = { 0 }; @@ -1134,7 +1133,7 @@ static napi_value X509CertConstructor(napi_env env, napi_callback_info info) return thisVar; } -void NapiX509Cert::DefineX509CertJSClass(napi_env env, napi_value exports) +void NapiX509Certificate::DefineX509CertJSClass(napi_env env, napi_value exports) { napi_property_descriptor desc[] = { DECLARE_NAPI_FUNCTION("createX509Cert", NapiCreateX509Cert), @@ -1168,7 +1167,7 @@ void NapiX509Cert::DefineX509CertJSClass(napi_env env, napi_value exports) napi_create_reference(env, constructor, 1, &classRef_); } -napi_value NapiX509Cert::CreateX509Cert(napi_env env) +napi_value NapiX509Certificate::CreateX509Cert(napi_env env) { napi_value constructor = nullptr; napi_value instance = nullptr; @@ -1176,6 +1175,5 @@ napi_value NapiX509Cert::CreateX509Cert(napi_env env) napi_new_instance(env, constructor, 0, nullptr, &instance); return instance; } - } // namespace CryptoFramework } // namespace OHOS diff --git a/frameworks/js/napi/src/napi_x509_crl.cpp b/frameworks/js/napi/src/napi_x509_crl.cpp index e0e735f..2788c8c 100644 --- a/frameworks/js/napi/src/napi_x509_crl.cpp +++ b/frameworks/js/napi/src/napi_x509_crl.cpp @@ -30,7 +30,6 @@ namespace OHOS { namespace CryptoFramework { - napi_ref NapiX509Crl::classRef_ = nullptr; struct CfCtx { @@ -394,7 +393,7 @@ napi_value NapiX509Crl::IsRevoked(napi_env env, napi_callback_info info) return nullptr; } - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, argv[PARAM0], (void**)&x509Cert); if (x509Cert == nullptr) { napi_throw(env, GenerateBusinessError(env, HCF_INVALID_PARAMS, "x509 cert is null")); @@ -684,7 +683,7 @@ napi_value NapiX509Crl::GetRevokedCertificateWithCert(napi_env env, napi_callbac return nullptr; } - NapiX509Cert *x509Cert = nullptr; + NapiX509Certificate *x509Cert = nullptr; napi_unwrap(env, argv[PARAM0], (void**)&x509Cert); if (x509Cert == nullptr) { napi_throw(env, GenerateBusinessError(env, HCF_INVALID_PARAMS, "x509 cert is null")); @@ -1238,6 +1237,5 @@ napi_value NapiX509Crl::CreateX509Crl(napi_env env) napi_new_instance(env, constructor, 0, nullptr, &instance); return instance; } - } // namespace CryptoFramework } // namespace OHOS diff --git a/frameworks/js/napi/src/napi_x509_crl_entry.cpp b/frameworks/js/napi/src/napi_x509_crl_entry.cpp index 7026c45..0ab4797 100644 --- a/frameworks/js/napi/src/napi_x509_crl_entry.cpp +++ b/frameworks/js/napi/src/napi_x509_crl_entry.cpp @@ -27,7 +27,6 @@ namespace OHOS { namespace CryptoFramework { - napi_ref NapiX509CrlEntry::classRef_ = nullptr; struct CfCtx { @@ -439,6 +438,5 @@ napi_value NapiX509CrlEntry::CreateX509CrlEntry(napi_env env) napi_new_instance(env, constructor, 0, nullptr, &instance); return instance; } - } // namespace CryptoFramework } // namespace OHOS diff --git a/plugin/openssl_plugin/certificate/inc/x509_cert_chain_validator_openssl.h b/plugin/openssl_plugin/certificate/inc/x509_cert_chain_validator_openssl.h index 86d2103..ade49aa 100644 --- a/plugin/openssl_plugin/certificate/inc/x509_cert_chain_validator_openssl.h +++ b/plugin/openssl_plugin/certificate/inc/x509_cert_chain_validator_openssl.h @@ -13,12 +13,11 @@ * limitations under the License. */ -#include "result.h" -#include "cert_chain_validator_spi.h" - #ifndef X509_CERT_CHAIN_VALIDATOR_OEPNSSL_H #define X509_CERT_CHAIN_VALIDATOR_OEPNSSL_H +#include "result.h" +#include "cert_chain_validator_spi.h" #ifdef __cplusplus extern "C" { diff --git a/plugin/openssl_plugin/certificate/inc/x509_certificate_openssl.h b/plugin/openssl_plugin/certificate/inc/x509_certificate_openssl.h index b6af4ba..411b718 100644 --- a/plugin/openssl_plugin/certificate/inc/x509_certificate_openssl.h +++ b/plugin/openssl_plugin/certificate/inc/x509_certificate_openssl.h @@ -13,11 +13,11 @@ * limitations under the License. */ -#include "x509_certificate_spi.h" - #ifndef X509_CERTIFICATE_OEPNSSL_H #define X509_CERTIFICATE_OEPNSSL_H +#include "x509_certificate_spi.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/plugin/openssl_plugin/certificate/inc/x509_crl_entry_openssl.h b/plugin/openssl_plugin/certificate/inc/x509_crl_entry_openssl.h index 8cf36ba..e8334c6 100644 --- a/plugin/openssl_plugin/certificate/inc/x509_crl_entry_openssl.h +++ b/plugin/openssl_plugin/certificate/inc/x509_crl_entry_openssl.h @@ -13,15 +13,15 @@ * limitations under the License. */ +#ifndef X509_CRL_ENTRY_OEPNSSL_H +#define X509_CRL_ENTRY_OEPNSSL_H + #include #include "blob.h" #include "result.h" #include "x509_crl_entry.h" -#ifndef X509_CRL_ENTRY_OEPNSSL_H -#define X509_CRL_ENTRY_OEPNSSL_H - #ifdef __cplusplus extern "C" { #endif diff --git a/plugin/openssl_plugin/certificate/inc/x509_crl_openssl.h b/plugin/openssl_plugin/certificate/inc/x509_crl_openssl.h index 8382ff0..c5170b3 100644 --- a/plugin/openssl_plugin/certificate/inc/x509_crl_openssl.h +++ b/plugin/openssl_plugin/certificate/inc/x509_crl_openssl.h @@ -13,14 +13,14 @@ * limitations under the License. */ +#ifndef X509_CRL_OEPNSSL_H +#define X509_CRL_OEPNSSL_H + #include "blob.h" #include "crl.h" #include "result.h" #include "x509_crl_spi.h" -#ifndef X509_CRL_OEPNSSL_H -#define X509_CRL_OEPNSSL_H - #ifdef __cplusplus extern "C" { #endif diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 4cf3840..00aafbb 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -42,9 +42,9 @@ ohos_unittest("crypto_framework_test") { "src/crypto_rsa_cipher_test.cpp", "src/crypto_rsa_sign_test.cpp", "src/crypto_rsa_verify_test.cpp", + "src/crypto_x509_cert_chain_validator_test.cpp", "src/crypto_x509_certificate_test.cpp", "src/crypto_x509_crl_test.cpp", - "src/x509_cert_chain_validator_test.cpp", ] cflags = [ "-DHILOG_ENABLE" ] diff --git a/test/unittest/src/x509_cert_chain_validator_test.cpp b/test/unittest/src/crypto_x509_cert_chain_validator_test.cpp similarity index 95% rename from test/unittest/src/x509_cert_chain_validator_test.cpp rename to test/unittest/src/crypto_x509_cert_chain_validator_test.cpp index f706bf2..291a58d 100644 --- a/test/unittest/src/x509_cert_chain_validator_test.cpp +++ b/test/unittest/src/crypto_x509_cert_chain_validator_test.cpp @@ -25,7 +25,8 @@ using namespace std; using namespace testing::ext; -class CertChainValidatorTest : public testing::Test { +namespace { +class CryptoX509CertChainValidatorTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -140,18 +141,18 @@ static char g_invalidCaCert[] = "3hd5yG48AaYNKhJ26auBrOARpJe/ktKZTMuU3zHuPRtv3Wtdiw==\r\n" "-----END CERTIFICATE-----\r\n"; -void CertChainValidatorTest::SetUpTestCase() {} -void CertChainValidatorTest::TearDownTestCase() {} +void CryptoX509CertChainValidatorTest::SetUpTestCase() {} +void CryptoX509CertChainValidatorTest::TearDownTestCase() {} -void CertChainValidatorTest::SetUp() +void CryptoX509CertChainValidatorTest::SetUp() { } -void CertChainValidatorTest::TearDown() +void CryptoX509CertChainValidatorTest::TearDown() { } -HWTEST_F(CertChainValidatorTest, GetAlgorithm001, TestSize.Level0) +HWTEST_F(CryptoX509CertChainValidatorTest, GetAlgorithm001, TestSize.Level0) { HcfCertChainValidator *pathValidator = nullptr; HcfResult res = HcfCertChainValidatorCreate("PKIX", &pathValidator); @@ -168,7 +169,7 @@ HWTEST_F(CertChainValidatorTest, GetAlgorithm001, TestSize.Level0) OH_HCF_ObjDestroy(pathValidator); } -HWTEST_F(CertChainValidatorTest, GetAlgorithm002, TestSize.Level0) +HWTEST_F(CryptoX509CertChainValidatorTest, GetAlgorithm002, TestSize.Level0) { HcfCertChainValidator *pathValidator = nullptr; HcfResult res = HcfCertChainValidatorCreate("invalidPKIX", &pathValidator); @@ -177,7 +178,7 @@ HWTEST_F(CertChainValidatorTest, GetAlgorithm002, TestSize.Level0) } /* valid cert chain. */ -HWTEST_F(CertChainValidatorTest, VerifyTest001, TestSize.Level0) +HWTEST_F(CryptoX509CertChainValidatorTest, VerifyTest001, TestSize.Level0) { HcfCertChainValidator *pathValidator = nullptr; HcfResult res = HcfCertChainValidatorCreate("PKIX", &pathValidator); @@ -218,7 +219,7 @@ OUT: } /* invalid cert chain. */ -HWTEST_F(CertChainValidatorTest, VerifyTest002, TestSize.Level0) +HWTEST_F(CryptoX509CertChainValidatorTest, VerifyTest002, TestSize.Level0) { HcfCertChainValidator *pathValidator = nullptr; HcfResult res = HcfCertChainValidatorCreate("PKIX", &pathValidator); @@ -269,4 +270,5 @@ HWTEST_F(CertChainValidatorTest, VerifyTest002, TestSize.Level0) OUT: free(certsData.data); OH_HCF_ObjDestroy(pathValidator); +} } \ No newline at end of file diff --git a/test/unittest/src/crypto_x509_certificate_test.cpp b/test/unittest/src/crypto_x509_certificate_test.cpp index 625cb9f..8e5866c 100644 --- a/test/unittest/src/crypto_x509_certificate_test.cpp +++ b/test/unittest/src/crypto_x509_certificate_test.cpp @@ -22,7 +22,8 @@ using namespace std; using namespace testing::ext; -class X509CertTest : public testing::Test { +namespace { +class CryptoX509CertificateTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -249,24 +250,24 @@ constexpr int TEST_CERT_VERSION = 3; constexpr int TEST_CERT_CHAIN_LEN = 2; constexpr int TEST_CERT_SERIAL_NUMBER = 272; -void X509CertTest::SetUpTestCase() {} -void X509CertTest::TearDownTestCase() {} +void CryptoX509CertificateTest::SetUpTestCase() {} +void CryptoX509CertificateTest::TearDownTestCase() {} -void X509CertTest::SetUp() +void CryptoX509CertificateTest::SetUp() { } -void X509CertTest::TearDown() +void CryptoX509CertificateTest::TearDown() { } /** - * @tc.name: X509CertTest.GenerateCert001 + * @tc.name: CryptoX509CertificateTest.GenerateCert001 * @tc.desc: Generate valid PEM format certificate. * @tc.type: FUNC * @tc.require: I5QDNN */ -HWTEST_F(X509CertTest, GenerateCert001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GenerateCert001, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -280,7 +281,7 @@ HWTEST_F(X509CertTest, GenerateCert001, TestSize.Level0) } /* Invalid input. */ -HWTEST_F(X509CertTest, GenerateCert002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GenerateCert002, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -291,7 +292,7 @@ HWTEST_F(X509CertTest, GenerateCert002, TestSize.Level0) } /* Invalid PEM format. */ -HWTEST_F(X509CertTest, GenerateCert003, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GenerateCert003, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -305,7 +306,7 @@ HWTEST_F(X509CertTest, GenerateCert003, TestSize.Level0) } /* Valid DER format. */ -HWTEST_F(X509CertTest, GenerateCert004, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GenerateCert004, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -331,7 +332,7 @@ HWTEST_F(X509CertTest, GenerateCert004, TestSize.Level0) } /* verify self signed cert. */ -HWTEST_F(X509CertTest, Verify001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, Verify001, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -352,7 +353,7 @@ HWTEST_F(X509CertTest, Verify001, TestSize.Level0) } /* use root ca cert's public key to verify next cert. */ -HWTEST_F(X509CertTest, Verify002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, Verify002, TestSize.Level0) { HcfX509Certificate *rootCert = nullptr; HcfEncodingBlob root = { 0 }; @@ -383,7 +384,7 @@ HWTEST_F(X509CertTest, Verify002, TestSize.Level0) } /* verify cert with wrong pub key. */ -HWTEST_F(X509CertTest, Verify003, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, Verify003, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -415,7 +416,7 @@ HWTEST_F(X509CertTest, Verify003, TestSize.Level0) } /* verify cert with invalid input pub key. */ -HWTEST_F(X509CertTest, Verify004, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, Verify004, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -431,7 +432,7 @@ HWTEST_F(X509CertTest, Verify004, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetEncoded001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetEncoded001, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -452,7 +453,7 @@ HWTEST_F(X509CertTest, GetEncoded001, TestSize.Level0) } /* Invalid input. */ -HWTEST_F(X509CertTest, GetEncoded002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetEncoded002, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -468,7 +469,7 @@ HWTEST_F(X509CertTest, GetEncoded002, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetPublicKey, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetPublicKey, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -488,7 +489,7 @@ HWTEST_F(X509CertTest, GetPublicKey, TestSize.Level0) } /* Input valid date. YYMMDDHHMMSSZ */ -HWTEST_F(X509CertTest, CheckValidityWithDate001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, CheckValidityWithDate001, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -505,7 +506,7 @@ HWTEST_F(X509CertTest, CheckValidityWithDate001, TestSize.Level0) } /* Input valid date. time format: YYYYMMDDHHMMSSZ */ -HWTEST_F(X509CertTest, CheckValidityWithDate002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, CheckValidityWithDate002, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -522,7 +523,7 @@ HWTEST_F(X509CertTest, CheckValidityWithDate002, TestSize.Level0) } /* Input invalid date--expiered. */ -HWTEST_F(X509CertTest, CheckValidityWithDate003, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, CheckValidityWithDate003, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -539,7 +540,7 @@ HWTEST_F(X509CertTest, CheckValidityWithDate003, TestSize.Level0) } /* Input invalid date. */ -HWTEST_F(X509CertTest, CheckValidityWithDate004, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, CheckValidityWithDate004, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -556,7 +557,7 @@ HWTEST_F(X509CertTest, CheckValidityWithDate004, TestSize.Level0) } /* Input invalid date form. */ -HWTEST_F(X509CertTest, CheckValidityWithDate005, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, CheckValidityWithDate005, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -572,7 +573,7 @@ HWTEST_F(X509CertTest, CheckValidityWithDate005, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetVersion, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetVersion, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -587,7 +588,7 @@ HWTEST_F(X509CertTest, GetVersion, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetSerialNumber, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetSerialNumber, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -602,7 +603,7 @@ HWTEST_F(X509CertTest, GetSerialNumber, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetIssuerName001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetIssuerName001, TestSize.Level0) { HcfBlob out = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -622,7 +623,7 @@ HWTEST_F(X509CertTest, GetIssuerName001, TestSize.Level0) } /* invalid input. */ -HWTEST_F(X509CertTest, GetIssuerName002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetIssuerName002, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -637,7 +638,7 @@ HWTEST_F(X509CertTest, GetIssuerName002, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetSubjectName001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetSubjectName001, TestSize.Level0) { HcfBlob out = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -657,7 +658,7 @@ HWTEST_F(X509CertTest, GetSubjectName001, TestSize.Level0) } /* invalid input. */ -HWTEST_F(X509CertTest, GetSubjectName002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetSubjectName002, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -672,7 +673,7 @@ HWTEST_F(X509CertTest, GetSubjectName002, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetNotBeforeTime001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetNotBeforeTime001, TestSize.Level0) { HcfBlob out = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -691,7 +692,7 @@ HWTEST_F(X509CertTest, GetNotBeforeTime001, TestSize.Level0) } /* invalid input. */ -HWTEST_F(X509CertTest, GetNotBeforeTime002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetNotBeforeTime002, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -706,7 +707,7 @@ HWTEST_F(X509CertTest, GetNotBeforeTime002, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetNotAfterTime001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetNotAfterTime001, TestSize.Level0) { HcfBlob out = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -725,7 +726,7 @@ HWTEST_F(X509CertTest, GetNotAfterTime001, TestSize.Level0) } /* invalid input. */ -HWTEST_F(X509CertTest, GetNotAfterTime002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetNotAfterTime002, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -740,7 +741,7 @@ HWTEST_F(X509CertTest, GetNotAfterTime002, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetSignature001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetSignature001, TestSize.Level0) { HcfBlob sigOut = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -759,7 +760,7 @@ HWTEST_F(X509CertTest, GetSignature001, TestSize.Level0) } /* invalid input. */ -HWTEST_F(X509CertTest, GetSignature002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetSignature002, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -774,7 +775,7 @@ HWTEST_F(X509CertTest, GetSignature002, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetSignatureAlgName001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgName001, TestSize.Level0) { HcfBlob sigAlgName = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -793,7 +794,7 @@ HWTEST_F(X509CertTest, GetSignatureAlgName001, TestSize.Level0) } /* invalid input. */ -HWTEST_F(X509CertTest, GetSignatureAlgName002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgName002, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -808,7 +809,7 @@ HWTEST_F(X509CertTest, GetSignatureAlgName002, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetSignatureAlgOid001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgOid001, TestSize.Level0) { HcfBlob sigAlgOID = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -827,7 +828,7 @@ HWTEST_F(X509CertTest, GetSignatureAlgOid001, TestSize.Level0) } /* invalid input. */ -HWTEST_F(X509CertTest, GetSignatureAlgOid002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgOid002, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -842,7 +843,7 @@ HWTEST_F(X509CertTest, GetSignatureAlgOid002, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetSignatureAlgParams001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgParams001, TestSize.Level0) { HcfBlob sigAlgParamsOut = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -861,7 +862,7 @@ HWTEST_F(X509CertTest, GetSignatureAlgParams001, TestSize.Level0) } /* invalid input. */ -HWTEST_F(X509CertTest, GetSignatureAlgParams002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgParams002, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -876,7 +877,7 @@ HWTEST_F(X509CertTest, GetSignatureAlgParams002, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetKeyUsage, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetKeyUsage, TestSize.Level0) { HcfBlob out = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -894,7 +895,7 @@ HWTEST_F(X509CertTest, GetKeyUsage, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetExtKeyUsage001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetExtKeyUsage001, TestSize.Level0) { HcfArray keyUsageOut = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -913,7 +914,7 @@ HWTEST_F(X509CertTest, GetExtKeyUsage001, TestSize.Level0) } /* Cert which has no extended key usage. */ -HWTEST_F(X509CertTest, GetExtKeyUsage002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetExtKeyUsage002, TestSize.Level0) { HcfArray keyUsageOut = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -931,7 +932,7 @@ HWTEST_F(X509CertTest, GetExtKeyUsage002, TestSize.Level0) } /* not a CA cert */ -HWTEST_F(X509CertTest, GetBasicConstraints001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetBasicConstraints001, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -947,7 +948,7 @@ HWTEST_F(X509CertTest, GetBasicConstraints001, TestSize.Level0) } /* CA cert */ -HWTEST_F(X509CertTest, GetBasicConstraints002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetBasicConstraints002, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -963,7 +964,7 @@ HWTEST_F(X509CertTest, GetBasicConstraints002, TestSize.Level0) } /* invalid input. */ -HWTEST_F(X509CertTest, GetBasicConstraints003, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetBasicConstraints003, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -978,7 +979,7 @@ HWTEST_F(X509CertTest, GetBasicConstraints003, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetSubjectAltNames001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetSubjectAltNames001, TestSize.Level0) { HcfArray outName = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -997,7 +998,7 @@ HWTEST_F(X509CertTest, GetSubjectAltNames001, TestSize.Level0) } /* cert without subject alternative names. */ -HWTEST_F(X509CertTest, GetSubjectAltNames002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetSubjectAltNames002, TestSize.Level0) { HcfArray outName = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -1015,7 +1016,7 @@ HWTEST_F(X509CertTest, GetSubjectAltNames002, TestSize.Level0) } /* invalid input. */ -HWTEST_F(X509CertTest, GetSubjectAltNames003, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetSubjectAltNames003, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -1030,7 +1031,7 @@ HWTEST_F(X509CertTest, GetSubjectAltNames003, TestSize.Level0) OH_HCF_ObjDestroy(x509Cert); } -HWTEST_F(X509CertTest, GetIssuerAltNames001, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetIssuerAltNames001, TestSize.Level0) { HcfArray outName = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -1049,7 +1050,7 @@ HWTEST_F(X509CertTest, GetIssuerAltNames001, TestSize.Level0) } /* cert without issuer alternative names. */ -HWTEST_F(X509CertTest, GetIssuerAltNames002, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetIssuerAltNames002, TestSize.Level0) { HcfArray outName = { 0 }; HcfX509Certificate *x509Cert = nullptr; @@ -1067,7 +1068,7 @@ HWTEST_F(X509CertTest, GetIssuerAltNames002, TestSize.Level0) } /* invalid input. */ -HWTEST_F(X509CertTest, GetIssuerAltNames003, TestSize.Level0) +HWTEST_F(CryptoX509CertificateTest, GetIssuerAltNames003, TestSize.Level0) { HcfX509Certificate *x509Cert = nullptr; HcfEncodingBlob inStream = { 0 }; @@ -1080,4 +1081,5 @@ HWTEST_F(X509CertTest, GetIssuerAltNames003, TestSize.Level0) ret = x509Cert->getIssuerAltNames(x509Cert, nullptr); EXPECT_EQ(ret, HCF_INVALID_PARAMS); OH_HCF_ObjDestroy(x509Cert); +} } \ No newline at end of file diff --git a/test/unittest/src/crypto_x509_crl_test.cpp b/test/unittest/src/crypto_x509_crl_test.cpp index e56d680..c907299 100644 --- a/test/unittest/src/crypto_x509_crl_test.cpp +++ b/test/unittest/src/crypto_x509_crl_test.cpp @@ -29,13 +29,14 @@ using namespace std; using namespace testing::ext; -#define TEST_VERSION 3 -#define TEST_EXT_VERSION 4 -#define TEST_OFFSET_TIME 1000 -#define TEST_SN 1000 -#define TEST_TIME 1986598400 -#define TEST_OFFSET 10 -#define TEST_CRL_LEN 256 +namespace { +constexpr int TEST_VERSION = 3; +constexpr int TEST_EXT_VERSION = 4; +constexpr int TEST_OFFSET_TIME = 1000; +constexpr int TEST_SN = 1000; +constexpr int TEST_TIME = 1986598400; +constexpr int TEST_OFFSET = 10; +constexpr int TEST_CRL_LEN = 256; static char g_testErrorCert[] = "-----BEGIN CERTIFICATE-----\r\n" @@ -111,7 +112,7 @@ HcfEncodingBlob *g_crlDerInStream = nullptr; unsigned char *g_tbs = nullptr; unsigned char *g_signatureStr = nullptr; int g_signatureLen = 0; -class X509CrlTest : public testing::Test { +class CryptoX509CrlTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -196,7 +197,7 @@ static unsigned char *GetCrlStream() return buf; } -void X509CrlTest::SetUpTestCase() +void CryptoX509CrlTest::SetUpTestCase() { HcfX509Crl *x509Crl = nullptr; g_crlDerInStream = (HcfEncodingBlob *)HcfMalloc(sizeof(HcfEncodingBlob), 0); @@ -207,7 +208,7 @@ void X509CrlTest::SetUpTestCase() HcfX509CrlCreate(g_crlDerInStream, &x509Crl); g_x509Crl = (HcfX509Crl *)x509Crl; } -void X509CrlTest::TearDownTestCase() +void CryptoX509CrlTest::TearDownTestCase() { if (g_x509Crl != nullptr) { OH_HCF_ObjDestroy(g_x509Crl); @@ -235,11 +236,11 @@ void X509CrlTest::TearDownTestCase() g_crlDerInStream = nullptr; } } -void X509CrlTest::SetUp() {} -void X509CrlTest::TearDown() {} +void CryptoX509CrlTest::SetUp() {} +void CryptoX509CrlTest::TearDown() {} // Begin test crl create, test crl create PEM true -HWTEST_F(X509CrlTest, X509CrlTest001, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest001, TestSize.Level0) { HcfX509Crl *x509Crl = nullptr; HcfEncodingBlob inStreamCrl = { 0 }; @@ -253,7 +254,7 @@ HWTEST_F(X509CrlTest, X509CrlTest001, TestSize.Level0) } // Test crl create DER true -HWTEST_F(X509CrlTest, X509CrlTest002, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest002, TestSize.Level0) { HcfX509Crl *x509Crl = nullptr; HcfResult ret = HcfX509CrlCreate(g_crlDerInStream, &x509Crl); @@ -263,7 +264,7 @@ HWTEST_F(X509CrlTest, X509CrlTest002, TestSize.Level0) } // Test crl create error | encodingFormat -HWTEST_F(X509CrlTest, X509CrlTest003, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest003, TestSize.Level0) { HcfX509Crl *x509Crl = nullptr; HcfEncodingBlob inStreamCrl = { 0 }; @@ -276,7 +277,7 @@ HWTEST_F(X509CrlTest, X509CrlTest003, TestSize.Level0) } // Test crl create error | Crl data -HWTEST_F(X509CrlTest, X509CrlTest004, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest004, TestSize.Level0) { HcfX509Crl *x509Crl = nullptr; HcfEncodingBlob inStreamCrl = { 0 }; @@ -289,7 +290,7 @@ HWTEST_F(X509CrlTest, X509CrlTest004, TestSize.Level0) } // Test crl create error | Crl len -HWTEST_F(X509CrlTest, X509CrlTest005, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest005, TestSize.Level0) { HcfX509Crl *x509Crl = nullptr; HcfEncodingBlob inStreamCrl = { 0 }; @@ -302,7 +303,7 @@ HWTEST_F(X509CrlTest, X509CrlTest005, TestSize.Level0) } // Test crl create error | Crl nullptr -HWTEST_F(X509CrlTest, X509CrlTest006, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest006, TestSize.Level0) { HcfX509Crl *x509Crl = nullptr; HcfEncodingBlob *inStreamCrl = nullptr; @@ -312,7 +313,7 @@ HWTEST_F(X509CrlTest, X509CrlTest006, TestSize.Level0) } // Begin test crl isRevoked, test crl isRevoked true -HWTEST_F(X509CrlTest, X509CrlTest011, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest011, TestSize.Level0) { // Get cert HcfX509Certificate *x509Cert = nullptr; @@ -341,7 +342,7 @@ HWTEST_F(X509CrlTest, X509CrlTest011, TestSize.Level0) } // Test crl isRevoked error | crl null -HWTEST_F(X509CrlTest, X509CrlTest012, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest012, TestSize.Level0) { // Get cert HcfX509Certificate *x509Cert = nullptr; @@ -359,7 +360,7 @@ HWTEST_F(X509CrlTest, X509CrlTest012, TestSize.Level0) } // Test crl isRevoked error | x509Cert null -HWTEST_F(X509CrlTest, X509CrlTest013, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest013, TestSize.Level0) { // Get crl HcfX509Crl *x509Crl = nullptr; @@ -377,7 +378,7 @@ HWTEST_F(X509CrlTest, X509CrlTest013, TestSize.Level0) } // Test crl isRevoked error | x509Crl error -HWTEST_F(X509CrlTest, X509CrlTest014, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest014, TestSize.Level0) { // Get cert HcfX509Certificate *x509Cert = nullptr; @@ -402,7 +403,7 @@ HWTEST_F(X509CrlTest, X509CrlTest014, TestSize.Level0) } // Test crl isRevoked error | x509Crl error -HWTEST_F(X509CrlTest, X509CrlTest015, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest015, TestSize.Level0) { // Get cert HcfX509Certificate *x509Cert = nullptr; @@ -431,7 +432,7 @@ HWTEST_F(X509CrlTest, X509CrlTest015, TestSize.Level0) } // Test crl GetType true -HWTEST_F(X509CrlTest, X509CrlTest021, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest021, TestSize.Level0) { // Get crl HcfX509Crl *x509Crl = nullptr; @@ -449,7 +450,7 @@ HWTEST_F(X509CrlTest, X509CrlTest021, TestSize.Level0) } // Test crl GetType error -HWTEST_F(X509CrlTest, X509CrlTest022, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest022, TestSize.Level0) { // Get crl HcfX509Crl *x509Crl = nullptr; @@ -467,7 +468,7 @@ HWTEST_F(X509CrlTest, X509CrlTest022, TestSize.Level0) } // Test crl getEncoded DER true -HWTEST_F(X509CrlTest, X509CrlTest031, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest031, TestSize.Level0) { HcfEncodingBlob inStreamInput = { 0 }; HcfResult ret = g_x509Crl->getEncoded(g_x509Crl, &inStreamInput); @@ -481,7 +482,7 @@ HWTEST_F(X509CrlTest, X509CrlTest031, TestSize.Level0) } // Test crl getEncoded PEM true -HWTEST_F(X509CrlTest, X509CrlTest032, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest032, TestSize.Level0) { // Get crl HcfX509Crl *x509Crl = nullptr; @@ -506,14 +507,14 @@ HWTEST_F(X509CrlTest, X509CrlTest032, TestSize.Level0) } // Test crl getEncoded error -HWTEST_F(X509CrlTest, X509CrlTest033, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest033, TestSize.Level0) { HcfResult ret = g_x509Crl->getEncoded(g_x509Crl, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getEncoded error -HWTEST_F(X509CrlTest, X509CrlTest034, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest034, TestSize.Level0) { HcfEncodingBlob inStreamInput = { 0 }; HcfResult ret = g_x509Crl->getEncoded(nullptr, &inStreamInput); @@ -521,21 +522,21 @@ HWTEST_F(X509CrlTest, X509CrlTest034, TestSize.Level0) } // Test crl getEncoded error -HWTEST_F(X509CrlTest, X509CrlTest035, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest035, TestSize.Level0) { HcfResult ret = g_x509Crl->getEncoded(nullptr, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl verify true -HWTEST_F(X509CrlTest, X509CrlTest041, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest041, TestSize.Level0) { HcfResult ret = g_x509Crl->verify(g_x509Crl, g_keyPair->pubKey); EXPECT_EQ(ret, HCF_SUCCESS); } // Test crl verify false -HWTEST_F(X509CrlTest, X509CrlTest042, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest042, TestSize.Level0) { HcfKeyPair *keyPair = nullptr; HcfAsyKeyGenerator *generator = nullptr; @@ -549,21 +550,21 @@ HWTEST_F(X509CrlTest, X509CrlTest042, TestSize.Level0) } // Test crl verify false -HWTEST_F(X509CrlTest, X509CrlTest043, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest043, TestSize.Level0) { HcfResult ret = g_x509Crl->verify(nullptr, g_keyPair->pubKey); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl verify false -HWTEST_F(X509CrlTest, X509CrlTest044, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest044, TestSize.Level0) { HcfResult ret = g_x509Crl->verify(g_x509Crl, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl verify false -HWTEST_F(X509CrlTest, X509CrlTest045, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest045, TestSize.Level0) { // Get crl HcfX509Crl *x509Crl = nullptr; @@ -581,21 +582,21 @@ HWTEST_F(X509CrlTest, X509CrlTest045, TestSize.Level0) } // Test crl getVersion true -HWTEST_F(X509CrlTest, X509CrlTest051, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest051, TestSize.Level0) { long version = g_x509Crl->getVersion(g_x509Crl); EXPECT_EQ(version, TEST_EXT_VERSION); } // Test crl getVersion false -HWTEST_F(X509CrlTest, X509CrlTest052, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest052, TestSize.Level0) { long version = g_x509Crl->getVersion(nullptr); EXPECT_EQ(version, -1); } // Test crl getIssuerName true -HWTEST_F(X509CrlTest, X509CrlTest061, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest061, TestSize.Level0) { HcfBlob out = { 0 }; HcfResult ret = g_x509Crl->getIssuerName(g_x509Crl, &out); @@ -606,7 +607,7 @@ HWTEST_F(X509CrlTest, X509CrlTest061, TestSize.Level0) } // Test crl getIssuerName false -HWTEST_F(X509CrlTest, X509CrlTest062, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest062, TestSize.Level0) { HcfBlob out = { 0 }; HcfResult ret = g_x509Crl->getIssuerName(nullptr, &out); @@ -615,21 +616,21 @@ HWTEST_F(X509CrlTest, X509CrlTest062, TestSize.Level0) } // Test crl getIssuerName false -HWTEST_F(X509CrlTest, X509CrlTest063, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest063, TestSize.Level0) { HcfResult ret = g_x509Crl->getIssuerName(g_x509Crl, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getIssuerName false -HWTEST_F(X509CrlTest, X509CrlTest064, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest064, TestSize.Level0) { HcfResult ret = g_x509Crl->getIssuerName(nullptr, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getLastUpdate true -HWTEST_F(X509CrlTest, X509CrlTest071, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest071, TestSize.Level0) { HcfBlob out = { 0 }; HcfResult ret = g_x509Crl->getLastUpdate(g_x509Crl, &out); @@ -640,7 +641,7 @@ HWTEST_F(X509CrlTest, X509CrlTest071, TestSize.Level0) } // Test crl getLastUpdate false -HWTEST_F(X509CrlTest, X509CrlTest072, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest072, TestSize.Level0) { HcfBlob out = { 0 }; HcfResult ret = g_x509Crl->getLastUpdate(nullptr, &out); @@ -649,21 +650,21 @@ HWTEST_F(X509CrlTest, X509CrlTest072, TestSize.Level0) } // Test crl getLastUpdate false -HWTEST_F(X509CrlTest, X509CrlTest073, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest073, TestSize.Level0) { HcfResult ret = g_x509Crl->getLastUpdate(g_x509Crl, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getLastUpdate false -HWTEST_F(X509CrlTest, X509CrlTest074, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest074, TestSize.Level0) { HcfResult ret = g_x509Crl->getLastUpdate(nullptr, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getNextUpdate true -HWTEST_F(X509CrlTest, X509CrlTest081, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest081, TestSize.Level0) { HcfBlob out = { 0 }; HcfResult ret = g_x509Crl->getNextUpdate(g_x509Crl, &out); @@ -674,7 +675,7 @@ HWTEST_F(X509CrlTest, X509CrlTest081, TestSize.Level0) } // Test crl getNextUpdate false -HWTEST_F(X509CrlTest, X509CrlTest082, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest082, TestSize.Level0) { HcfBlob out = { 0 }; HcfResult ret = g_x509Crl->getNextUpdate(nullptr, &out); @@ -683,21 +684,21 @@ HWTEST_F(X509CrlTest, X509CrlTest082, TestSize.Level0) } // Test crl getNextUpdate false -HWTEST_F(X509CrlTest, X509CrlTest083, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest083, TestSize.Level0) { HcfResult ret = g_x509Crl->getNextUpdate(g_x509Crl, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getNextUpdate false -HWTEST_F(X509CrlTest, X509CrlTest084, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest084, TestSize.Level0) { HcfResult ret = g_x509Crl->getNextUpdate(nullptr, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getRevokedCert true -HWTEST_F(X509CrlTest, X509CrlTest091, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest091, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); @@ -707,7 +708,7 @@ HWTEST_F(X509CrlTest, X509CrlTest091, TestSize.Level0) } // Test crl getRevokedCert false -HWTEST_F(X509CrlTest, X509CrlTest092, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest092, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 9999, &crlEntry); @@ -715,14 +716,14 @@ HWTEST_F(X509CrlTest, X509CrlTest092, TestSize.Level0) } // Test crl getRevokedCert false -HWTEST_F(X509CrlTest, X509CrlTest093, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest093, TestSize.Level0) { HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getRevokedCert false -HWTEST_F(X509CrlTest, X509CrlTest094, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest094, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(nullptr, 1000, &crlEntry); @@ -730,14 +731,14 @@ HWTEST_F(X509CrlTest, X509CrlTest094, TestSize.Level0) } // Test crl getRevokedCert false -HWTEST_F(X509CrlTest, X509CrlTest095, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest095, TestSize.Level0) { HcfResult ret = g_x509Crl->getRevokedCert(nullptr, 1000, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl entry getSerialNumber true -HWTEST_F(X509CrlTest, X509CrlTest101, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest101, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); @@ -749,7 +750,7 @@ HWTEST_F(X509CrlTest, X509CrlTest101, TestSize.Level0) } // Test crl entry getSerialNumber false -HWTEST_F(X509CrlTest, X509CrlTest102, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest102, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); @@ -761,7 +762,7 @@ HWTEST_F(X509CrlTest, X509CrlTest102, TestSize.Level0) } // Test crl entry getSerialNumber false -HWTEST_F(X509CrlTest, X509CrlTest103, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest103, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); @@ -773,7 +774,7 @@ HWTEST_F(X509CrlTest, X509CrlTest103, TestSize.Level0) } // Test crl entry getEncoded true -HWTEST_F(X509CrlTest, X509CrlTest111, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest111, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); @@ -789,7 +790,7 @@ HWTEST_F(X509CrlTest, X509CrlTest111, TestSize.Level0) } // Test crl entry getEncoded false -HWTEST_F(X509CrlTest, X509CrlTest112, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest112, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); @@ -804,7 +805,7 @@ HWTEST_F(X509CrlTest, X509CrlTest112, TestSize.Level0) } // Test crl entry getEncoded false -HWTEST_F(X509CrlTest, X509CrlTest113, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest113, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); @@ -817,7 +818,7 @@ HWTEST_F(X509CrlTest, X509CrlTest113, TestSize.Level0) } // Test crl entry getEncoded false -HWTEST_F(X509CrlTest, X509CrlTest114, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest114, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); @@ -830,7 +831,7 @@ HWTEST_F(X509CrlTest, X509CrlTest114, TestSize.Level0) } // Test crl entry getCertIssuer true -HWTEST_F(X509CrlTest, X509CrlTest121, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest121, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); @@ -847,7 +848,7 @@ HWTEST_F(X509CrlTest, X509CrlTest121, TestSize.Level0) } // Test crl entry getCertIssuer false -HWTEST_F(X509CrlTest, X509CrlTest122, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest122, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); @@ -862,7 +863,7 @@ HWTEST_F(X509CrlTest, X509CrlTest122, TestSize.Level0) } // Test crl entry getCertIssuer false -HWTEST_F(X509CrlTest, X509CrlTest123, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest123, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); @@ -875,7 +876,7 @@ HWTEST_F(X509CrlTest, X509CrlTest123, TestSize.Level0) } // Test crl entry getRevocationDate true -HWTEST_F(X509CrlTest, X509CrlTest131, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest131, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); @@ -892,7 +893,7 @@ HWTEST_F(X509CrlTest, X509CrlTest131, TestSize.Level0) } // Test crl entry getRevocationDate false -HWTEST_F(X509CrlTest, X509CrlTest132, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest132, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); @@ -907,7 +908,7 @@ HWTEST_F(X509CrlTest, X509CrlTest132, TestSize.Level0) } // Test crl entry getRevocationDate false -HWTEST_F(X509CrlTest, X509CrlTest133, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest133, TestSize.Level0) { HcfX509CrlEntry *crlEntry = nullptr; HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); @@ -920,7 +921,7 @@ HWTEST_F(X509CrlTest, X509CrlTest133, TestSize.Level0) } // Test crl getRevokedCertWithCert true -HWTEST_F(X509CrlTest, X509CrlTest141, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest141, TestSize.Level0) { // Get cert HcfX509Certificate *x509Cert = nullptr; @@ -960,7 +961,7 @@ HWTEST_F(X509CrlTest, X509CrlTest141, TestSize.Level0) } // Test crl getRevokedCertWithCert true -HWTEST_F(X509CrlTest, X509CrlTest142, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest142, TestSize.Level0) { // Get cert HcfX509Certificate *x509Cert = nullptr; @@ -1001,7 +1002,7 @@ HWTEST_F(X509CrlTest, X509CrlTest142, TestSize.Level0) } // Test crl getRevokedCertWithCert true -HWTEST_F(X509CrlTest, X509CrlTest143, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest143, TestSize.Level0) { // Get cert HcfX509Certificate *x509Cert = nullptr; @@ -1040,7 +1041,7 @@ HWTEST_F(X509CrlTest, X509CrlTest143, TestSize.Level0) } // Test crl getRevokedCertWithCert false -HWTEST_F(X509CrlTest, X509CrlTest144, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest144, TestSize.Level0) { // Get crl HcfX509Crl *x509Crl = nullptr; @@ -1061,7 +1062,7 @@ HWTEST_F(X509CrlTest, X509CrlTest144, TestSize.Level0) } // Test crl getRevokedCertWithCert false -HWTEST_F(X509CrlTest, X509CrlTest145, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest145, TestSize.Level0) { // Get cert HcfX509Certificate *x509Cert = nullptr; @@ -1093,7 +1094,7 @@ HWTEST_F(X509CrlTest, X509CrlTest145, TestSize.Level0) } // Test crl getRevokedCertWithCert false -HWTEST_F(X509CrlTest, X509CrlTest146, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest146, TestSize.Level0) { // Get cert HcfX509Certificate *x509Cert = nullptr; @@ -1123,7 +1124,7 @@ HWTEST_F(X509CrlTest, X509CrlTest146, TestSize.Level0) } // Test crl getRevokedCertWithCert false -HWTEST_F(X509CrlTest, X509CrlTest147, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest147, TestSize.Level0) { // Get cert HcfX509Certificate *x509Cert = nullptr; @@ -1161,7 +1162,7 @@ HWTEST_F(X509CrlTest, X509CrlTest147, TestSize.Level0) } // Test crl entry getRevokedCerts true -HWTEST_F(X509CrlTest, X509CrlTest151, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest151, TestSize.Level0) { HcfArray entrysOut = { 0 }; HcfResult ret = g_x509Crl->getRevokedCerts(g_x509Crl, &entrysOut); @@ -1180,14 +1181,14 @@ HWTEST_F(X509CrlTest, X509CrlTest151, TestSize.Level0) } // Test crl entry getRevokedCerts false -HWTEST_F(X509CrlTest, X509CrlTest152, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest152, TestSize.Level0) { HcfResult ret = g_x509Crl->getRevokedCerts(g_x509Crl, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl entry getRevokedCerts false -HWTEST_F(X509CrlTest, X509CrlTest153, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest153, TestSize.Level0) { HcfArray entrysOut = { 0 }; HcfResult ret = g_x509Crl->getRevokedCerts(nullptr, &entrysOut); @@ -1196,14 +1197,14 @@ HWTEST_F(X509CrlTest, X509CrlTest153, TestSize.Level0) } // Test crl entry getRevokedCerts false -HWTEST_F(X509CrlTest, X509CrlTest154, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest154, TestSize.Level0) { HcfResult ret = g_x509Crl->getRevokedCerts(nullptr, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getTbsInfo true -HWTEST_F(X509CrlTest, X509CrlTest161, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest161, TestSize.Level0) { HcfBlob tbsCertListOut = { 0 }; HcfResult ret = g_x509Crl->getTbsInfo(g_x509Crl, &tbsCertListOut); @@ -1215,7 +1216,7 @@ HWTEST_F(X509CrlTest, X509CrlTest161, TestSize.Level0) } // Test crl getTbsInfo false -HWTEST_F(X509CrlTest, X509CrlTest162, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest162, TestSize.Level0) { HcfBlob tbsCertListOut = { 0 }; HcfResult ret = g_x509Crl->getTbsInfo(nullptr, &tbsCertListOut); @@ -1224,21 +1225,21 @@ HWTEST_F(X509CrlTest, X509CrlTest162, TestSize.Level0) } // Test crl getTbsInfo false -HWTEST_F(X509CrlTest, X509CrlTest163, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest163, TestSize.Level0) { HcfResult ret = g_x509Crl->getTbsInfo(g_x509Crl, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getTbsInfo false -HWTEST_F(X509CrlTest, X509CrlTest164, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest164, TestSize.Level0) { HcfResult ret = g_x509Crl->getTbsInfo(nullptr, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getSignature true -HWTEST_F(X509CrlTest, X509CrlTest171, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest171, TestSize.Level0) { HcfBlob signature = { 0 }; HcfResult ret = g_x509Crl->getSignature(g_x509Crl, &signature); @@ -1250,7 +1251,7 @@ HWTEST_F(X509CrlTest, X509CrlTest171, TestSize.Level0) } // Test crl getSignature false -HWTEST_F(X509CrlTest, X509CrlTest172, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest172, TestSize.Level0) { HcfBlob signature = { 0 }; HcfResult ret = g_x509Crl->getSignature(nullptr, &signature); @@ -1259,21 +1260,21 @@ HWTEST_F(X509CrlTest, X509CrlTest172, TestSize.Level0) } // Test crl getSignature false -HWTEST_F(X509CrlTest, X509CrlTest173, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest173, TestSize.Level0) { HcfResult ret = g_x509Crl->getSignature(g_x509Crl, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getSignature false -HWTEST_F(X509CrlTest, X509CrlTest174, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest174, TestSize.Level0) { HcfResult ret = g_x509Crl->getSignature(nullptr, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getSignatureAlgName true -HWTEST_F(X509CrlTest, X509CrlTest181, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest181, TestSize.Level0) { HcfBlob out = { 0 }; HcfResult ret = g_x509Crl->getSignatureAlgName(g_x509Crl, &out); @@ -1284,7 +1285,7 @@ HWTEST_F(X509CrlTest, X509CrlTest181, TestSize.Level0) } // Test crl getSignatureAlgName false -HWTEST_F(X509CrlTest, X509CrlTest182, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest182, TestSize.Level0) { HcfBlob out = { 0 }; HcfResult ret = g_x509Crl->getSignatureAlgName(nullptr, &out); @@ -1293,21 +1294,21 @@ HWTEST_F(X509CrlTest, X509CrlTest182, TestSize.Level0) } // Test crl getSignatureAlgName false -HWTEST_F(X509CrlTest, X509CrlTest183, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest183, TestSize.Level0) { HcfResult ret = g_x509Crl->getSignatureAlgName(g_x509Crl, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getSignatureAlgName false -HWTEST_F(X509CrlTest, X509CrlTest184, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest184, TestSize.Level0) { HcfResult ret = g_x509Crl->getSignatureAlgName(nullptr, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getSignatureAlgOid true -HWTEST_F(X509CrlTest, X509CrlTest191, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest191, TestSize.Level0) { HcfBlob out = { 0 }; HcfResult ret = g_x509Crl->getSignatureAlgOid(g_x509Crl, &out); @@ -1318,7 +1319,7 @@ HWTEST_F(X509CrlTest, X509CrlTest191, TestSize.Level0) } // Test crl getSignatureAlgOid false -HWTEST_F(X509CrlTest, X509CrlTest192, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest192, TestSize.Level0) { HcfBlob out = { 0 }; HcfResult ret = g_x509Crl->getSignatureAlgOid(nullptr, &out); @@ -1327,21 +1328,21 @@ HWTEST_F(X509CrlTest, X509CrlTest192, TestSize.Level0) } // Test crl getSignatureAlgOid false -HWTEST_F(X509CrlTest, X509CrlTest193, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest193, TestSize.Level0) { HcfResult ret = g_x509Crl->getSignatureAlgOid(g_x509Crl, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getSignatureAlgOid false -HWTEST_F(X509CrlTest, X509CrlTest194, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest194, TestSize.Level0) { HcfResult ret = g_x509Crl->getSignatureAlgOid(nullptr, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getSignatureAlgParams true -HWTEST_F(X509CrlTest, X509CrlTest201, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest201, TestSize.Level0) { HcfBlob sigAlgParamOut = { 0 }; HcfResult ret = g_x509Crl->getSignatureAlgParams(g_x509Crl, &sigAlgParamOut); @@ -1351,7 +1352,7 @@ HWTEST_F(X509CrlTest, X509CrlTest201, TestSize.Level0) } // Test crl getSignatureAlgParams false -HWTEST_F(X509CrlTest, X509CrlTest202, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest202, TestSize.Level0) { HcfBlob sigAlgParamOut = { 0 }; HcfResult ret = g_x509Crl->getSignatureAlgParams(nullptr, &sigAlgParamOut); @@ -1360,15 +1361,16 @@ HWTEST_F(X509CrlTest, X509CrlTest202, TestSize.Level0) } // Test crl getSignatureAlgParams false -HWTEST_F(X509CrlTest, X509CrlTest203, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest203, TestSize.Level0) { HcfResult ret = g_x509Crl->getSignatureAlgParams(g_x509Crl, nullptr); EXPECT_NE(ret, HCF_SUCCESS); } // Test crl getSignatureAlgParams false -HWTEST_F(X509CrlTest, X509CrlTest204, TestSize.Level0) +HWTEST_F(CryptoX509CrlTest, X509CrlTest204, TestSize.Level0) { HcfResult ret = g_x509Crl->getSignatureAlgParams(nullptr, nullptr); EXPECT_NE(ret, HCF_SUCCESS); +} } \ No newline at end of file -- Gitee From b01dfa60e8b74c0ca7ee321aa89506c5a98c748f Mon Sep 17 00:00:00 2001 From: wutiantian <1159609162@qq.com> Date: Tue, 20 Sep 2022 14:07:35 +0800 Subject: [PATCH 11/16] rsa csec Signed-off-by: wutiantian <1159609162@qq.com> --- .../src/rsa_asy_key_generator_openssl.c | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) 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 ccbd61e..ee5fc52 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 @@ -282,13 +282,29 @@ static HcfResult GetPriKeyEncoded(HcfKey *self, HcfBlob *returnBlob) return RsaSaveKeyMaterial(impl->sk, impl->bits, returnBlob, true); } -static const char *GetKeyFormat(void) +static const char *GetKeyFormat(HcfKey *self) { + if (self == NULL) { + LOGE("Invalid input parameter."); + return NULL; + } + if (!IsClassMatch((HcfObjectBase *)self, OPENSSL_RSA_PRIKEY_CLASS) + && !IsClassMatch((HcfObjectBase *)self, OPENSSL_RSA_PUBKEY_CLASS)) { + return NULL; + } return OPENSSL_RSA_KEY_FORMAT; } -static const char *GetAlgorithm(void) +static const char *GetAlgorithm(HcfKey *self) { + if (self == NULL) { + LOGE("Invalid input parameter."); + return NULL; + } + if (!IsClassMatch((HcfObjectBase *)self, OPENSSL_RSA_PRIKEY_CLASS) + && !IsClassMatch((HcfObjectBase *)self, OPENSSL_RSA_PUBKEY_CLASS)) { + return NULL; + } return OPENSSL_RSA_ALGORITHM; } -- Gitee From 3ad597abe661f1cdc028467c7f041532b833f4d6 Mon Sep 17 00:00:00 2001 From: wutiantian <1159609162@qq.com> Date: Tue, 20 Sep 2022 14:13:29 +0800 Subject: [PATCH 12/16] rsa csec Signed-off-by: wutiantian <1159609162@qq.com> --- .../src/crypto_rsa_asy_key_generator_test.cpp | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/test/unittest/src/crypto_rsa_asy_key_generator_test.cpp b/test/unittest/src/crypto_rsa_asy_key_generator_test.cpp index 56d3723..338e88c 100644 --- a/test/unittest/src/crypto_rsa_asy_key_generator_test.cpp +++ b/test/unittest/src/crypto_rsa_asy_key_generator_test.cpp @@ -24,7 +24,7 @@ using namespace std; using namespace testing::ext; namespace { -class CryptoCryptoRsaAsyKeyGeneratorTest : public testing::Test { +class CryptoRsaAsyKeyGeneratorTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -32,13 +32,13 @@ public: void TearDown(); }; -void CryptoCryptoRsaAsyKeyGeneratorTest::SetUpTestCase() {} -void CryptoCryptoRsaAsyKeyGeneratorTest::TearDownTestCase() {} -void CryptoCryptoRsaAsyKeyGeneratorTest::SetUp() {} -void CryptoCryptoRsaAsyKeyGeneratorTest::TearDown() {} +void CryptoRsaAsyKeyGeneratorTest::SetUpTestCase() {} +void CryptoRsaAsyKeyGeneratorTest::TearDownTestCase() {} +void CryptoRsaAsyKeyGeneratorTest::SetUp() {} +void CryptoRsaAsyKeyGeneratorTest::TearDown() {} // HcfAsyKeyGeneratorCreate correct case: no primes -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest100, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest100, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA512", &generator); @@ -51,7 +51,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest1 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest110, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest110, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA768", &generator); @@ -64,7 +64,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest1 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest120, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest120, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024", &generator); @@ -78,7 +78,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest1 } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest130, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest130, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA2048", &generator); @@ -91,7 +91,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest1 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest140, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest140, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA3072", &generator); @@ -104,7 +104,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest1 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest150, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest150, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA4096", &generator); @@ -118,7 +118,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest1 } // HcfAsyKeyGeneratorCreate correct case: with primes -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest200, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest200, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA512|PRIMES_2", &generator); @@ -131,7 +131,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest2 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest210, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest210, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA768|PRIMES_2", &generator); @@ -144,7 +144,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest2 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest220, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest220, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024|PRIMES_2", &generator); @@ -157,7 +157,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest2 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest230, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest230, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024|PRIMES_3", &generator); @@ -170,7 +170,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest2 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest240, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest240, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA2048|PRIMES_2", &generator); @@ -183,7 +183,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest2 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest250, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest250, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA2048|PRIMES_3", &generator); @@ -196,7 +196,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest2 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest260, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest260, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA3072|PRIMES_3", &generator); @@ -209,7 +209,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest2 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest270, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest270, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA4096|PRIMES_4", &generator); @@ -223,7 +223,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest2 } // HcfAsyKeyGeneratorCreate Incorrect case : algname is null -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest300, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest300, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate(NULL, &generator); @@ -232,7 +232,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest3 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest310, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest310, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("111111111111111111111111111111111111111111111111111111111111111111111111" @@ -242,13 +242,13 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest3 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest320, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest320, TestSize.Level0) { HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024", NULL); EXPECT_NE(res, HCF_SUCCESS); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest330, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest330, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA12315", &generator); @@ -257,7 +257,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest3 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest340, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest340, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA512|PRIMES_777", &generator); @@ -266,7 +266,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest3 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest350, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest350, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA512|PRIMES_3", &generator); @@ -275,7 +275,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest3 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest360, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest360, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA768|PRIMES_3", &generator); @@ -284,7 +284,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest3 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest370, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest370, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024|PRIMES_4", &generator); @@ -293,7 +293,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest3 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest380, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest380, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA3072|PRIMES_4", &generator); @@ -302,7 +302,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest3 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest390, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest390, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA4096|PRIMES_5", &generator); @@ -311,7 +311,7 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest3 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest400, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest400, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024", &generator); @@ -322,13 +322,13 @@ HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest4 OH_HCF_ObjDestroy(generator); } -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest410, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest410, TestSize.Level0) { OH_HCF_ObjDestroy(NULL); } // generateKeyPair correct case -HWTEST_F(CryptoCryptoRsaAsyKeyGeneratorTest, CryptoCryptoRsaAsyKeyGeneratorTest500, TestSize.Level0) +HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest500, TestSize.Level0) { HcfAsyKeyGenerator *generator = NULL; HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024|PRIMES_2", &generator); -- Gitee From cb06e879e3686dcde8a455c1fc799d5999cebd5e Mon Sep 17 00:00:00 2001 From: wutiantian <1159609162@qq.com> Date: Tue, 20 Sep 2022 16:24:53 +0800 Subject: [PATCH 13/16] modify reviewboot Signed-off-by: wutiantian <1159609162@qq.com> --- .../crypto_operation/signature/src/signature_rsa_openssl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/openssl_plugin/crypto_operation/signature/src/signature_rsa_openssl.c b/plugin/openssl_plugin/crypto_operation/signature/src/signature_rsa_openssl.c index 2393c27..b5dd5a7 100644 --- a/plugin/openssl_plugin/crypto_operation/signature/src/signature_rsa_openssl.c +++ b/plugin/openssl_plugin/crypto_operation/signature/src/signature_rsa_openssl.c @@ -58,7 +58,7 @@ static const char *GetRsaSignClass(void) return OPENSSL_RSA_SIGN_CLASS; } -static const char *GetRsaVerifyClass() +static const char *GetRsaVerifyClass(void) { return OPENSSL_RSA_VERIFY_CLASS; } -- Gitee From 53d349b10fcb0e4d490b52eac731720fbd826c38 Mon Sep 17 00:00:00 2001 From: quyawei Date: Tue, 20 Sep 2022 16:55:36 +0800 Subject: [PATCH 14/16] int cast check Signed-off-by: quyawei --- frameworks/rand/rand.c | 2 +- .../openssl_plugin/crypto_operation/hmac/src/mac_openssl.c | 7 ++++++- plugin/openssl_plugin/crypto_operation/md/src/md_openssl.c | 6 +++++- test/unittest/src/crypto_md_test.cpp | 6 ++++++ test/unittest/src/crypto_rand_test.cpp | 6 ++++++ 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/frameworks/rand/rand.c b/frameworks/rand/rand.c index b4a1d97..2e46186 100644 --- a/frameworks/rand/rand.c +++ b/frameworks/rand/rand.c @@ -74,7 +74,7 @@ static HcfResult GenerateRandom(HcfRand *self, int32_t numBytes, HcfBlob *random static HcfResult SetSeed(HcfRand *self, HcfBlob *seed) { - if ((self == NULL) || (!IsBlobValid(seed))) { + if ((self == NULL) || (!IsBlobValid(seed)) || (seed->len > HCF_MAX_BUFFER_LEN)) { LOGE("The input self ptr is NULL!"); return HCF_INVALID_PARAMS; } diff --git a/plugin/openssl_plugin/crypto_operation/hmac/src/mac_openssl.c b/plugin/openssl_plugin/crypto_operation/hmac/src/mac_openssl.c index 00abbbf..ce187c4 100644 --- a/plugin/openssl_plugin/crypto_operation/hmac/src/mac_openssl.c +++ b/plugin/openssl_plugin/crypto_operation/hmac/src/mac_openssl.c @@ -141,7 +141,12 @@ static uint32_t OpensslEngineGetMacLength(HcfMacSpi *self) LOGE("The CTX is NULL!"); return HCF_ERR_CRYPTO_OPERATION; } - return HMAC_size(OpensslGetMacCtx(self)); + int32_t size = HMAC_size(OpensslGetMacCtx(self)); + if (size < 0) { + LOGE("Get the overflow path length in openssl!"); + return 0; + } + return size; } static void OpensslDestroyMac(HcfObjectBase *self) diff --git a/plugin/openssl_plugin/crypto_operation/md/src/md_openssl.c b/plugin/openssl_plugin/crypto_operation/md/src/md_openssl.c index c34c5ae..fc8bae5 100644 --- a/plugin/openssl_plugin/crypto_operation/md/src/md_openssl.c +++ b/plugin/openssl_plugin/crypto_operation/md/src/md_openssl.c @@ -114,7 +114,11 @@ static uint32_t OpensslEngineGetMdLength(HcfMdSpi *self) LOGE("The CTX is NULL!"); return 0; } - uint32_t size = EVP_MD_CTX_size(OpensslGetMdCtx(self)); + int32_t size = EVP_MD_CTX_size(OpensslGetMdCtx(self)); + if (size < 0) { + LOGE("Get the overflow path length in openssl!"); + return 0; + } return size; } diff --git a/test/unittest/src/crypto_md_test.cpp b/test/unittest/src/crypto_md_test.cpp index ee2da93..6bdb968 100644 --- a/test/unittest/src/crypto_md_test.cpp +++ b/test/unittest/src/crypto_md_test.cpp @@ -67,6 +67,12 @@ static void PrintfBlobInHex(uint8_t *data, size_t dataLen) printf("\n"); } +/** + * @tc.name: CryptoFrameworkMdTest.CryptoFrameworkMdCreateTest001 + * @tc.desc: Verify that the creation of the SHA1 Md obj is normal. + * @tc.type: FUNC + * @tc.require: I5QWEM + */ HWTEST_F(CryptoMdTest, CryptoFrameworkMdCreateTest001, TestSize.Level0) { int32_t ret = 0; diff --git a/test/unittest/src/crypto_rand_test.cpp b/test/unittest/src/crypto_rand_test.cpp index a31f6e9..d99f79d 100644 --- a/test/unittest/src/crypto_rand_test.cpp +++ b/test/unittest/src/crypto_rand_test.cpp @@ -44,6 +44,12 @@ void CryptoRandTest::TearDown() // add destroy here, this will be called when te { } +/** + * @tc.name: CryptoFrameworkRandTest.CryptoFrameworkRandCreateTest001 + * @tc.desc: Verify that the creation of the random obj is normal. + * @tc.type: FUNC + * @tc.require: I5QWEN + */ HWTEST_F(CryptoRandTest, CryptoFrameworkRandCreateTest001, TestSize.Level0) { int32_t ret = 0; -- Gitee From ccb667f371ae1cb8b013b4552f2dbc6f57039ae3 Mon Sep 17 00:00:00 2001 From: lvyuanmin Date: Tue, 20 Sep 2022 17:22:06 +0800 Subject: [PATCH 15/16] add log domain Signed-off-by: lvyuanmin --- common/inc/log.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/common/inc/log.h b/common/inc/log.h index 084cd9f..efa6a2d 100644 --- a/common/inc/log.h +++ b/common/inc/log.h @@ -37,15 +37,19 @@ void HcfLogPrint(HcfLogLevel level, const char *funName, const char *fmt, ...); #include "hilog/log.h" +#ifndef CRYPTO_LOG_DOMAIN +#define CRYPTO_LOG_DOMAIN 0xD002F00 /* Security subsystem's domain id */ +#endif + #define LOGD(fmt, ...) (HcfLogPrint(HCF_LOG_LEVEL_DEBUG, __FUNCTION__, fmt, ##__VA_ARGS__)) #define LOGI(fmt, ...) (HcfLogPrint(HCF_LOG_LEVEL_INFO, __FUNCTION__, fmt, ##__VA_ARGS__)) #define LOGW(fmt, ...) (HcfLogPrint(HCF_LOG_LEVEL_WARN, __FUNCTION__, fmt, ##__VA_ARGS__)) #define LOGE(fmt, ...) (HcfLogPrint(HCF_LOG_LEVEL_ERROR, __FUNCTION__, fmt, ##__VA_ARGS__)) -#define HCF_LOG_DEBUG(fmt, ...) HiLogPrint(LOG_CORE, LOG_DEBUG, LOG_DOMAIN, "[HCF]", "%{public}s", buf) -#define HCF_LOG_INFO(buf) HiLogPrint(LOG_CORE, LOG_INFO, LOG_DOMAIN, "[HCF]", "%{public}s", buf) -#define HCF_LOG_WARN(buf) HiLogPrint(LOG_CORE, LOG_WARN, LOG_DOMAIN, "[HCF]", "%{public}s", buf) -#define HCF_LOG_ERROR(buf) HiLogPrint(LOG_CORE, LOG_ERROR, LOG_DOMAIN, "[HCF]", "%{public}s", buf) +#define HCF_LOG_DEBUG(fmt, ...) HiLogPrint(LOG_CORE, LOG_DEBUG, CRYPTO_LOG_DOMAIN, "[HCF]", "%{public}s", buf) +#define HCF_LOG_INFO(buf) HiLogPrint(LOG_CORE, LOG_INFO, CRYPTO_LOG_DOMAIN, "[HCF]", "%{public}s", buf) +#define HCF_LOG_WARN(buf) HiLogPrint(LOG_CORE, LOG_WARN, CRYPTO_LOG_DOMAIN, "[HCF]", "%{public}s", buf) +#define HCF_LOG_ERROR(buf) HiLogPrint(LOG_CORE, LOG_ERROR, CRYPTO_LOG_DOMAIN, "[HCF]", "%{public}s", buf) #else -- Gitee From e42ec9a393fba9517d342e835758f75e2c6da1ab Mon Sep 17 00:00:00 2001 From: winnie-hu Date: Tue, 20 Sep 2022 18:09:53 +0800 Subject: [PATCH 16/16] fix codex Signed-off-by: winnie-hu --- common/inc/hcf_parcel.h | 1 - common/src/hcf_parcel.c | 30 ----------- .../src/x509_cert_chain_validator_openssl.c | 50 ++++++++++--------- .../src/x509_certificate_openssl.c | 4 +- .../certificate/src/x509_crl_openssl.c | 4 +- 5 files changed, 30 insertions(+), 59 deletions(-) diff --git a/common/inc/hcf_parcel.h b/common/inc/hcf_parcel.h index 9587790..83d9c09 100644 --- a/common/inc/hcf_parcel.h +++ b/common/inc/hcf_parcel.h @@ -89,7 +89,6 @@ extern "C" { void DataRevert(void *data, uint32_t length); bool ParcelPopBack(HcParcel *parcel, uint32_t size); bool ParcelPopFront(HcParcel *parcel, uint32_t size); - bool ParcelEraseBlock(HcParcel *parcel, uint32_t start, uint32_t data_size, void *dst); #ifdef __cplusplus } diff --git a/common/src/hcf_parcel.c b/common/src/hcf_parcel.c index 1da4eba..9d2eba8 100644 --- a/common/src/hcf_parcel.c +++ b/common/src/hcf_parcel.c @@ -130,36 +130,6 @@ bool ParcelRead(HcParcel *parcel, void *dst, uint32_t dataSize) return true; } -bool ParcelEraseBlock(HcParcel *parcel, uint32_t start, uint32_t dataSize, void *dst) -{ - errno_t rc; - if (parcel == NULL || dst == NULL || dataSize == 0) { - return false; - } - if (start > PARCEL_UINT_MAX - dataSize) { - return false; - } - uint32_t parcelSizeOrg = GetParcelDataSize(parcel); - if (parcelSizeOrg < start + dataSize) { - return false; - } - char *beginCopy = parcel->data + parcel->beginPos + start; - uint32_t copySize = parcelSizeOrg - start - dataSize; - - rc = memmove_s(dst, dataSize, beginCopy, dataSize); - if (rc != EOK) { - return false; - } - if (copySize != 0) { - rc = memmove_s(beginCopy, copySize, beginCopy + dataSize, copySize); - if (rc != EOK) { - return false; - } - } - parcel->endPos -= dataSize; - return true; -} - bool ParcelReadRevert(HcParcel *parcel, void *dst, uint32_t dataSize) { if (ParcelRead(parcel, dst, dataSize)) { diff --git a/plugin/openssl_plugin/certificate/src/x509_cert_chain_validator_openssl.c b/plugin/openssl_plugin/certificate/src/x509_cert_chain_validator_openssl.c index 4c13188..61ef2f5 100644 --- a/plugin/openssl_plugin/certificate/src/x509_cert_chain_validator_openssl.c +++ b/plugin/openssl_plugin/certificate/src/x509_cert_chain_validator_openssl.c @@ -41,6 +41,31 @@ typedef struct { X509 *x509; } CertsInfo; +typedef struct { + int32_t errCode; + HcfResult result; +} OpensslErrorToResult; + +static const OpensslErrorToResult ERROR_TO_RESULT_MAP[] = { + { X509_V_OK, HCF_SUCCESS }, + { X509_V_ERR_CERT_SIGNATURE_FAILURE, HCF_ERR_CERT_SIGNATURE_FAILURE }, + { X509_V_ERR_CERT_NOT_YET_VALID, HCF_ERR_CERT_NOT_YET_VALID }, + { X509_V_ERR_CERT_HAS_EXPIRED, HCF_ERR_CERT_HAS_EXPIRED }, + { X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, HCF_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY }, + { X509_V_ERR_KEYUSAGE_NO_CERTSIGN, HCF_ERR_KEYUSAGE_NO_CERTSIGN }, + { X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE, HCF_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE }, +}; + +static HcfResult ConvertOpensslErrorMsg(int32_t errCode) +{ + for (uint32_t i = 0; i < sizeof(ERROR_TO_RESULT_MAP); i++) { + if (ERROR_TO_RESULT_MAP[i].errCode == errCode) { + return ERROR_TO_RESULT_MAP[i].result; + } + } + return HCF_ERR_CRYPTO_OPERATION; +} + static const char *GetX509CertChainValidatorClass(void) { return X509_CERT_CHAIN_VALIDATOR_OPENSSL_CLASS; @@ -111,29 +136,6 @@ static X509 *GetX509Cert(const uint8_t *data, size_t len, enum EncodingFormat fo return x509; } -static HcfResult ConvertOpensslErrorMsg(int32_t errCode) -{ - switch (errCode) { - case X509_V_OK: - return HCF_SUCCESS; - case X509_V_ERR_CERT_SIGNATURE_FAILURE: - return HCF_ERR_CERT_SIGNATURE_FAILURE; - case X509_V_ERR_CERT_NOT_YET_VALID: - return HCF_ERR_CERT_NOT_YET_VALID; - case X509_V_ERR_CERT_HAS_EXPIRED: - return HCF_ERR_CERT_HAS_EXPIRED; - case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY: - return HCF_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY; - case X509_V_ERR_KEYUSAGE_NO_CERTSIGN: - return HCF_ERR_KEYUSAGE_NO_CERTSIGN; - case X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE: - return HCF_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE; - default: - break; - } - return HCF_ERR_CRYPTO_OPERATION; -} - static HcfResult ValidateCertChainInner(CertsInfo *certs, uint32_t certNum) { HcfResult res = HCF_SUCCESS; @@ -200,7 +202,7 @@ static HcfResult ValidateCertChain(CertsInfo *certs, uint32_t certNum, enum Enco static HcfResult Validate(HcfCertChainValidatorSpi *self, const HcfArray *certsList) { - if ((self == NULL) || (certsList == NULL)) { + if ((self == NULL) || (certsList == NULL) || (certsList->count <= 1)) { LOGE("Invalid input parameter."); return HCF_INVALID_PARAMS; } diff --git a/plugin/openssl_plugin/certificate/src/x509_certificate_openssl.c b/plugin/openssl_plugin/certificate/src/x509_certificate_openssl.c index 443d88f..4ac1696 100644 --- a/plugin/openssl_plugin/certificate/src/x509_certificate_openssl.c +++ b/plugin/openssl_plugin/certificate/src/x509_certificate_openssl.c @@ -41,7 +41,7 @@ typedef struct { EVP_PKEY *pubKey; } X509PubKeyOpensslImpl; -static HcfResult DeepCopyDataToOut(const char *data, int32_t len, HcfBlob *out) +static HcfResult DeepCopyDataToOut(const char *data, uint32_t len, HcfBlob *out) { out->data = (uint8_t *)HcfMalloc(len, 0); if (out->data == NULL) { @@ -618,7 +618,7 @@ static HcfResult GetKeyUsageX509Openssl(HcfX509CertificateSpi *self, HcfBlob *bo X509 *x509 = realCert->x509; ASN1_BIT_STRING *keyUsage = (ASN1_BIT_STRING *)X509_get_ext_d2i(x509, NID_key_usage, NULL, NULL); - if ((keyUsage == NULL) || (keyUsage->length == 0)) { + if ((keyUsage == NULL) || (keyUsage->length <= 0)|| (keyUsage->length >= HCF_MAX_STR_LEN)) { LOGE("Failed to get x509 keyUsage in openssl!"); HcfPrintOpensslError(); return HCF_ERR_CRYPTO_OPERATION; diff --git a/plugin/openssl_plugin/certificate/src/x509_crl_openssl.c b/plugin/openssl_plugin/certificate/src/x509_crl_openssl.c index efd9f15..3eb9451 100644 --- a/plugin/openssl_plugin/certificate/src/x509_crl_openssl.c +++ b/plugin/openssl_plugin/certificate/src/x509_crl_openssl.c @@ -455,7 +455,7 @@ static void DestroyCRLEntryArray(HcfArray *arr) return; } for (uint32_t i = 0; i < arr->count; ++i) { - if ((arr->data[i].data == NULL) || (arr->data[i].len = 0)) { + if (arr->data[i].data == NULL) { continue; } HcfX509CrlEntry *crlEntry = (HcfX509CrlEntry *)(arr->data[i].data); @@ -485,7 +485,7 @@ static HcfResult GetRevokedCerts(HcfX509CrlSpi *self, HcfArray *entrysOut) return HCF_ERR_CRYPTO_OPERATION; } int32_t revokedNum = sk_X509_REVOKED_num(entrys); - if ((revokedNum < 0) || (revokedNum > MAX_REV_NUM)) { + if ((revokedNum <= 0) || (revokedNum > MAX_REV_NUM)) { LOGE("Get revoked invalid number!"); HcfPrintOpensslError(); return HCF_ERR_CRYPTO_OPERATION; -- Gitee