diff --git a/cfi_blocklist.txt b/cfi_blocklist.txt new file mode 100644 index 0000000000000000000000000000000000000000..4fc5765dae2028eebc846ebc400c2b34bff92dc4 --- /dev/null +++ b/cfi_blocklist.txt @@ -0,0 +1,5 @@ +src:*/frameworks/certificate/* +src:*/frameworks/crypto_operation/* +src:*/frameworks/key/* +src:*/frameworks/rand/* +src:*/frameworks/js/napi/src/* \ No newline at end of file diff --git a/common/common.gni b/common/common.gni index ceb413924fb86cf30c900a9fbd4d9a59bc751c63..264ae1da53085bbeb45c0c69d4e545d6e6362026 100644 --- a/common/common.gni +++ b/common/common.gni @@ -24,6 +24,7 @@ framework_common_util_files = [ "//base/security/crypto_framework/common/src/hcf_parcel.c", "//base/security/crypto_framework/common/src/hcf_string.c", "//base/security/crypto_framework/common/src/params_parser.c", + "//base/security/crypto_framework/common/src/object_base.c", ] crypto_framwork_common_files = framework_common_util_files diff --git a/common/src/object_base.c b/common/src/object_base.c new file mode 100644 index 0000000000000000000000000000000000000000..d3ff9178b45dca9b5938a3410eb2debd934be213 --- /dev/null +++ b/common/src/object_base.c @@ -0,0 +1,25 @@ +/* + * 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. + */ + +#include "object_base.h" + +#include + +void HcfObjDestroy(void *obj) +{ + if (obj != NULL) { + ((HcfObjectBase *)obj)->destroy((HcfObjectBase *)obj); + } +} diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn index 46f76f9da9d3b64755209bfef36231abb805c4a9..590080c9dc40aa0067abf4adcaf62439d712a510 100644 --- a/frameworks/BUILD.gn +++ b/frameworks/BUILD.gn @@ -38,6 +38,14 @@ ohos_shared_library("crypto_framework_lib") { sources = framework_files + if (os_level == "standard") { + sanitize = { + cfi = true + debug = false + blocklist = "//base/security/crypto_framework/cfi_blocklist.txt" + } + } + cflags = [ "-DHILOG_ENABLE", "-fPIC", @@ -69,6 +77,14 @@ ohos_shared_library("cryptoframework_napi") { ] include_dirs += framework_inc_path + if (os_level == "standard") { + sanitize = { + cfi = true + debug = false + blocklist = "//base/security/crypto_framework/cfi_blocklist.txt" + } + } + cflags = [ "-DHILOG_ENABLE", "-fPIC", diff --git a/frameworks/certificate/cert_chain_validator.c b/frameworks/certificate/cert_chain_validator.c index 59373f1ca07b7ed7e5ebe0ac5aca0bd7e0a4124c..7742bfec85b9fc365edb1c88ded440a940af555c 100644 --- a/frameworks/certificate/cert_chain_validator.c +++ b/frameworks/certificate/cert_chain_validator.c @@ -78,7 +78,7 @@ static void DestroyCertChainValidator(HcfObjectBase *self) return; } CertChainValidatorImpl *validatorImpl = (CertChainValidatorImpl *)self; - OH_HCF_OBJ_DESTROY(validatorImpl->spiObj); + HcfObjDestroy(validatorImpl->spiObj); HcfFree(validatorImpl->algorithm); validatorImpl->algorithm = NULL; HcfFree(validatorImpl); diff --git a/frameworks/certificate/x509_certificate.c b/frameworks/certificate/x509_certificate.c index b2a9034dd8ecfb6a1095567ff6735c550e36e6f7..1dd24ad2ce4be1857e01268a774ae95bce220ff9 100644 --- a/frameworks/certificate/x509_certificate.c +++ b/frameworks/certificate/x509_certificate.c @@ -70,7 +70,7 @@ static void DestroyX509Certificate(HcfObjectBase *self) return; } HcfX509CertificateImpl *impl = (HcfX509CertificateImpl *)self; - OH_HCF_OBJ_DESTROY(impl->spiObj); + HcfObjDestroy(impl->spiObj); HcfFree(impl); } diff --git a/frameworks/certificate/x509_crl.c b/frameworks/certificate/x509_crl.c index 152e71f221318b4e77da752955193906d0b408ae..cdd84f75a41ea1306076a2d2a3f786f7581570c9 100644 --- a/frameworks/certificate/x509_crl.c +++ b/frameworks/certificate/x509_crl.c @@ -80,7 +80,7 @@ static void DestroyX509Crl(HcfObjectBase *self) return; } HcfX509CrlImpl *impl = (HcfX509CrlImpl *)self; - OH_HCF_OBJ_DESTROY(impl->spiObj); + HcfObjDestroy(impl->spiObj); HcfFree(impl); } diff --git a/frameworks/crypto_operation/cipher.c b/frameworks/crypto_operation/cipher.c index 10cc0036d5a2e59c27b8f19e4031b53fa0268b34..f44075d4547a21db7042479794c84bb4580a1459 100644 --- a/frameworks/crypto_operation/cipher.c +++ b/frameworks/crypto_operation/cipher.c @@ -159,7 +159,7 @@ static void CipherDestroy(HcfObjectBase *self) return; } CipherGenImpl *impl = (CipherGenImpl *)self; - OH_HCF_OBJ_DESTROY(impl->spiObj); + HcfObjDestroy(impl->spiObj); HcfFree(impl); } diff --git a/frameworks/crypto_operation/key_agreement.c b/frameworks/crypto_operation/key_agreement.c index 526588ffe8a611104bc1ebb960b3a54b3d5858fa..a94507e0180dbb0f02bc528bb62d78af0c530a32 100644 --- a/frameworks/crypto_operation/key_agreement.c +++ b/frameworks/crypto_operation/key_agreement.c @@ -132,7 +132,7 @@ static void DestroyKeyAgreement(HcfObjectBase *self) return; } HcfKeyAgreementImpl *impl = (HcfKeyAgreementImpl *)self; - OH_HCF_OBJ_DESTROY(impl->spiObj); + HcfObjDestroy(impl->spiObj); impl->spiObj = NULL; HcfFree(impl); } diff --git a/frameworks/crypto_operation/mac.c b/frameworks/crypto_operation/mac.c index b94a30e0aa526b935c8457d3da3fbb54792c8396..1ec15e8194c26148a6745a1e815b9019242b4aef 100644 --- a/frameworks/crypto_operation/mac.c +++ b/frameworks/crypto_operation/mac.c @@ -145,7 +145,7 @@ static void MacDestroy(HcfObjectBase *self) return; } HcfMacImpl *impl = (HcfMacImpl *)self; - OH_HCF_OBJ_DESTROY(impl->spiObj); + HcfObjDestroy(impl->spiObj); HcfFree(impl); } diff --git a/frameworks/crypto_operation/md.c b/frameworks/crypto_operation/md.c index b61c0a9f60206840fc9cc389100d3c542da7bd18..de6c3d1d739ffc9eaff9d59809a320a38ad29114 100644 --- a/frameworks/crypto_operation/md.c +++ b/frameworks/crypto_operation/md.c @@ -133,7 +133,7 @@ static void MdDestroy(HcfObjectBase *self) return; } HcfMdImpl *impl = (HcfMdImpl *)self; - OH_HCF_OBJ_DESTROY(impl->spiObj); + HcfObjDestroy(impl->spiObj); HcfFree(impl); } diff --git a/frameworks/crypto_operation/signature.c b/frameworks/crypto_operation/signature.c index 5ba115677ea58f55b907a5d61628776200018570..f155ef597b40946440e3e1809fc299e433847600 100644 --- a/frameworks/crypto_operation/signature.c +++ b/frameworks/crypto_operation/signature.c @@ -185,7 +185,7 @@ static void DestroySign(HcfObjectBase *self) return; } HcfSignImpl *impl = (HcfSignImpl *)self; - OH_HCF_OBJ_DESTROY(impl->spiObj); + HcfObjDestroy(impl->spiObj); impl->spiObj = NULL; HcfFree(impl); } @@ -199,7 +199,7 @@ static void DestroyVerify(HcfObjectBase *self) return; } HcfVerifyImpl *impl = (HcfVerifyImpl *)self; - OH_HCF_OBJ_DESTROY(impl->spiObj); + HcfObjDestroy(impl->spiObj); impl->spiObj = NULL; HcfFree(impl); } diff --git a/frameworks/js/napi/src/napi_asy_key_generator.cpp b/frameworks/js/napi/src/napi_asy_key_generator.cpp index fd911d6c0d96506a80769c71c0f104a31634b733..539b2401ee52736290962aaae46f634295fdcd94 100644 --- a/frameworks/js/napi/src/napi_asy_key_generator.cpp +++ b/frameworks/js/napi/src/napi_asy_key_generator.cpp @@ -406,7 +406,7 @@ NapiAsyKeyGenerator::NapiAsyKeyGenerator(HcfAsyKeyGenerator *generator) NapiAsyKeyGenerator::~NapiAsyKeyGenerator() { - OH_HCF_OBJ_DESTROY(this->generator_); + HcfObjDestroy(this->generator_); } HcfAsyKeyGenerator *NapiAsyKeyGenerator::GetAsyKeyGenerator() diff --git a/frameworks/js/napi/src/napi_cert_chain_validator.cpp b/frameworks/js/napi/src/napi_cert_chain_validator.cpp index d87e1955c70c8ed0ec89b524ba8ebd4e45f3ad88..0f5976b6d7dd4e460597999cc13dd81c9f7d0fcd 100644 --- a/frameworks/js/napi/src/napi_cert_chain_validator.cpp +++ b/frameworks/js/napi/src/napi_cert_chain_validator.cpp @@ -49,7 +49,7 @@ NapiCertChainValidator::NapiCertChainValidator(HcfCertChainValidator *certChainV NapiCertChainValidator::~NapiCertChainValidator() { - OH_HCF_OBJ_DESTROY(this->certChainValidator_); + HcfObjDestroy(this->certChainValidator_); } static void FreeCryptoFwkCtx(napi_env env, CfCtx *context) diff --git a/frameworks/js/napi/src/napi_cipher.cpp b/frameworks/js/napi/src/napi_cipher.cpp index ce362c786bf2ef41dfa3d06108de1be62a21b6c2..a80418a6cabd262d284d7a12f7860f99c2d20760 100644 --- a/frameworks/js/napi/src/napi_cipher.cpp +++ b/frameworks/js/napi/src/napi_cipher.cpp @@ -498,7 +498,7 @@ NapiCipher::NapiCipher(HcfCipher *cipher) NapiCipher::~NapiCipher() { - OH_HCF_OBJ_DESTROY(this->cipher_); + HcfObjDestroy(this->cipher_); } HcfCipher *NapiCipher::GetCipher() @@ -628,7 +628,7 @@ napi_value NapiCipher::CreateCipher(napi_env env, napi_callback_info info) NapiCipher *napiCipher = new (std::nothrow) NapiCipher(cipher); if (napiCipher == nullptr) { LOGE("new napiCipher failed!"); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); return nullptr; } diff --git a/frameworks/js/napi/src/napi_key.cpp b/frameworks/js/napi/src/napi_key.cpp index 77d97bc40bb7676bcc92aa9132bce4163f7edf99..8323ff1814d65fd4870ef5b4efc23850dea65d74 100644 --- a/frameworks/js/napi/src/napi_key.cpp +++ b/frameworks/js/napi/src/napi_key.cpp @@ -32,7 +32,7 @@ NapiKey::NapiKey(HcfKey *hcfKey) NapiKey::~NapiKey() { - OH_HCF_OBJ_DESTROY(this->hcfKey_); + HcfObjDestroy(this->hcfKey_); this->hcfKey_ = nullptr; } diff --git a/frameworks/js/napi/src/napi_key_agreement.cpp b/frameworks/js/napi/src/napi_key_agreement.cpp index f391f6c6102c1b75699df47d5ca81483a4455a51..b88413bd78dfbbf0eca10de72e554d8e6c0ec3b1 100644 --- a/frameworks/js/napi/src/napi_key_agreement.cpp +++ b/frameworks/js/napi/src/napi_key_agreement.cpp @@ -214,7 +214,7 @@ NapiKeyAgreement::NapiKeyAgreement(HcfKeyAgreement *keyAgreement) NapiKeyAgreement::~NapiKeyAgreement() { - OH_HCF_OBJ_DESTROY(this->keyAgreement_); + HcfObjDestroy(this->keyAgreement_); } HcfKeyAgreement *NapiKeyAgreement::GetKeyAgreement() diff --git a/frameworks/js/napi/src/napi_key_pair.cpp b/frameworks/js/napi/src/napi_key_pair.cpp index b20b4fe04bb6e6be248cdc45dc1507520341024e..ab1897eda9abdb71dc49c4fe0b6493cb24be6c98 100644 --- a/frameworks/js/napi/src/napi_key_pair.cpp +++ b/frameworks/js/napi/src/napi_key_pair.cpp @@ -34,7 +34,7 @@ NapiKeyPair::NapiKeyPair(HcfKeyPair *keyPair) NapiKeyPair::~NapiKeyPair() { - OH_HCF_OBJ_DESTROY(this->keyPair_); + HcfObjDestroy(this->keyPair_); } napi_value NapiKeyPair::KeyPairConstructor(napi_env env, napi_callback_info info) diff --git a/frameworks/js/napi/src/napi_mac.cpp b/frameworks/js/napi/src/napi_mac.cpp index 9c091d8b9b7bdf974c1865cbd4771a726bf8355b..21485388eab1f68cb978ad8d7202c3cfd7a7c503 100644 --- a/frameworks/js/napi/src/napi_mac.cpp +++ b/frameworks/js/napi/src/napi_mac.cpp @@ -60,7 +60,7 @@ static void FreeCryptoFwkCtx(napi_env env, MacCtx *context) context->callback = nullptr; } if (context->symKey != nullptr) { - OH_HCF_OBJ_DESTROY(context->symKey); + HcfObjDestroy(context->symKey); } if (context->inBlob != nullptr) { HcfFree(context->inBlob->data); @@ -123,7 +123,7 @@ NapiMac::NapiMac(HcfMac *macObj) NapiMac::~NapiMac() { - OH_HCF_OBJ_DESTROY(this->macObj_); + HcfObjDestroy(this->macObj_); } static void MacInitExecute(napi_env env, void *data) diff --git a/frameworks/js/napi/src/napi_md.cpp b/frameworks/js/napi/src/napi_md.cpp index 5bac3f0591de6f98ee0e7d69669e85b9c7444f7d..9f07afe7ddb52da2958e1004d9fac476e5278f89 100644 --- a/frameworks/js/napi/src/napi_md.cpp +++ b/frameworks/js/napi/src/napi_md.cpp @@ -118,7 +118,7 @@ NapiMd::NapiMd(HcfMd *mdObj) NapiMd::~NapiMd() { - OH_HCF_OBJ_DESTROY(this->mdObj_); + HcfObjDestroy(this->mdObj_); } static void MdUpdateExecute(napi_env env, void *data) diff --git a/frameworks/js/napi/src/napi_rand.cpp b/frameworks/js/napi/src/napi_rand.cpp index 2eada55f71f1dc0c5c4bd5897fc30bbab14a49fa..5e867ee6a45cac34b6429fe9ec3321b0cb1d22f8 100644 --- a/frameworks/js/napi/src/napi_rand.cpp +++ b/frameworks/js/napi/src/napi_rand.cpp @@ -119,7 +119,7 @@ NapiRand::NapiRand(HcfRand *randObj) NapiRand::~NapiRand() { - OH_HCF_OBJ_DESTROY(this->randObj_); + HcfObjDestroy(this->randObj_); } static void GenerateRandomExecute(napi_env env, void *data) diff --git a/frameworks/js/napi/src/napi_sign.cpp b/frameworks/js/napi/src/napi_sign.cpp index 4d2787d220b106b34cf11d0f4fc5a8f30dadb396..508671d7986ab750385625cce396e3e533ddd5c1 100644 --- a/frameworks/js/napi/src/napi_sign.cpp +++ b/frameworks/js/napi/src/napi_sign.cpp @@ -517,7 +517,7 @@ NapiSign::NapiSign(HcfSign *sign) NapiSign::~NapiSign() { - OH_HCF_OBJ_DESTROY(this->sign_); + HcfObjDestroy(this->sign_); } HcfSign *NapiSign::GetSign() diff --git a/frameworks/js/napi/src/napi_sym_key_generator.cpp b/frameworks/js/napi/src/napi_sym_key_generator.cpp index bc8944ff92090498a21ee1b49bbaa8e71d2b06de..41540cc1506d9ae17702f01f453a5582dbac21a9 100644 --- a/frameworks/js/napi/src/napi_sym_key_generator.cpp +++ b/frameworks/js/napi/src/napi_sym_key_generator.cpp @@ -308,7 +308,7 @@ NapiSymKeyGenerator::NapiSymKeyGenerator(HcfSymKeyGenerator *generator) NapiSymKeyGenerator::~NapiSymKeyGenerator() { - OH_HCF_OBJ_DESTROY(this->generator_); + HcfObjDestroy(this->generator_); } HcfSymKeyGenerator *NapiSymKeyGenerator::GetSymKeyGenerator() @@ -403,7 +403,7 @@ napi_value NapiSymKeyGenerator::CreateSymKeyGenerator(napi_env env, napi_callbac NapiSymKeyGenerator *napiSymKeyGenerator = new (std::nothrow) NapiSymKeyGenerator(generator); if (napiSymKeyGenerator == nullptr) { LOGE("new napiSymKeyGenerator failed!"); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); return nullptr; } diff --git a/frameworks/js/napi/src/napi_verify.cpp b/frameworks/js/napi/src/napi_verify.cpp index ddd5d2295001d8011c9a5b00dc01e20dc363abb9..08864172835eab689cd1a3a85c4d71d41be37c96 100644 --- a/frameworks/js/napi/src/napi_verify.cpp +++ b/frameworks/js/napi/src/napi_verify.cpp @@ -544,7 +544,7 @@ NapiVerify::NapiVerify(HcfVerify *verify) NapiVerify::~NapiVerify() { - OH_HCF_OBJ_DESTROY(this->verify_); + HcfObjDestroy(this->verify_); } HcfVerify *NapiVerify::GetVerify() diff --git a/frameworks/js/napi/src/napi_x509_certificate.cpp b/frameworks/js/napi/src/napi_x509_certificate.cpp index cbc790534629c1d48c4270543240cb1c6a83b7a9..798292dbefdbc8b729ad570914dabb08cd78c396 100644 --- a/frameworks/js/napi/src/napi_x509_certificate.cpp +++ b/frameworks/js/napi/src/napi_x509_certificate.cpp @@ -56,7 +56,7 @@ NapiX509Certificate::NapiX509Certificate(HcfX509Certificate *x509Cert) NapiX509Certificate::~NapiX509Certificate() { - OH_HCF_OBJ_DESTROY(this->x509Cert_); + HcfObjDestroy(this->x509Cert_); } static void FreeCryptoFwkCtx(napi_env env, CfCtx *context) diff --git a/frameworks/js/napi/src/napi_x509_crl.cpp b/frameworks/js/napi/src/napi_x509_crl.cpp index 9f76756afa8602cb635854ca1d039893b1f3a1d9..641576883ca9411f88218baa2db2a8c4d3e861ff 100644 --- a/frameworks/js/napi/src/napi_x509_crl.cpp +++ b/frameworks/js/napi/src/napi_x509_crl.cpp @@ -148,7 +148,7 @@ NapiX509Crl::NapiX509Crl(HcfX509Crl *x509Crl) NapiX509Crl::~NapiX509Crl() { - OH_HCF_OBJ_DESTROY(this->x509Crl_); + HcfObjDestroy(this->x509Crl_); } void IsInvokedExecute(napi_env env, void *data) diff --git a/frameworks/js/napi/src/napi_x509_crl_entry.cpp b/frameworks/js/napi/src/napi_x509_crl_entry.cpp index cec64bd8676ed29c22ee1c110f4e31e50f102424..dec22de00a68823d9ab0899c181f38eaef52a8cb 100644 --- a/frameworks/js/napi/src/napi_x509_crl_entry.cpp +++ b/frameworks/js/napi/src/napi_x509_crl_entry.cpp @@ -126,7 +126,7 @@ NapiX509CrlEntry::NapiX509CrlEntry(HcfX509CrlEntry *x509CrlEntry) NapiX509CrlEntry::~NapiX509CrlEntry() { - OH_HCF_OBJ_DESTROY(this->x509CrlEntry_); + HcfObjDestroy(this->x509CrlEntry_); } static void GetEncodedExecute(napi_env env, void *data) diff --git a/frameworks/key/asy_key_generator.c b/frameworks/key/asy_key_generator.c index 46edbb398c38e3b70b7b15cfe6a5f50d28fe247a..9757d236159885649043f4d9c979fd01c71ffe58 100644 --- a/frameworks/key/asy_key_generator.c +++ b/frameworks/key/asy_key_generator.c @@ -206,7 +206,7 @@ static void DestroyAsyKeyGenerator(HcfObjectBase *self) return; } HcfAsyKeyGeneratorImpl *impl = (HcfAsyKeyGeneratorImpl *)self; - OH_HCF_OBJ_DESTROY(impl->spiObj); + HcfObjDestroy(impl->spiObj); impl->spiObj = NULL; HcfFree(impl); } diff --git a/frameworks/key/sym_key_generator.c b/frameworks/key/sym_key_generator.c index 79dc89517a34ad0aef10fa7aca6c567b0a8f3266..fb34edd579ed7d6092d418d1f124d7e47d4a5296 100644 --- a/frameworks/key/sym_key_generator.c +++ b/frameworks/key/sym_key_generator.c @@ -138,9 +138,7 @@ static void DestroySymmKeyGenerator(HcfObjectBase *base) return; } HcfSymmKeyGeneratorImpl *impl = (HcfSymmKeyGeneratorImpl *)base; - if (impl->spiObj != NULL) { - OH_HCF_OBJ_DESTROY((HcfObjectBase *)impl->spiObj); - } + HcfObjDestroy(impl->spiObj); HcfFree(impl); } diff --git a/frameworks/rand/rand.c b/frameworks/rand/rand.c index 9485489e9eaccbb23a271ac50bd631fb284d189c..4681bfac51534169286784d6818ae5b01a7c7842 100644 --- a/frameworks/rand/rand.c +++ b/frameworks/rand/rand.c @@ -97,7 +97,7 @@ static void HcfRandDestroy(HcfObjectBase *self) return; } HcfRandImpl *impl = (HcfRandImpl *)self; - OH_HCF_OBJ_DESTROY(impl->spiObj); + HcfObjDestroy(impl->spiObj); HcfFree(impl); } diff --git a/interfaces/innerkits/common/object_base.h b/interfaces/innerkits/common/object_base.h index 0648c505989c8f1151b35f6b4d6480436a597f8b..f2345f5e4c25036beea51785927de0d8e8778b09 100644 --- a/interfaces/innerkits/common/object_base.h +++ b/interfaces/innerkits/common/object_base.h @@ -23,9 +23,14 @@ struct HcfObjectBase { void (*destroy)(HcfObjectBase *self); }; -#define OH_HCF_OBJ_DESTROY(base) \ - if ((base) != NULL) { \ - ((HcfObjectBase *)(base))->destroy((HcfObjectBase *)(base)); \ - } +#ifdef __cplusplus +extern "C" { +#endif + +void HcfObjDestroy(void *obj); + +#ifdef __cplusplus +} +#endif #endif // HCF_OBJECT_BASE_H diff --git a/plugin/BUILD.gn b/plugin/BUILD.gn index a53f079ca8626cd4c3f153c490fa062e22ec3ad9..c376dfd03baeb7734a34fa98bf373bd2e6a0cd4c 100644 --- a/plugin/BUILD.gn +++ b/plugin/BUILD.gn @@ -39,6 +39,13 @@ ohos_shared_library("crypto_openssl_plugin_lib") { sources = plugin_files + if (os_level == "standard") { + sanitize = { + cfi = true + debug = false + } + } + cflags = [ "-fPIC", "-Wall", diff --git a/plugin/openssl_plugin/key/asy_key_generator/src/ecc_asy_key_generator_openssl.c b/plugin/openssl_plugin/key/asy_key_generator/src/ecc_asy_key_generator_openssl.c index 6e9a56dafdc1653efe5fc355ac85a35fda4625a8..82b50caf7a50783e2bd4970be5abc80d65b40ca4 100644 --- a/plugin/openssl_plugin/key/asy_key_generator/src/ecc_asy_key_generator_openssl.c +++ b/plugin/openssl_plugin/key/asy_key_generator/src/ecc_asy_key_generator_openssl.c @@ -123,11 +123,11 @@ static void DestroyEccKeyPair(HcfObjectBase *self) } HcfOpensslEccKeyPair *impl = (HcfOpensslEccKeyPair *)self; if (impl->base.pubKey != NULL) { - OH_HCF_OBJ_DESTROY(impl->base.pubKey); + HcfObjDestroy(impl->base.pubKey); impl->base.pubKey = NULL; } if (impl->base.priKey != NULL) { - OH_HCF_OBJ_DESTROY(impl->base.priKey); + HcfObjDestroy(impl->base.priKey); impl->base.priKey = NULL; } HcfFree(impl); @@ -437,8 +437,8 @@ static HcfResult EngineConvertEccKey(HcfAsyKeyGeneratorSpi *self, HcfParamsSpec res = CreateEccKeyPair(pubKey, priKey, &keyPair); } while (0); if (res != HCF_SUCCESS) { - OH_HCF_OBJ_DESTROY(pubKey); - OH_HCF_OBJ_DESTROY(priKey); + HcfObjDestroy(pubKey); + HcfObjDestroy(priKey); return res; } @@ -475,15 +475,15 @@ static HcfResult EngineGenerateKeyPair(HcfAsyKeyGeneratorSpi *self, HcfKeyPair * HcfOpensslEccPriKey *priKey = NULL; res = CreateEccPriKey(impl->curveId, ecPriKey, &priKey); if (res != HCF_SUCCESS) { - OH_HCF_OBJ_DESTROY(pubKey); + HcfObjDestroy(pubKey); BN_clear_free(ecPriKey); return res; } HcfOpensslEccKeyPair *returnKeyPair = (HcfOpensslEccKeyPair *)HcfMalloc(sizeof(HcfOpensslEccKeyPair), 0); if (returnKeyPair == NULL) { LOGE("Failed to allocate returnKeyPair memory!"); - OH_HCF_OBJ_DESTROY(pubKey); - OH_HCF_OBJ_DESTROY(priKey); + HcfObjDestroy(pubKey); + HcfObjDestroy(priKey); return HCF_ERR_MALLOC; } returnKeyPair->base.base.getClass = GetEccKeyPairClass; 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 f4dfbd8e7da5fdfdc832419cd192c30e387c3b91..e0fc970f5d487fc7070107cf28a71a4ceb68959e 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 @@ -191,9 +191,9 @@ static void DestroyKeyPair(HcfObjectBase *self) return; } HcfOpensslRsaKeyPair *impl = (HcfOpensslRsaKeyPair*)self; - OH_HCF_OBJ_DESTROY((HcfObjectBase *)impl->base.priKey); + HcfObjDestroy((HcfObjectBase *)impl->base.priKey); impl->base.priKey = NULL; - OH_HCF_OBJ_DESTROY((HcfObjectBase *)impl->base.pubKey); + HcfObjDestroy((HcfObjectBase *)impl->base.pubKey); impl->base.pubKey = NULL; HcfFree(self); } @@ -693,7 +693,7 @@ static HcfResult EngineConvertKey(HcfAsyKeyGeneratorSpi *self, HcfParamsSpec *pa if (priKeyBlob != NULL && priKeyBlob->data != NULL) { if (ConvertPriKey(priKeyBlob, &priKey) != HCF_SUCCESS) { LOGE("convert prikey fail."); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)pubKey); + HcfObjDestroy((HcfObjectBase *)pubKey); return HCF_INVALID_PARAMS; } } @@ -701,8 +701,8 @@ static HcfResult EngineConvertKey(HcfAsyKeyGeneratorSpi *self, HcfParamsSpec *pa HcfOpensslRsaKeyPair *keyPair = (HcfOpensslRsaKeyPair *)HcfMalloc(sizeof(HcfOpensslRsaKeyPair), 0); if (keyPair == NULL) { LOGE("Malloc keyPair fail."); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)pubKey); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)priKey); + HcfObjDestroy((HcfObjectBase *)pubKey); + HcfObjDestroy((HcfObjectBase *)priKey); return HCF_ERR_MALLOC; } diff --git a/test/unittest/src/crypto_3des_cipher_test.cpp b/test/unittest/src/crypto_3des_cipher_test.cpp index 3bd0b5ca67cd96c79f314cc13cd65c1e6187871d..675470f75e1065ca6074b0796b1b243473744b74 100644 --- a/test/unittest/src/crypto_3des_cipher_test.cpp +++ b/test/unittest/src/crypto_3des_cipher_test.cpp @@ -242,9 +242,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest001, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_NE(ret, 0); } @@ -290,9 +290,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest002, TestSize.Level0) clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -337,9 +337,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest003, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -389,9 +389,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest004, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_NE(ret, 0); } @@ -439,9 +439,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest005, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -489,9 +489,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest006, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -541,9 +541,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest007, TestSize.Level0) clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -591,9 +591,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest008, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -643,9 +643,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest009, TestSize.Level0) clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -694,9 +694,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest010, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -745,9 +745,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest011, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -796,9 +796,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest012, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -843,9 +843,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest013, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_NE(ret, 0); } @@ -891,9 +891,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest014, TestSize.Level0) clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -938,9 +938,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest015, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -990,9 +990,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest016, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_NE(ret, 0); } @@ -1041,9 +1041,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest017, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1092,9 +1092,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest018, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1144,9 +1144,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest019, TestSize.Level0) clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1195,9 +1195,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest020, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1247,9 +1247,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest021, TestSize.Level0) clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1298,9 +1298,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest022, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1349,9 +1349,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest023, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1400,9 +1400,9 @@ HWTEST_F(Crypto3DesCipherTest, Crypto3DesCipherTest024, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((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 fabfe24602237fe358e0332664cce2a9fabd1f24..96c79506d4c4d6d341dd4bfa47d57c200e1ee5fd 100644 --- a/test/unittest/src/crypto_aes_cipher_test.cpp +++ b/test/unittest/src/crypto_aes_cipher_test.cpp @@ -81,7 +81,7 @@ static int32_t GenerateSymKey(const char *algoName, HcfSymKey **key) if (ret != 0) { LOGE("generateSymKey failed!"); } - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)generator); return ret; } @@ -105,7 +105,7 @@ static int32_t ConvertSymKey(const char *algoName, HcfSymKey **key) LOGE("generateSymKey failed!"); } PrintfHex("keybinary", keyTmpBlob.data, keyTmpBlob.len); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)generator); return ret; } @@ -477,9 +477,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest001, TestSize.Level0) goto clearup; } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_NE(ret, 0); } @@ -528,9 +528,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest002, TestSize.Level0) goto clearup; } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -574,9 +574,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest003, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -625,9 +625,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest004, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_NE(ret, 0); } @@ -676,9 +676,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest005, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -727,9 +727,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest006, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -778,9 +778,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest007, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -829,9 +829,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest008, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -880,9 +880,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest009, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -931,9 +931,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest010, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -982,9 +982,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest011, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1032,9 +1032,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest012, TestSize.Level0) goto clearup; } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1083,9 +1083,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest013, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1134,9 +1134,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest014, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1185,9 +1185,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest015, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1237,9 +1237,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest016, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1288,9 +1288,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest017, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1338,9 +1338,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest018, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1388,9 +1388,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest019, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1438,9 +1438,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest020, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1488,9 +1488,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest021, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1538,9 +1538,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest022, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1588,9 +1588,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest023, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1638,9 +1638,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest024, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -1693,8 +1693,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest025, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -1747,8 +1747,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest026, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -1801,8 +1801,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest027, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -1854,8 +1854,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest028, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -1907,8 +1907,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest029, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -1961,8 +1961,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest030, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -2010,8 +2010,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest031, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -2055,9 +2055,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest032, TestSize.Level0) goto clearup; } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_NE(ret, 0); } @@ -2100,9 +2100,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest033, TestSize.Level0) goto clearup; } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2146,9 +2146,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest034, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2197,9 +2197,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest035, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_NE(ret, 0); } @@ -2248,9 +2248,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest036, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2299,9 +2299,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest037, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2350,9 +2350,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest038, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2401,9 +2401,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest039, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2452,9 +2452,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest040, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2503,9 +2503,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest041, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2554,9 +2554,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest042, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2604,9 +2604,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest043, TestSize.Level0) goto clearup; } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2655,9 +2655,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest044, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2706,9 +2706,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest045, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2757,9 +2757,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest046, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2809,9 +2809,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest047, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2860,9 +2860,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest048, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2910,9 +2910,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest049, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -2960,9 +2960,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest050, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -3010,9 +3010,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest051, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -3059,9 +3059,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest052, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -3108,9 +3108,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest053, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -3157,9 +3157,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest054, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -3206,9 +3206,9 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest055, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)generator); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)generator); EXPECT_EQ(ret, 0); } @@ -3261,8 +3261,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest056, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -3315,8 +3315,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest057, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -3369,8 +3369,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest058, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -3422,8 +3422,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest059, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -3475,8 +3475,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest060, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -3529,8 +3529,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest061, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -3578,8 +3578,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest062, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -3624,8 +3624,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest063, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -3676,8 +3676,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest064, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -3727,8 +3727,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest065, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -3778,8 +3778,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest066, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } @@ -3829,8 +3829,8 @@ HWTEST_F(CryptoAesCipherTest, CryptoAesCipherTest067, TestSize.Level0) } clearup: - OH_HCF_OBJ_DESTROY((HcfObjectBase *)key); - OH_HCF_OBJ_DESTROY((HcfObjectBase *)cipher); + HcfObjDestroy((HcfObjectBase *)key); + HcfObjDestroy((HcfObjectBase *)cipher); EXPECT_EQ(ret, 0); } } \ No newline at end of file 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 66d5f25080975d24a53cfb3736389bde94f00b69..5e8c0951f349d61be9d4886b95ce1b2bb1100e0e 100644 --- a/test/unittest/src/crypto_ecc_asy_key_generator_test.cpp +++ b/test/unittest/src/crypto_ecc_asy_key_generator_test.cpp @@ -144,7 +144,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest001, TestSize ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest002, TestSize.Level0) @@ -155,7 +155,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest002, TestSize ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest003, TestSize.Level0) @@ -166,7 +166,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest003, TestSize ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest004, TestSize.Level0) @@ -177,7 +177,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest004, TestSize ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest005, TestSize.Level0) @@ -226,7 +226,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest101, TestSize const char *className = generator->base.getClass(); ASSERT_NE(className, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest102, TestSize.Level0) @@ -250,7 +250,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest103, TestSize generator->base.destroy(NULL); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest104, TestSize.Level0) @@ -263,7 +263,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest104, TestSize generator->base.destroy(&obj); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest105, TestSize.Level0) @@ -278,7 +278,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest105, TestSize ASSERT_NE(algName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest106, TestSize.Level0) @@ -293,7 +293,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest106, TestSize ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest107, TestSize.Level0) @@ -308,7 +308,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest107, TestSize ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest201, TestSize.Level0) @@ -325,8 +325,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest201, TestSize ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyPair, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest202, TestSize.Level0) @@ -343,8 +343,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest202, TestSize ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyPair, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest203, TestSize.Level0) @@ -361,8 +361,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest203, TestSize ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyPair, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest204, TestSize.Level0) @@ -379,8 +379,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest204, TestSize ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyPair, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest205, TestSize.Level0) @@ -397,7 +397,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest205, TestSize ASSERT_EQ(res, HCF_INVALID_PARAMS); ASSERT_EQ(keyPair, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest206, TestSize.Level0) @@ -414,7 +414,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest206, TestSize ASSERT_EQ(res, HCF_INVALID_PARAMS); ASSERT_EQ(keyPair, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest207, TestSize.Level0) @@ -429,7 +429,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest207, TestSize ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest301, TestSize.Level0) @@ -447,8 +447,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest301, TestSize ASSERT_NE(className, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest302, TestSize.Level0) @@ -464,7 +464,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest302, TestSize keyPair->base.destroy((HcfObjectBase *)(&(keyPair->base))); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest303, TestSize.Level0) @@ -480,8 +480,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest303, TestSize keyPair->base.destroy(NULL); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest304, TestSize.Level0) @@ -497,8 +497,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest304, TestSize keyPair->base.destroy(&obj); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest305, TestSize.Level0) @@ -515,8 +515,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest305, TestSize const char *className = keyPair->pubKey->base.base.getClass(); ASSERT_NE(className, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest306, TestSize.Level0) @@ -533,8 +533,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest306, TestSize keyPair->pubKey->base.base.destroy((HcfObjectBase *)(&(keyPair->pubKey->base.base))); keyPair->pubKey = NULL; - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest307, TestSize.Level0) @@ -550,8 +550,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest307, TestSize keyPair->pubKey->base.base.destroy(NULL); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest308, TestSize.Level0) @@ -567,8 +567,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest308, TestSize keyPair->pubKey->base.base.destroy(&obj); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest309, TestSize.Level0) @@ -586,8 +586,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest309, TestSize ASSERT_NE(format, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest310, TestSize.Level0) @@ -605,8 +605,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest310, TestSize ASSERT_EQ(format, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest311, TestSize.Level0) @@ -624,8 +624,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest311, TestSize ASSERT_EQ(format, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest312, TestSize.Level0) @@ -643,8 +643,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest312, TestSize ASSERT_NE(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest313, TestSize.Level0) @@ -662,8 +662,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest313, TestSize ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest314, TestSize.Level0) @@ -681,8 +681,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest314, TestSize ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest315, TestSize.Level0) @@ -708,8 +708,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest315, TestSize free(blob.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest316, TestSize.Level0) @@ -733,8 +733,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest316, TestSize ASSERT_EQ(blob.data, nullptr); ASSERT_EQ(blob.len, 0); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest317, TestSize.Level0) @@ -758,8 +758,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest317, TestSize ASSERT_EQ(blob.data, nullptr); ASSERT_EQ(blob.len, 0); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest318, TestSize.Level0) @@ -777,8 +777,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest318, TestSize ASSERT_NE(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest319, TestSize.Level0) @@ -794,8 +794,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest319, TestSize keyPair->priKey->clearMem(keyPair->priKey); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest320, TestSize.Level0) @@ -811,8 +811,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest320, TestSize keyPair->priKey->clearMem(NULL); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest321, TestSize.Level0) @@ -828,8 +828,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest321, TestSize keyPair->priKey->clearMem((HcfPriKey *)&obj); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest322, TestSize.Level0) @@ -847,8 +847,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest322, TestSize ASSERT_NE(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest323, TestSize.Level0) @@ -865,8 +865,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest323, TestSize keyPair->priKey->base.base.destroy((HcfObjectBase *)(&(keyPair->priKey->base.base))); keyPair->priKey = NULL; - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest324, TestSize.Level0) @@ -882,8 +882,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest324, TestSize keyPair->priKey->base.base.destroy(NULL); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest325, TestSize.Level0) @@ -899,8 +899,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest325, TestSize keyPair->priKey->base.base.destroy(&obj); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest326, TestSize.Level0) @@ -918,8 +918,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest326, TestSize ASSERT_NE(format, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest327, TestSize.Level0) @@ -937,8 +937,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest327, TestSize ASSERT_EQ(format, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest328, TestSize.Level0) @@ -956,8 +956,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest328, TestSize ASSERT_EQ(format, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest329, TestSize.Level0) @@ -975,8 +975,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest329, TestSize ASSERT_NE(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest330, TestSize.Level0) @@ -994,8 +994,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest330, TestSize ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest331, TestSize.Level0) @@ -1013,8 +1013,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest331, TestSize ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest332, TestSize.Level0) @@ -1040,8 +1040,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest332, TestSize free(blob.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest333, TestSize.Level0) @@ -1065,8 +1065,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest333, TestSize ASSERT_EQ(blob.data, nullptr); ASSERT_EQ(blob.len, 0); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest334, TestSize.Level0) @@ -1090,8 +1090,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest334, TestSize ASSERT_EQ(blob.data, nullptr); ASSERT_EQ(blob.len, 0); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest335, TestSize.Level0) @@ -1109,8 +1109,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest335, TestSize ASSERT_NE(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest401, TestSize.Level0) @@ -1124,8 +1124,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest401, TestSize ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(outKeyPair, nullptr); - OH_HCF_OBJ_DESTROY(outKeyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(outKeyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest402, TestSize.Level0) @@ -1139,8 +1139,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest402, TestSize ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(outKeyPair, nullptr); - OH_HCF_OBJ_DESTROY(outKeyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(outKeyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest403, TestSize.Level0) @@ -1154,8 +1154,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest403, TestSize ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(outKeyPair, nullptr); - OH_HCF_OBJ_DESTROY(outKeyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(outKeyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest404, TestSize.Level0) @@ -1169,8 +1169,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest404, TestSize ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(outKeyPair, nullptr); - OH_HCF_OBJ_DESTROY(outKeyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(outKeyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest405, TestSize.Level0) @@ -1184,7 +1184,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest405, TestSize ASSERT_NE(res, HCF_SUCCESS); ASSERT_EQ(outKeyPair, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest406, TestSize.Level0) @@ -1199,7 +1199,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest406, TestSize ASSERT_NE(res, HCF_SUCCESS); ASSERT_EQ(outKeyPair, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest407, TestSize.Level0) @@ -1213,8 +1213,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest407, TestSize ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(outKeyPair, nullptr); - OH_HCF_OBJ_DESTROY(outKeyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(outKeyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest408, TestSize.Level0) @@ -1228,8 +1228,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest408, TestSize ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(outKeyPair, nullptr); - OH_HCF_OBJ_DESTROY(outKeyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(outKeyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest409, TestSize.Level0) @@ -1243,7 +1243,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest409, TestSize ASSERT_NE(res, HCF_SUCCESS); ASSERT_EQ(outKeyPair, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest410, TestSize.Level0) @@ -1255,7 +1255,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest410, TestSize ASSERT_NE(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest501, TestSize.Level0) @@ -1273,8 +1273,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest501, TestSize ASSERT_NE(className, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest502, TestSize.Level0) @@ -1290,7 +1290,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest502, TestSize keyPair->base.destroy((HcfObjectBase *)(&(keyPair->base))); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest503, TestSize.Level0) @@ -1306,8 +1306,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest503, TestSize keyPair->base.destroy(NULL); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest504, TestSize.Level0) @@ -1323,8 +1323,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest504, TestSize keyPair->base.destroy(&obj); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest505, TestSize.Level0) @@ -1341,8 +1341,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest505, TestSize const char *className = keyPair->pubKey->base.base.getClass(); ASSERT_NE(className, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest506, TestSize.Level0) @@ -1359,8 +1359,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest506, TestSize keyPair->pubKey->base.base.destroy((HcfObjectBase *)(&(keyPair->pubKey->base.base))); keyPair->pubKey = NULL; - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest507, TestSize.Level0) @@ -1376,8 +1376,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest507, TestSize keyPair->pubKey->base.base.destroy(NULL); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest508, TestSize.Level0) @@ -1393,8 +1393,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest508, TestSize keyPair->pubKey->base.base.destroy(&obj); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest509, TestSize.Level0) @@ -1412,8 +1412,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest509, TestSize ASSERT_NE(format, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest510, TestSize.Level0) @@ -1431,8 +1431,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest510, TestSize ASSERT_EQ(format, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest511, TestSize.Level0) @@ -1450,8 +1450,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest511, TestSize ASSERT_EQ(format, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest512, TestSize.Level0) @@ -1469,8 +1469,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest512, TestSize ASSERT_NE(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest513, TestSize.Level0) @@ -1488,8 +1488,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest513, TestSize ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest514, TestSize.Level0) @@ -1507,8 +1507,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest514, TestSize ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest515, TestSize.Level0) @@ -1534,8 +1534,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest515, TestSize free(blob.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest516, TestSize.Level0) @@ -1559,8 +1559,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest516, TestSize ASSERT_EQ(blob.data, nullptr); ASSERT_EQ(blob.len, 0); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest517, TestSize.Level0) @@ -1584,8 +1584,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest517, TestSize ASSERT_EQ(blob.data, nullptr); ASSERT_EQ(blob.len, 0); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest518, TestSize.Level0) @@ -1603,8 +1603,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest518, TestSize ASSERT_NE(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest519, TestSize.Level0) @@ -1620,8 +1620,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest519, TestSize keyPair->priKey->clearMem(keyPair->priKey); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest520, TestSize.Level0) @@ -1637,8 +1637,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest520, TestSize keyPair->priKey->clearMem(NULL); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest521, TestSize.Level0) @@ -1654,8 +1654,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest521, TestSize keyPair->priKey->clearMem((HcfPriKey *)&obj); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest522, TestSize.Level0) @@ -1673,8 +1673,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest522, TestSize ASSERT_NE(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest523, TestSize.Level0) @@ -1691,8 +1691,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest523, TestSize keyPair->priKey->base.base.destroy((HcfObjectBase *)(&(keyPair->priKey->base.base))); keyPair->priKey = NULL; - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest524, TestSize.Level0) @@ -1708,8 +1708,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest524, TestSize keyPair->priKey->base.base.destroy(NULL); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest525, TestSize.Level0) @@ -1725,8 +1725,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest525, TestSize keyPair->priKey->base.base.destroy(&obj); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest526, TestSize.Level0) @@ -1744,8 +1744,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest526, TestSize ASSERT_NE(format, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest527, TestSize.Level0) @@ -1763,8 +1763,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest527, TestSize ASSERT_EQ(format, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest528, TestSize.Level0) @@ -1782,8 +1782,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest528, TestSize ASSERT_EQ(format, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest529, TestSize.Level0) @@ -1801,8 +1801,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest529, TestSize ASSERT_NE(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest530, TestSize.Level0) @@ -1820,8 +1820,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest530, TestSize ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest531, TestSize.Level0) @@ -1839,8 +1839,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest531, TestSize ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest532, TestSize.Level0) @@ -1866,8 +1866,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest532, TestSize free(blob.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest533, TestSize.Level0) @@ -1891,8 +1891,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest533, TestSize ASSERT_EQ(blob.data, nullptr); ASSERT_EQ(blob.len, 0); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest534, TestSize.Level0) @@ -1916,8 +1916,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest534, TestSize ASSERT_EQ(blob.data, nullptr); ASSERT_EQ(blob.len, 0); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest535, TestSize.Level0) @@ -1935,8 +1935,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest535, TestSize ASSERT_NE(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest536, TestSize.Level0) @@ -1996,9 +1996,9 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest536, TestSize free(priKeyBlob.data); free(outPubKeyBlob.data); free(outPriKeyBlob.data); - OH_HCF_OBJ_DESTROY(outKeyPair); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(outKeyPair); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest537, TestSize.Level0) @@ -2042,9 +2042,9 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest537, TestSize free(pubKeyBlob.data); free(outPubKeyBlob.data); - OH_HCF_OBJ_DESTROY(outKeyPair); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(outKeyPair); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest538, TestSize.Level0) @@ -2088,8 +2088,8 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest538, TestSize free(priKeyBlob.data); free(outPriKeyBlob.data); - OH_HCF_OBJ_DESTROY(outKeyPair); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(outKeyPair); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } } diff --git a/test/unittest/src/crypto_ecc_key_agreement_test.cpp b/test/unittest/src/crypto_ecc_key_agreement_test.cpp index 96fcf4fbba6474e2452edb344e3eeaee0d2ac9a2..3f8b0c849bb101a2f2f5a30e14df5eda62fb0e5f 100644 --- a/test/unittest/src/crypto_ecc_key_agreement_test.cpp +++ b/test/unittest/src/crypto_ecc_key_agreement_test.cpp @@ -58,7 +58,7 @@ void CryptoEccKeyAgreementTest::SetUpTestCase() ecc224KeyPair_ = keyPair; - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); HcfAsyKeyGenerator *generator2 = NULL; res = HcfAsyKeyGeneratorCreate("ECC256", &generator2); @@ -72,7 +72,7 @@ void CryptoEccKeyAgreementTest::SetUpTestCase() ecc256KeyPair_ = keyPair2; - OH_HCF_OBJ_DESTROY(generator2); + HcfObjDestroy(generator2); HcfAsyKeyGenerator *generator3 = NULL; res = HcfAsyKeyGeneratorCreate("ECC384", &generator3); @@ -86,7 +86,7 @@ void CryptoEccKeyAgreementTest::SetUpTestCase() ecc384KeyPair_ = keyPair3; - OH_HCF_OBJ_DESTROY(generator3); + HcfObjDestroy(generator3); HcfAsyKeyGenerator *generator4 = NULL; res = HcfAsyKeyGeneratorCreate("ECC512", &generator4); @@ -100,15 +100,15 @@ void CryptoEccKeyAgreementTest::SetUpTestCase() ecc512KeyPair_ = keyPair4; - OH_HCF_OBJ_DESTROY(generator4); + HcfObjDestroy(generator4); } void CryptoEccKeyAgreementTest::TearDownTestCase() { - OH_HCF_OBJ_DESTROY(ecc224KeyPair_); - OH_HCF_OBJ_DESTROY(ecc256KeyPair_); - OH_HCF_OBJ_DESTROY(ecc384KeyPair_); - OH_HCF_OBJ_DESTROY(ecc512KeyPair_); + HcfObjDestroy(ecc224KeyPair_); + HcfObjDestroy(ecc256KeyPair_); + HcfObjDestroy(ecc384KeyPair_); + HcfObjDestroy(ecc512KeyPair_); } static const char *GetMockClass(void) @@ -129,7 +129,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest001, TestSize.Level ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyAgreement, nullptr); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest002, TestSize.Level0) @@ -140,7 +140,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest002, TestSize.Level ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyAgreement, nullptr); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest003, TestSize.Level0) @@ -151,7 +151,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest003, TestSize.Level ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyAgreement, nullptr); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest004, TestSize.Level0) @@ -162,7 +162,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest004, TestSize.Level ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyAgreement, nullptr); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest005, TestSize.Level0) @@ -212,7 +212,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest101, TestSize.Level ASSERT_NE(className, nullptr); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest102, TestSize.Level0) @@ -236,7 +236,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest103, TestSize.Level keyAgreement->base.destroy(NULL); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest104, TestSize.Level0) @@ -249,7 +249,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest104, TestSize.Level keyAgreement->base.destroy(&obj); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest105, TestSize.Level0) @@ -264,7 +264,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest105, TestSize.Level ASSERT_NE(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest106, TestSize.Level0) @@ -279,7 +279,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest106, TestSize.Level ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest107, TestSize.Level0) @@ -294,7 +294,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest107, TestSize.Level ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest201, TestSize.Level0) @@ -316,7 +316,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest201, TestSize.Level ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest202, TestSize.Level0) @@ -338,7 +338,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest202, TestSize.Level ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest203, TestSize.Level0) @@ -360,7 +360,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest203, TestSize.Level ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest204, TestSize.Level0) @@ -382,7 +382,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest204, TestSize.Level ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest205, TestSize.Level0) @@ -403,7 +403,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest205, TestSize.Level ASSERT_EQ(out.data, nullptr); ASSERT_EQ(out.len, 0); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest206, TestSize.Level0) @@ -424,7 +424,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest206, TestSize.Level ASSERT_EQ(out.data, nullptr); ASSERT_EQ(out.len, 0); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest207, TestSize.Level0) @@ -445,7 +445,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest207, TestSize.Level ASSERT_EQ(out.data, nullptr); ASSERT_EQ(out.len, 0); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest208, TestSize.Level0) @@ -466,7 +466,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest208, TestSize.Level ASSERT_EQ(out.data, nullptr); ASSERT_EQ(out.len, 0); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest209, TestSize.Level0) @@ -487,7 +487,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest209, TestSize.Level ASSERT_EQ(out.data, nullptr); ASSERT_EQ(out.len, 0); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest210, TestSize.Level0) @@ -502,6 +502,6 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest210, TestSize.Level ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(keyAgreement); + HcfObjDestroy(keyAgreement); } } diff --git a/test/unittest/src/crypto_ecc_sign_test.cpp b/test/unittest/src/crypto_ecc_sign_test.cpp index e99e94968b1d9e8edb6a6a7ad4919efef1c969db..99ce4a099bbec72bc158ce77bc68508dc9c8e797 100644 --- a/test/unittest/src/crypto_ecc_sign_test.cpp +++ b/test/unittest/src/crypto_ecc_sign_test.cpp @@ -67,7 +67,7 @@ void CryptoEccSignTest::SetUpTestCase() ecc224KeyPair_ = keyPair; - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); HcfAsyKeyGenerator *generator2 = NULL; res = HcfAsyKeyGeneratorCreate("ECC256", &generator2); @@ -81,7 +81,7 @@ void CryptoEccSignTest::SetUpTestCase() ecc256KeyPair_ = keyPair2; - OH_HCF_OBJ_DESTROY(generator2); + HcfObjDestroy(generator2); HcfAsyKeyGenerator *generator3 = NULL; res = HcfAsyKeyGeneratorCreate("ECC384", &generator3); @@ -95,7 +95,7 @@ void CryptoEccSignTest::SetUpTestCase() ecc384KeyPair_ = keyPair3; - OH_HCF_OBJ_DESTROY(generator3); + HcfObjDestroy(generator3); HcfAsyKeyGenerator *generator4 = NULL; res = HcfAsyKeyGeneratorCreate("ECC512", &generator4); @@ -109,15 +109,15 @@ void CryptoEccSignTest::SetUpTestCase() ecc512KeyPair_ = keyPair4; - OH_HCF_OBJ_DESTROY(generator4); + HcfObjDestroy(generator4); } void CryptoEccSignTest::TearDownTestCase() { - OH_HCF_OBJ_DESTROY(ecc224KeyPair_); - OH_HCF_OBJ_DESTROY(ecc256KeyPair_); - OH_HCF_OBJ_DESTROY(ecc384KeyPair_); - OH_HCF_OBJ_DESTROY(ecc512KeyPair_); + HcfObjDestroy(ecc224KeyPair_); + HcfObjDestroy(ecc256KeyPair_); + HcfObjDestroy(ecc384KeyPair_); + HcfObjDestroy(ecc512KeyPair_); } static const char *GetMockClass(void) @@ -138,7 +138,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest001, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest002, TestSize.Level0) @@ -149,7 +149,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest002, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest003, TestSize.Level0) @@ -160,7 +160,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest003, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest004, TestSize.Level0) @@ -171,7 +171,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest004, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest005, TestSize.Level0) @@ -182,7 +182,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest005, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest006, TestSize.Level0) @@ -193,7 +193,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest006, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest007, TestSize.Level0) @@ -204,7 +204,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest007, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest008, TestSize.Level0) @@ -215,7 +215,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest008, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest009, TestSize.Level0) @@ -226,7 +226,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest009, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest010, TestSize.Level0) @@ -237,7 +237,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest010, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest011, TestSize.Level0) @@ -248,7 +248,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest011, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest012, TestSize.Level0) @@ -259,7 +259,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest012, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest013, TestSize.Level0) @@ -270,7 +270,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest013, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest014, TestSize.Level0) @@ -281,7 +281,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest014, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest015, TestSize.Level0) @@ -292,7 +292,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest015, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest016, TestSize.Level0) @@ -303,7 +303,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest016, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest017, TestSize.Level0) @@ -314,7 +314,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest017, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest018, TestSize.Level0) @@ -325,7 +325,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest018, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest019, TestSize.Level0) @@ -336,7 +336,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest019, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest020, TestSize.Level0) @@ -347,7 +347,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest020, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest021, TestSize.Level0) @@ -424,7 +424,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest101, TestSize.Level0) ASSERT_NE(className, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest102, TestSize.Level0) @@ -448,7 +448,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest103, TestSize.Level0) sign->base.destroy(NULL); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest104, TestSize.Level0) @@ -461,7 +461,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest104, TestSize.Level0) sign->base.destroy(&obj); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest105, TestSize.Level0) @@ -476,7 +476,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest105, TestSize.Level0) ASSERT_NE(algName, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest106, TestSize.Level0) @@ -491,7 +491,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest106, TestSize.Level0) ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest107, TestSize.Level0) @@ -506,7 +506,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest107, TestSize.Level0) ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest201, TestSize.Level0) @@ -521,7 +521,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest201, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest202, TestSize.Level0) @@ -536,7 +536,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest202, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest203, TestSize.Level0) @@ -551,7 +551,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest203, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest204, TestSize.Level0) @@ -566,7 +566,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest204, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest205, TestSize.Level0) @@ -581,7 +581,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest205, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest206, TestSize.Level0) @@ -596,7 +596,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest206, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest207, TestSize.Level0) @@ -611,7 +611,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest207, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest208, TestSize.Level0) @@ -626,7 +626,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest208, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest209, TestSize.Level0) @@ -641,7 +641,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest209, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest210, TestSize.Level0) @@ -656,7 +656,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest210, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest211, TestSize.Level0) @@ -671,7 +671,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest211, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest212, TestSize.Level0) @@ -686,7 +686,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest212, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest213, TestSize.Level0) @@ -701,7 +701,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest213, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest214, TestSize.Level0) @@ -716,7 +716,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest214, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest215, TestSize.Level0) @@ -731,7 +731,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest215, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest216, TestSize.Level0) @@ -746,7 +746,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest216, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest217, TestSize.Level0) @@ -761,7 +761,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest217, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest218, TestSize.Level0) @@ -776,7 +776,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest218, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest219, TestSize.Level0) @@ -791,7 +791,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest219, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest220, TestSize.Level0) @@ -806,7 +806,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest220, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest221, TestSize.Level0) @@ -821,7 +821,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest221, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest222, TestSize.Level0) @@ -836,7 +836,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest222, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest223, TestSize.Level0) @@ -851,7 +851,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest223, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest224, TestSize.Level0) @@ -866,7 +866,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest224, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest301, TestSize.Level0) @@ -885,7 +885,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest301, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest302, TestSize.Level0) @@ -904,7 +904,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest302, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest303, TestSize.Level0) @@ -923,7 +923,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest303, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest304, TestSize.Level0) @@ -942,7 +942,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest304, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest305, TestSize.Level0) @@ -961,7 +961,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest305, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest306, TestSize.Level0) @@ -980,7 +980,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest306, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest307, TestSize.Level0) @@ -999,7 +999,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest307, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest308, TestSize.Level0) @@ -1018,7 +1018,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest308, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest309, TestSize.Level0) @@ -1037,7 +1037,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest309, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest310, TestSize.Level0) @@ -1056,7 +1056,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest310, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest311, TestSize.Level0) @@ -1075,7 +1075,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest311, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest312, TestSize.Level0) @@ -1094,7 +1094,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest312, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest313, TestSize.Level0) @@ -1113,7 +1113,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest313, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest314, TestSize.Level0) @@ -1132,7 +1132,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest314, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest315, TestSize.Level0) @@ -1151,7 +1151,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest315, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest316, TestSize.Level0) @@ -1170,7 +1170,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest316, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest317, TestSize.Level0) @@ -1189,7 +1189,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest317, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest318, TestSize.Level0) @@ -1208,7 +1208,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest318, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest319, TestSize.Level0) @@ -1227,7 +1227,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest319, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest320, TestSize.Level0) @@ -1246,7 +1246,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest320, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest321, TestSize.Level0) @@ -1265,7 +1265,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest321, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest322, TestSize.Level0) @@ -1284,7 +1284,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest322, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest323, TestSize.Level0) @@ -1303,7 +1303,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest323, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest324, TestSize.Level0) @@ -1326,7 +1326,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest324, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest325, TestSize.Level0) @@ -1349,7 +1349,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest325, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest401, TestSize.Level0) @@ -1379,7 +1379,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest401, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest402, TestSize.Level0) @@ -1409,7 +1409,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest402, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest403, TestSize.Level0) @@ -1439,7 +1439,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest403, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest404, TestSize.Level0) @@ -1469,7 +1469,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest404, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest405, TestSize.Level0) @@ -1499,7 +1499,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest405, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest406, TestSize.Level0) @@ -1529,7 +1529,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest406, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest407, TestSize.Level0) @@ -1559,7 +1559,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest407, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest408, TestSize.Level0) @@ -1589,7 +1589,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest408, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest409, TestSize.Level0) @@ -1619,7 +1619,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest409, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest410, TestSize.Level0) @@ -1649,7 +1649,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest410, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest411, TestSize.Level0) @@ -1679,7 +1679,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest411, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest412, TestSize.Level0) @@ -1709,7 +1709,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest412, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest413, TestSize.Level0) @@ -1739,7 +1739,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest413, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest414, TestSize.Level0) @@ -1769,7 +1769,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest414, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest415, TestSize.Level0) @@ -1799,7 +1799,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest415, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest416, TestSize.Level0) @@ -1829,7 +1829,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest416, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest417, TestSize.Level0) @@ -1859,7 +1859,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest417, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest418, TestSize.Level0) @@ -1889,7 +1889,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest418, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest419, TestSize.Level0) @@ -1919,7 +1919,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest419, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest420, TestSize.Level0) @@ -1949,7 +1949,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest420, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest421, TestSize.Level0) @@ -1975,7 +1975,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest421, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest422, TestSize.Level0) @@ -2001,7 +2001,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest422, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest423, TestSize.Level0) @@ -2027,7 +2027,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest423, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest424, TestSize.Level0) @@ -2053,7 +2053,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest424, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest425, TestSize.Level0) @@ -2079,7 +2079,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest425, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest426, TestSize.Level0) @@ -2105,7 +2105,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest426, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest427, TestSize.Level0) @@ -2131,7 +2131,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest427, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest428, TestSize.Level0) @@ -2157,7 +2157,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest428, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest429, TestSize.Level0) @@ -2183,7 +2183,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest429, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest430, TestSize.Level0) @@ -2209,7 +2209,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest430, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest431, TestSize.Level0) @@ -2235,7 +2235,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest431, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest432, TestSize.Level0) @@ -2261,7 +2261,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest432, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest433, TestSize.Level0) @@ -2287,7 +2287,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest433, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest434, TestSize.Level0) @@ -2313,7 +2313,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest434, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest435, TestSize.Level0) @@ -2339,7 +2339,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest435, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest436, TestSize.Level0) @@ -2365,7 +2365,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest436, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest437, TestSize.Level0) @@ -2391,7 +2391,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest437, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest438, TestSize.Level0) @@ -2417,7 +2417,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest438, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest439, TestSize.Level0) @@ -2443,7 +2443,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest439, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest440, TestSize.Level0) @@ -2469,7 +2469,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest440, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest441, TestSize.Level0) @@ -2496,7 +2496,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest441, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest442, TestSize.Level0) @@ -2523,7 +2523,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest442, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest443, TestSize.Level0) @@ -2546,7 +2546,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest443, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest444, TestSize.Level0) @@ -2573,7 +2573,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest444, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest445, TestSize.Level0) @@ -2600,7 +2600,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest445, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest446, TestSize.Level0) @@ -2623,7 +2623,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest446, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest447, TestSize.Level0) @@ -2689,8 +2689,8 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest447, TestSize.Level0) free(out.data); free(out2.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest448, TestSize.Level0) @@ -2725,7 +2725,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest448, TestSize.Level0) res = sign->sign(sign, NULL, &out2); free(out2.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest927, TestSize.Level0) @@ -2740,7 +2740,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest927, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyPair, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); HcfSign *sign = NULL; res = HcfSignCreate("ECC256|SHA256", &sign); @@ -2767,7 +2767,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest927, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoEccSignTest, CryptoEccSignTest928, TestSize.Level0) @@ -2782,7 +2782,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest928, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyPair, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); HcfSign *sign = NULL; res = HcfSignCreate("ECC224|SHA256", &sign); @@ -2811,6 +2811,6 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest928, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); free(out.data); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } } diff --git a/test/unittest/src/crypto_ecc_verify_test.cpp b/test/unittest/src/crypto_ecc_verify_test.cpp index e466875d837cd68157c676c56359cd1f46d7994f..0c0f2d6e4bddb7b9ce7d305256cedd226fab47ff 100644 --- a/test/unittest/src/crypto_ecc_verify_test.cpp +++ b/test/unittest/src/crypto_ecc_verify_test.cpp @@ -67,7 +67,7 @@ void CryptoEccVerifyTest::SetUpTestCase() ecc224KeyPair_ = keyPair; - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); HcfAsyKeyGenerator *generator2 = NULL; res = HcfAsyKeyGeneratorCreate("ECC256", &generator2); @@ -81,7 +81,7 @@ void CryptoEccVerifyTest::SetUpTestCase() ecc256KeyPair_ = keyPair2; - OH_HCF_OBJ_DESTROY(generator2); + HcfObjDestroy(generator2); HcfAsyKeyGenerator *generator3 = NULL; res = HcfAsyKeyGeneratorCreate("ECC384", &generator3); @@ -95,7 +95,7 @@ void CryptoEccVerifyTest::SetUpTestCase() ecc384KeyPair_ = keyPair3; - OH_HCF_OBJ_DESTROY(generator3); + HcfObjDestroy(generator3); HcfAsyKeyGenerator *generator4 = NULL; res = HcfAsyKeyGeneratorCreate("ECC512", &generator4); @@ -109,15 +109,15 @@ void CryptoEccVerifyTest::SetUpTestCase() ecc512KeyPair_ = keyPair4; - OH_HCF_OBJ_DESTROY(generator4); + HcfObjDestroy(generator4); } void CryptoEccVerifyTest::TearDownTestCase() { - OH_HCF_OBJ_DESTROY(ecc224KeyPair_); - OH_HCF_OBJ_DESTROY(ecc256KeyPair_); - OH_HCF_OBJ_DESTROY(ecc384KeyPair_); - OH_HCF_OBJ_DESTROY(ecc512KeyPair_); + HcfObjDestroy(ecc224KeyPair_); + HcfObjDestroy(ecc256KeyPair_); + HcfObjDestroy(ecc384KeyPair_); + HcfObjDestroy(ecc512KeyPair_); } static const char *GetMockClass(void) @@ -138,7 +138,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest001, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest002, TestSize.Level0) @@ -149,7 +149,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest002, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest003, TestSize.Level0) @@ -160,7 +160,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest003, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest004, TestSize.Level0) @@ -171,7 +171,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest004, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest005, TestSize.Level0) @@ -182,7 +182,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest005, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest006, TestSize.Level0) @@ -193,7 +193,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest006, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest007, TestSize.Level0) @@ -204,7 +204,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest007, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest008, TestSize.Level0) @@ -215,7 +215,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest008, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest009, TestSize.Level0) @@ -226,7 +226,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest009, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest010, TestSize.Level0) @@ -237,7 +237,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest010, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest011, TestSize.Level0) @@ -248,7 +248,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest011, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest012, TestSize.Level0) @@ -259,7 +259,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest012, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest013, TestSize.Level0) @@ -270,7 +270,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest013, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest014, TestSize.Level0) @@ -281,7 +281,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest014, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest015, TestSize.Level0) @@ -292,7 +292,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest015, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest016, TestSize.Level0) @@ -303,7 +303,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest016, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest017, TestSize.Level0) @@ -314,7 +314,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest017, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest018, TestSize.Level0) @@ -325,7 +325,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest018, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest019, TestSize.Level0) @@ -336,7 +336,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest019, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest020, TestSize.Level0) @@ -347,7 +347,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest020, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest021, TestSize.Level0) @@ -424,7 +424,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest101, TestSize.Level0) ASSERT_NE(className, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest102, TestSize.Level0) @@ -448,7 +448,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest103, TestSize.Level0) verify->base.destroy(NULL); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest104, TestSize.Level0) @@ -461,7 +461,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest104, TestSize.Level0) verify->base.destroy(&obj); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest105, TestSize.Level0) @@ -476,7 +476,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest105, TestSize.Level0) ASSERT_NE(algName, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest106, TestSize.Level0) @@ -491,7 +491,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest106, TestSize.Level0) ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest107, TestSize.Level0) @@ -506,7 +506,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest107, TestSize.Level0) ASSERT_EQ(algName, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest201, TestSize.Level0) @@ -521,7 +521,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest201, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest202, TestSize.Level0) @@ -536,7 +536,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest202, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest203, TestSize.Level0) @@ -551,7 +551,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest203, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest204, TestSize.Level0) @@ -566,7 +566,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest204, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest205, TestSize.Level0) @@ -581,7 +581,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest205, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest206, TestSize.Level0) @@ -596,7 +596,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest206, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest207, TestSize.Level0) @@ -611,7 +611,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest207, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest208, TestSize.Level0) @@ -626,7 +626,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest208, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest209, TestSize.Level0) @@ -641,7 +641,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest209, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest210, TestSize.Level0) @@ -656,7 +656,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest210, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest211, TestSize.Level0) @@ -671,7 +671,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest211, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest212, TestSize.Level0) @@ -686,7 +686,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest212, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest213, TestSize.Level0) @@ -701,7 +701,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest213, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest214, TestSize.Level0) @@ -716,7 +716,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest214, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest215, TestSize.Level0) @@ -731,7 +731,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest215, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest216, TestSize.Level0) @@ -746,7 +746,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest216, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest217, TestSize.Level0) @@ -761,7 +761,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest217, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest218, TestSize.Level0) @@ -776,7 +776,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest218, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest219, TestSize.Level0) @@ -791,7 +791,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest219, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest220, TestSize.Level0) @@ -806,7 +806,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest220, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest221, TestSize.Level0) @@ -821,7 +821,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest221, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest222, TestSize.Level0) @@ -836,7 +836,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest222, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest223, TestSize.Level0) @@ -851,7 +851,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest223, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest224, TestSize.Level0) @@ -866,7 +866,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest224, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest301, TestSize.Level0) @@ -885,7 +885,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest301, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest302, TestSize.Level0) @@ -904,7 +904,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest302, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest303, TestSize.Level0) @@ -923,7 +923,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest303, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest304, TestSize.Level0) @@ -942,7 +942,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest304, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest305, TestSize.Level0) @@ -961,7 +961,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest305, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest306, TestSize.Level0) @@ -980,7 +980,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest306, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest307, TestSize.Level0) @@ -999,7 +999,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest307, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest308, TestSize.Level0) @@ -1018,7 +1018,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest308, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest309, TestSize.Level0) @@ -1037,7 +1037,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest309, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest310, TestSize.Level0) @@ -1056,7 +1056,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest310, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest311, TestSize.Level0) @@ -1075,7 +1075,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest311, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest312, TestSize.Level0) @@ -1094,7 +1094,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest312, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest313, TestSize.Level0) @@ -1113,7 +1113,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest313, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest314, TestSize.Level0) @@ -1132,7 +1132,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest314, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest315, TestSize.Level0) @@ -1151,7 +1151,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest315, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest316, TestSize.Level0) @@ -1170,7 +1170,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest316, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest317, TestSize.Level0) @@ -1189,7 +1189,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest317, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest318, TestSize.Level0) @@ -1208,7 +1208,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest318, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest319, TestSize.Level0) @@ -1227,7 +1227,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest319, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest320, TestSize.Level0) @@ -1246,7 +1246,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest320, TestSize.Level0) ASSERT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest321, TestSize.Level0) @@ -1265,7 +1265,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest321, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest322, TestSize.Level0) @@ -1284,7 +1284,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest322, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest323, TestSize.Level0) @@ -1303,7 +1303,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest323, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest324, TestSize.Level0) @@ -1326,7 +1326,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest324, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest325, TestSize.Level0) @@ -1349,7 +1349,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest325, TestSize.Level0) ASSERT_EQ(res, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest401, TestSize.Level0) @@ -1397,8 +1397,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest401, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest402, TestSize.Level0) @@ -1446,8 +1446,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest402, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest403, TestSize.Level0) @@ -1495,8 +1495,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest403, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest404, TestSize.Level0) @@ -1544,8 +1544,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest404, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest405, TestSize.Level0) @@ -1593,8 +1593,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest405, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest406, TestSize.Level0) @@ -1642,8 +1642,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest406, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest407, TestSize.Level0) @@ -1691,8 +1691,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest407, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest408, TestSize.Level0) @@ -1740,8 +1740,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest408, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest409, TestSize.Level0) @@ -1789,8 +1789,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest409, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest410, TestSize.Level0) @@ -1838,8 +1838,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest410, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest411, TestSize.Level0) @@ -1887,8 +1887,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest411, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest412, TestSize.Level0) @@ -1936,8 +1936,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest412, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest413, TestSize.Level0) @@ -1985,8 +1985,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest413, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest414, TestSize.Level0) @@ -2034,8 +2034,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest414, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest415, TestSize.Level0) @@ -2083,8 +2083,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest415, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest416, TestSize.Level0) @@ -2132,8 +2132,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest416, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest417, TestSize.Level0) @@ -2181,8 +2181,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest417, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest418, TestSize.Level0) @@ -2230,8 +2230,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest418, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest419, TestSize.Level0) @@ -2279,8 +2279,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest419, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest420, TestSize.Level0) @@ -2328,8 +2328,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest420, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest421, TestSize.Level0) @@ -2369,8 +2369,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest421, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest422, TestSize.Level0) @@ -2410,8 +2410,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest422, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest423, TestSize.Level0) @@ -2451,8 +2451,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest423, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest424, TestSize.Level0) @@ -2492,8 +2492,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest424, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest425, TestSize.Level0) @@ -2533,8 +2533,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest425, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest426, TestSize.Level0) @@ -2574,8 +2574,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest426, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest427, TestSize.Level0) @@ -2615,8 +2615,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest427, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest428, TestSize.Level0) @@ -2656,8 +2656,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest428, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest429, TestSize.Level0) @@ -2697,8 +2697,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest429, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest430, TestSize.Level0) @@ -2738,8 +2738,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest430, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest431, TestSize.Level0) @@ -2779,8 +2779,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest431, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest432, TestSize.Level0) @@ -2820,8 +2820,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest432, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest433, TestSize.Level0) @@ -2861,8 +2861,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest433, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest434, TestSize.Level0) @@ -2902,8 +2902,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest434, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest435, TestSize.Level0) @@ -2943,8 +2943,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest435, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest436, TestSize.Level0) @@ -2984,8 +2984,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest436, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest437, TestSize.Level0) @@ -3025,8 +3025,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest437, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest438, TestSize.Level0) @@ -3066,8 +3066,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest438, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest439, TestSize.Level0) @@ -3107,8 +3107,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest439, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest440, TestSize.Level0) @@ -3148,8 +3148,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest440, TestSize.Level0) ASSERT_EQ(flag, true); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest441, TestSize.Level0) @@ -3197,8 +3197,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest441, TestSize.Level0) ASSERT_EQ(flag, false); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest442, TestSize.Level0) @@ -3246,8 +3246,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest442, TestSize.Level0) ASSERT_EQ(flag, false); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest443, TestSize.Level0) @@ -3291,8 +3291,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest443, TestSize.Level0) ASSERT_EQ(flag, false); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest444, TestSize.Level0) @@ -3340,8 +3340,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest444, TestSize.Level0) ASSERT_EQ(flag, false); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest445, TestSize.Level0) @@ -3389,8 +3389,8 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest445, TestSize.Level0) ASSERT_EQ(flag, false); free(out.data); - OH_HCF_OBJ_DESTROY(sign); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(sign); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest446, TestSize.Level0) @@ -3413,7 +3413,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest446, TestSize.Level0) ASSERT_EQ(flag, false); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest447, TestSize.Level0) @@ -3440,7 +3440,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest447, TestSize.Level0) ASSERT_EQ(flag, false); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest448, TestSize.Level0) @@ -3467,6 +3467,6 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest448, TestSize.Level0) ASSERT_EQ(flag, false); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } } diff --git a/test/unittest/src/crypto_mac_test.cpp b/test/unittest/src/crypto_mac_test.cpp index 813d6f35df9117386c29f8af3f2f1b7e4ed2c850..74c39c926a6d0679e59e1028ce886c400d670d7d 100644 --- a/test/unittest/src/crypto_mac_test.cpp +++ b/test/unittest/src/crypto_mac_test.cpp @@ -84,7 +84,7 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoSuppTest001, TestSize.Level0) ret = (int32_t)HcfMacCreate("SHA1", &macObj); EXPECT_EQ(ret, 0); EXPECT_NE(macObj, nullptr); - OH_HCF_OBJ_DESTROY(macObj); + HcfObjDestroy(macObj); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoSuppTest002, TestSize.Level0) @@ -119,7 +119,7 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoNameTest001, TestSize.Level0) const char *algoName = macObj->getAlgoName(macObj); ret = strcmp(algoName, "SHA1"); EXPECT_EQ(ret, 0); - OH_HCF_OBJ_DESTROY(macObj); + HcfObjDestroy(macObj); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacInitTest001, TestSize.Level0) @@ -134,7 +134,7 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacInitTest001, TestSize.Level0) // test api functions ret = macObj->init(macObj, key); EXPECT_NE(ret, 0); - OH_HCF_OBJ_DESTROY(macObj); + HcfObjDestroy(macObj); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacInitTest002, TestSize.Level0) @@ -157,9 +157,9 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacInitTest002, TestSize.Level0) // test api functions ret = macObj->init(macObj, (HcfSymKey *)key); EXPECT_EQ(ret, 0); - OH_HCF_OBJ_DESTROY(macObj); - OH_HCF_OBJ_DESTROY(key); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(macObj); + HcfObjDestroy(key); + HcfObjDestroy(generator); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacUpdateTest001, TestSize.Level0) @@ -177,7 +177,7 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacUpdateTest001, TestSize.Level0) // test api functions ret = macObj->update(macObj, &inBlob); EXPECT_NE(ret, 0); - OH_HCF_OBJ_DESTROY(macObj); + HcfObjDestroy(macObj); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacUpdateTest002, TestSize.Level0) @@ -204,9 +204,9 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacUpdateTest002, TestSize.Level0) EXPECT_EQ(ret, 0); ret = macObj->update(macObj, inBlob); EXPECT_NE(ret, 0); - OH_HCF_OBJ_DESTROY(macObj); - OH_HCF_OBJ_DESTROY(key); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(macObj); + HcfObjDestroy(key); + HcfObjDestroy(generator); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacUpdateTest003, TestSize.Level0) @@ -236,9 +236,9 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacUpdateTest003, TestSize.Level0) EXPECT_EQ(ret, 0); ret = macObj->update(macObj, &inBlob); EXPECT_EQ(ret, 0); - OH_HCF_OBJ_DESTROY(macObj); - OH_HCF_OBJ_DESTROY(key); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(macObj); + HcfObjDestroy(key); + HcfObjDestroy(generator); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacDoFinalTest001, TestSize.Level0) @@ -255,7 +255,7 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacDoFinalTest001, TestSize.Level0) ret = macObj->doFinal(macObj, &outBlob); EXPECT_NE(ret, 0); // destroy the API obj and blob data - OH_HCF_OBJ_DESTROY(macObj); + HcfObjDestroy(macObj); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacDoFinalTest002, TestSize.Level0) @@ -293,11 +293,11 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacDoFinalTest002, TestSize.Level0) // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); printf("HcfBlobDataClearAndFree finish"); - OH_HCF_OBJ_DESTROY(macObj); - printf("OH_HCF_OBJ_DESTROY macObj finish"); - OH_HCF_OBJ_DESTROY(key); - printf("OH_HCF_OBJ_DESTROY key finish"); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(macObj); + printf("HcfObjDestroy macObj finish"); + HcfObjDestroy(key); + printf("HcfObjDestroy key finish"); + HcfObjDestroy(generator); printf("test finish"); } @@ -334,9 +334,9 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacDoFinalTest003, TestSize.Level0) EXPECT_EQ(ret, 0); // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(macObj); - OH_HCF_OBJ_DESTROY(key); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(macObj); + HcfObjDestroy(key); + HcfObjDestroy(generator); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacDoFinalTest004, TestSize.Level0) @@ -371,9 +371,9 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacDoFinalTest004, TestSize.Level0) PrintfBlobInHex(outBlob.data, outBlob.len); // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(macObj); - OH_HCF_OBJ_DESTROY(key); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(macObj); + HcfObjDestroy(key); + HcfObjDestroy(generator); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacLenTest001, TestSize.Level0) @@ -386,7 +386,7 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacLenTest001, TestSize.Level0) // test api functions ret = macObj->getMacLength(macObj); EXPECT_EQ(ret, 0); - OH_HCF_OBJ_DESTROY(macObj); + HcfObjDestroy(macObj); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacLenTest002, TestSize.Level0) @@ -411,9 +411,9 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacLenTest002, TestSize.Level0) EXPECT_EQ(ret, 0); ret = macObj->getMacLength(macObj); EXPECT_EQ(ret, 20); - OH_HCF_OBJ_DESTROY(macObj); - OH_HCF_OBJ_DESTROY(key); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(macObj); + HcfObjDestroy(key); + HcfObjDestroy(generator); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest001, TestSize.Level0) @@ -450,9 +450,9 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest001, TestSize.Level0) EXPECT_EQ(ret, 20); // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(macObj); - OH_HCF_OBJ_DESTROY(key); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(macObj); + HcfObjDestroy(key); + HcfObjDestroy(generator); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest002, TestSize.Level0) @@ -489,9 +489,9 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest002, TestSize.Level0) EXPECT_EQ(ret, 28); // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(macObj); - OH_HCF_OBJ_DESTROY(key); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(macObj); + HcfObjDestroy(key); + HcfObjDestroy(generator); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest003, TestSize.Level0) @@ -528,9 +528,9 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest003, TestSize.Level0) EXPECT_EQ(ret, 32); // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(macObj); - OH_HCF_OBJ_DESTROY(key); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(macObj); + HcfObjDestroy(key); + HcfObjDestroy(generator); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest004, TestSize.Level0) @@ -567,9 +567,9 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest004, TestSize.Level0) EXPECT_EQ(ret, 48); // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(macObj); - OH_HCF_OBJ_DESTROY(key); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(macObj); + HcfObjDestroy(key); + HcfObjDestroy(generator); } HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest005, TestSize.Level0) @@ -606,8 +606,8 @@ HWTEST_F(CryptoMacTest, CryptoFrameworkHmacAlgoTest005, TestSize.Level0) EXPECT_EQ(ret, 64); // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(macObj); - OH_HCF_OBJ_DESTROY(key); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(macObj); + HcfObjDestroy(key); + HcfObjDestroy(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 720b218e3792e347b0f25abe1dd5de9e4e35cbbc..25b8efecbbd049ed68a46b9265f52e3a391847fc 100644 --- a/test/unittest/src/crypto_md_test.cpp +++ b/test/unittest/src/crypto_md_test.cpp @@ -89,7 +89,7 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoSuppTest001, TestSize.Level0) ret = (int32_t)HcfMdCreate("SHA1", &mdObj); EXPECT_EQ(ret, 0); EXPECT_NE(mdObj, nullptr); - OH_HCF_OBJ_DESTROY(mdObj); + HcfObjDestroy(mdObj); } HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoSuppTest002, TestSize.Level0) @@ -124,7 +124,7 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoNameTest001, TestSize.Level0) const char *algoName = mdObj->getAlgoName(mdObj); ret = strcmp(algoName, "SHA1"); EXPECT_EQ(ret, 0); - OH_HCF_OBJ_DESTROY(mdObj); + HcfObjDestroy(mdObj); } HWTEST_F(CryptoMdTest, CryptoFrameworkMdUpdateTest001, TestSize.Level0) @@ -139,7 +139,7 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdUpdateTest001, TestSize.Level0) // test api functions ret = mdObj->update(mdObj, inBlob); EXPECT_NE(ret, 0); - OH_HCF_OBJ_DESTROY(mdObj); + HcfObjDestroy(mdObj); } HWTEST_F(CryptoMdTest, CryptoFrameworkMdUpdateTest002, TestSize.Level0) @@ -157,7 +157,7 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdUpdateTest002, TestSize.Level0) // test api functions ret = mdObj->update(mdObj, &inBlob); EXPECT_EQ(ret, 0); - OH_HCF_OBJ_DESTROY(mdObj); + HcfObjDestroy(mdObj); } HWTEST_F(CryptoMdTest, CryptoFrameworkMdDoFinalTest001, TestSize.Level0) @@ -175,7 +175,7 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdDoFinalTest001, TestSize.Level0) EXPECT_EQ(ret, 0); // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(mdObj); + HcfObjDestroy(mdObj); } HWTEST_F(CryptoMdTest, CryptoFrameworkMdDoFinalTest002, TestSize.Level0) @@ -199,7 +199,7 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdDoFinalTest002, TestSize.Level0) EXPECT_EQ(ret, 0); // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(mdObj); + HcfObjDestroy(mdObj); } HWTEST_F(CryptoMdTest, CryptoFrameworkMdDoFinalTest003, TestSize.Level0) @@ -222,7 +222,7 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdDoFinalTest003, TestSize.Level0) PrintfBlobInHex(outBlob.data, outBlob.len); // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(mdObj); + HcfObjDestroy(mdObj); } HWTEST_F(CryptoMdTest, CryptoFrameworkMdLenTest001, TestSize.Level0) @@ -235,7 +235,7 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdLenTest001, TestSize.Level0) // test api functions ret = mdObj->getMdLength(mdObj); EXPECT_EQ(ret, 20); - OH_HCF_OBJ_DESTROY(mdObj); + HcfObjDestroy(mdObj); } HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest001, TestSize.Level0) @@ -261,7 +261,7 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest001, TestSize.Level0) EXPECT_EQ(ret, 20); // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(mdObj); + HcfObjDestroy(mdObj); } HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest002, TestSize.Level0) @@ -291,7 +291,7 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest002, TestSize.Level0) // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(mdObj); + HcfObjDestroy(mdObj); } HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest003, TestSize.Level0) @@ -319,7 +319,7 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest003, TestSize.Level0) EXPECT_EQ(ret, 32); // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(mdObj); + HcfObjDestroy(mdObj); } HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest004, TestSize.Level0) @@ -349,7 +349,7 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest004, TestSize.Level0) // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(mdObj); + HcfObjDestroy(mdObj); } HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest005, TestSize.Level0) @@ -379,7 +379,7 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest005, TestSize.Level0) // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(mdObj); + HcfObjDestroy(mdObj); } HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest006, TestSize.Level0) @@ -409,6 +409,6 @@ HWTEST_F(CryptoMdTest, CryptoFrameworkMdAlgoTest006, TestSize.Level0) // destroy the API obj and blob data HcfBlobDataClearAndFree(&outBlob); - OH_HCF_OBJ_DESTROY(mdObj); + HcfObjDestroy(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 314062917689935c0b6495b874dafbcd10c8a8ea..6383b34590362fd80ac859cbd2d502644fdf8ea1 100644 --- a/test/unittest/src/crypto_rand_test.cpp +++ b/test/unittest/src/crypto_rand_test.cpp @@ -72,7 +72,7 @@ HWTEST_F(CryptoRandTest, CryptoFrameworkRandGenerateTest001, TestSize.Level0) // test generate random with length 0 ret = randObj->generateRandom(randObj, randomLen, &randomBlob); EXPECT_NE(ret, 0); - OH_HCF_OBJ_DESTROY(randObj); + HcfObjDestroy(randObj); } HWTEST_F(CryptoRandTest, CryptoFrameworkRandGenerateTest002, TestSize.Level0) @@ -92,7 +92,7 @@ HWTEST_F(CryptoRandTest, CryptoFrameworkRandGenerateTest002, TestSize.Level0) EXPECT_EQ(ret, 0); // destroy the API obj and blob data HcfBlobDataClearAndFree(&randomBlob); - OH_HCF_OBJ_DESTROY(randObj); + HcfObjDestroy(randObj); } HWTEST_F(CryptoRandTest, CryptoFrameworkRandGenerateTest003, TestSize.Level0) @@ -112,7 +112,7 @@ HWTEST_F(CryptoRandTest, CryptoFrameworkRandGenerateTest003, TestSize.Level0) EXPECT_EQ(ret, 0); // destroy the API obj and blob data HcfBlobDataClearAndFree(&randomBlob); - OH_HCF_OBJ_DESTROY(randObj); + HcfObjDestroy(randObj); } HWTEST_F(CryptoRandTest, CryptoFrameworkRandGenerateTest004, TestSize.Level0) @@ -131,7 +131,7 @@ HWTEST_F(CryptoRandTest, CryptoFrameworkRandGenerateTest004, TestSize.Level0) ret = randObj->generateRandom(randObj, randomLen, &randomBlob); EXPECT_NE(ret, 0); // destroy the API obj and blob data - OH_HCF_OBJ_DESTROY(randObj); + HcfObjDestroy(randObj); } HWTEST_F(CryptoRandTest, CryptoFrameworkSetSeedTest001, TestSize.Level0) @@ -147,7 +147,7 @@ HWTEST_F(CryptoRandTest, CryptoFrameworkSetSeedTest001, TestSize.Level0) ret = randObj->setSeed(randObj, seedBlob); EXPECT_NE(ret, 0); // destroy the API obj and blob data - OH_HCF_OBJ_DESTROY(randObj); + HcfObjDestroy(randObj); } HWTEST_F(CryptoRandTest, CryptoFrameworkSetSeedTest002, TestSize.Level0) @@ -170,7 +170,7 @@ HWTEST_F(CryptoRandTest, CryptoFrameworkSetSeedTest002, TestSize.Level0) EXPECT_EQ(ret, 0); // destroy the API obj and blob data HcfBlobDataClearAndFree(&seedBlob); - OH_HCF_OBJ_DESTROY(randObj); + HcfObjDestroy(randObj); } HWTEST_F(CryptoRandTest, CryptoFrameworkSetSeedTest003, TestSize.Level0) @@ -193,6 +193,6 @@ HWTEST_F(CryptoRandTest, CryptoFrameworkSetSeedTest003, TestSize.Level0) EXPECT_EQ(ret, 0); // destroy the API obj and blob data HcfBlobDataClearAndFree(&seedBlob); - OH_HCF_OBJ_DESTROY(randObj); + HcfObjDestroy(randObj); } } \ No newline at end of file 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 3c9d3c082dad4c4f58898953052d1bc04d0a8de2..ab4fc1f43e190132eab515b3c0c228c73a51e376 100644 --- a/test/unittest/src/crypto_rsa_asy_key_generator_test.cpp +++ b/test/unittest/src/crypto_rsa_asy_key_generator_test.cpp @@ -48,7 +48,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest100, TestSize EXPECT_NE(generator->base.destroy, nullptr); EXPECT_NE(generator->generateKeyPair, nullptr); EXPECT_NE(generator->getAlgoName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest110, TestSize.Level0) @@ -61,7 +61,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest110, TestSize EXPECT_NE(generator->base.destroy, nullptr); EXPECT_NE(generator->generateKeyPair, nullptr); EXPECT_NE(generator->getAlgoName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest120, TestSize.Level0) @@ -74,7 +74,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest120, TestSize EXPECT_NE(generator->base.destroy, nullptr); EXPECT_NE(generator->generateKeyPair, nullptr); EXPECT_NE(generator->getAlgoName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } @@ -88,7 +88,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest130, TestSize EXPECT_NE(generator->base.destroy, nullptr); EXPECT_NE(generator->generateKeyPair, nullptr); EXPECT_NE(generator->getAlgoName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest140, TestSize.Level0) @@ -101,7 +101,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest140, TestSize EXPECT_NE(generator->base.destroy, nullptr); EXPECT_NE(generator->generateKeyPair, nullptr); EXPECT_NE(generator->getAlgoName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest150, TestSize.Level0) @@ -114,7 +114,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest150, TestSize EXPECT_NE(generator->base.destroy, nullptr); EXPECT_NE(generator->generateKeyPair, nullptr); EXPECT_NE(generator->getAlgoName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } // HcfAsyKeyGeneratorCreate correct case: with primes @@ -128,7 +128,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest200, TestSize EXPECT_NE(generator->base.destroy, nullptr); EXPECT_NE(generator->generateKeyPair, nullptr); EXPECT_NE(generator->getAlgoName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest210, TestSize.Level0) @@ -141,7 +141,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest210, TestSize EXPECT_NE(generator->base.destroy, nullptr); EXPECT_NE(generator->generateKeyPair, nullptr); EXPECT_NE(generator->getAlgoName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest220, TestSize.Level0) @@ -154,7 +154,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest220, TestSize EXPECT_NE(generator->base.destroy, nullptr); EXPECT_NE(generator->generateKeyPair, nullptr); EXPECT_NE(generator->getAlgoName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest230, TestSize.Level0) @@ -167,7 +167,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest230, TestSize EXPECT_NE(generator->base.destroy, nullptr); EXPECT_NE(generator->generateKeyPair, nullptr); EXPECT_NE(generator->getAlgoName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest240, TestSize.Level0) @@ -180,7 +180,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest240, TestSize EXPECT_NE(generator->base.destroy, nullptr); EXPECT_NE(generator->generateKeyPair, nullptr); EXPECT_NE(generator->getAlgoName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest250, TestSize.Level0) @@ -193,7 +193,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest250, TestSize EXPECT_NE(generator->base.destroy, nullptr); EXPECT_NE(generator->generateKeyPair, nullptr); EXPECT_NE(generator->getAlgoName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest260, TestSize.Level0) @@ -206,7 +206,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest260, TestSize EXPECT_NE(generator->base.destroy, nullptr); EXPECT_NE(generator->generateKeyPair, nullptr); EXPECT_NE(generator->getAlgoName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest270, TestSize.Level0) @@ -219,7 +219,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest270, TestSize EXPECT_NE(generator->base.destroy, nullptr); EXPECT_NE(generator->generateKeyPair, nullptr); EXPECT_NE(generator->getAlgoName, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } // HcfAsyKeyGeneratorCreate Incorrect case : algname is null @@ -229,7 +229,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest300, TestSize HcfResult res = HcfAsyKeyGeneratorCreate(NULL, &generator); EXPECT_NE(res, HCF_SUCCESS); EXPECT_EQ(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest310, TestSize.Level0) @@ -239,7 +239,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest310, TestSize "111111111111111111111111111111111111111111111111111111111111111111111", &generator); EXPECT_NE(res, HCF_SUCCESS); EXPECT_EQ(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest320, TestSize.Level0) @@ -254,7 +254,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest330, TestSize HcfResult res = HcfAsyKeyGeneratorCreate("RSA12315", &generator); EXPECT_NE(res, HCF_SUCCESS); EXPECT_EQ(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest340, TestSize.Level0) @@ -263,7 +263,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest340, TestSize HcfResult res = HcfAsyKeyGeneratorCreate("RSA512|PRIMES_777", &generator); EXPECT_NE(res, HCF_SUCCESS); EXPECT_EQ(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest350, TestSize.Level0) @@ -272,7 +272,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest350, TestSize HcfResult res = HcfAsyKeyGeneratorCreate("RSA512|PRIMES_3", &generator); EXPECT_NE(res, HCF_SUCCESS); EXPECT_EQ(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest360, TestSize.Level0) @@ -281,7 +281,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest360, TestSize HcfResult res = HcfAsyKeyGeneratorCreate("RSA768|PRIMES_3", &generator); EXPECT_NE(res, HCF_SUCCESS); EXPECT_EQ(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest370, TestSize.Level0) @@ -290,7 +290,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest370, TestSize HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024|PRIMES_4", &generator); EXPECT_NE(res, HCF_SUCCESS); EXPECT_EQ(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest380, TestSize.Level0) @@ -299,7 +299,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest380, TestSize HcfResult res = HcfAsyKeyGeneratorCreate("RSA3072|PRIMES_4", &generator); EXPECT_NE(res, HCF_SUCCESS); EXPECT_EQ(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest390, TestSize.Level0) @@ -308,7 +308,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest390, TestSize HcfResult res = HcfAsyKeyGeneratorCreate("RSA4096|PRIMES_5", &generator); EXPECT_NE(res, HCF_SUCCESS); EXPECT_EQ(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest400, TestSize.Level0) @@ -317,14 +317,14 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest400, TestSize HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024", &generator); EXPECT_EQ(res, HCF_SUCCESS); EXPECT_NE(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); generator = NULL; - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest410, TestSize.Level0) { - OH_HCF_OBJ_DESTROY(NULL); + HcfObjDestroy(NULL); } // generateKeyPair correct case @@ -356,8 +356,8 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest500, TestSize EXPECT_NE(prikey->base.base.destroy, nullptr); EXPECT_NE(prikey->clearMem, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest510, TestSize.Level0) @@ -388,8 +388,8 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest510, TestSize EXPECT_NE(prikey->base.base.destroy, nullptr); EXPECT_NE(prikey->clearMem, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } // generateKeyPair conrrect case: use getEncode encode pubkey and prikey @@ -428,9 +428,9 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest520, TestSize HcfFree(pubKeyBlob.data); HcfFree(priKeyBlob.data); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(dupKeyPair); + HcfObjDestroy(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(dupKeyPair); } // generateKeyPair correct case: getEncode encode pubkey @@ -458,9 +458,9 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest530, TestSize EXPECT_NE(pubkey->base.base.destroy, nullptr); HcfFree(pubKeyBlob.data); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(dupKeyPair); + HcfObjDestroy(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(dupKeyPair); } // generateKeyPair correct case: getEncode encode prikey @@ -490,9 +490,9 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest540, TestSize EXPECT_NE(prikey->clearMem, nullptr); HcfFree(priKeyBlob.data); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(dupKeyPair); + HcfObjDestroy(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(dupKeyPair); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest550, TestSize.Level0) @@ -530,9 +530,9 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest550, TestSize HcfFree(pubKeyBlob.data); HcfFree(priKeyBlob.data); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(dupKeyPair); + HcfObjDestroy(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(dupKeyPair); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest560, TestSize.Level0) @@ -570,9 +570,9 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest560, TestSize HcfFree(pubKeyBlob.data); HcfFree(priKeyBlob.data); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(dupKeyPair); + HcfObjDestroy(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(dupKeyPair); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest570, TestSize.Level0) @@ -610,9 +610,9 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest570, TestSize HcfFree(pubKeyBlob.data); HcfFree(priKeyBlob.data); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(dupKeyPair); + HcfObjDestroy(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(dupKeyPair); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest580, TestSize.Level0) @@ -650,9 +650,9 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest580, TestSize HcfFree(pubKeyBlob.data); HcfFree(priKeyBlob.data); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(dupKeyPair); + HcfObjDestroy(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(dupKeyPair); } // generateKeyPair incorrect case: user wrong ECC class, ignore in this version @@ -671,9 +671,9 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest600, TestSize HcfKeyPair *keyPair = NULL; res = rsaGenerator->generateKeyPair(eccGenerator, NULL, &keyPair); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(eccGenerator); - OH_HCF_OBJ_DESTROY(rsaGenerator); + HcfObjDestroy(keyPair); + HcfObjDestroy(eccGenerator); + HcfObjDestroy(rsaGenerator); } // generateKeyPair incorrect case: generator class is null @@ -689,7 +689,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest610, TestSize EXPECT_NE(res, HCF_SUCCESS); EXPECT_EQ(keyPair, nullptr); - OH_HCF_OBJ_DESTROY(rsaGenerator); + HcfObjDestroy(rsaGenerator); } // generateKeyPair incorrect case: keypair is null @@ -703,7 +703,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest620, TestSize res = rsaGenerator->generateKeyPair(rsaGenerator, NULL, NULL); EXPECT_NE(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(rsaGenerator); + HcfObjDestroy(rsaGenerator); } // convertKey correct case @@ -742,9 +742,9 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest700, TestSize HcfFree(pubKeyBlob.data); HcfFree(priKeyBlob.data); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(dupKeyPair); + HcfObjDestroy(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(dupKeyPair); } // convertKey incorrect case: input ECC class @@ -765,8 +765,8 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest710, TestSize EXPECT_NE(res, HCF_SUCCESS); EXPECT_EQ(dupKeyPair, nullptr); - OH_HCF_OBJ_DESTROY(eccGenerator); - OH_HCF_OBJ_DESTROY(rsaGenerator); + HcfObjDestroy(eccGenerator); + HcfObjDestroy(rsaGenerator); } @@ -795,8 +795,8 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest720, TestSize HcfFree(pubKeyBlob.data); HcfFree(priKeyBlob.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(rsaGenerator); + HcfObjDestroy(keyPair); + HcfObjDestroy(rsaGenerator); } // convertKey incorrect case: input null dupkeypair @@ -824,8 +824,8 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest730, TestSize HcfFree(pubKeyBlob.data); HcfFree(priKeyBlob.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(rsaGenerator); + HcfObjDestroy(keyPair); + HcfObjDestroy(rsaGenerator); } // Incorrect case: use wrong bits or primes @@ -835,7 +835,7 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest800, TestSize HcfResult res = HcfAsyKeyGeneratorCreate("RSA1111", &generator); EXPECT_NE(res, HCF_SUCCESS); EXPECT_EQ(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest810, TestSize.Level0) @@ -844,6 +844,6 @@ HWTEST_F(CryptoRsaAsyKeyGeneratorTest, CryptoRsaAsyKeyGeneratorTest810, TestSize HcfResult res = HcfAsyKeyGeneratorCreate("RSA1024|Primessf", &generator); EXPECT_NE(res, HCF_SUCCESS); EXPECT_EQ(generator, nullptr); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(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 8d679138f36abdbbb311ce957432654b42d34e0c..a92f06c0c4630c85c017e31c10c15563eb6f9c64 100644 --- a/test/unittest/src/crypto_rsa_cipher_test.cpp +++ b/test/unittest/src/crypto_rsa_cipher_test.cpp @@ -51,7 +51,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest100, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest110, TestSize.Level0) @@ -66,7 +66,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest110, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest120, TestSize.Level0) @@ -81,7 +81,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest120, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest130, TestSize.Level0) @@ -96,7 +96,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest130, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest140, TestSize.Level0) @@ -111,7 +111,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest140, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest150, TestSize.Level0) @@ -126,7 +126,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest150, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest160, TestSize.Level0) @@ -141,7 +141,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest160, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest170, TestSize.Level0) @@ -156,7 +156,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest170, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest180, TestSize.Level0) @@ -171,7 +171,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest180, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest190, TestSize.Level0) @@ -186,7 +186,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest190, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest200, TestSize.Level0) @@ -201,7 +201,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest200, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest210, TestSize.Level0) @@ -216,7 +216,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest210, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest220, TestSize.Level0) @@ -231,7 +231,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest220, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest230, TestSize.Level0) @@ -246,7 +246,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest230, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest240, TestSize.Level0) @@ -261,7 +261,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest240, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest250, TestSize.Level0) @@ -276,7 +276,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest250, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest260, TestSize.Level0) @@ -291,7 +291,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest260, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest270, TestSize.Level0) @@ -306,7 +306,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest270, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest280, TestSize.Level0) @@ -321,7 +321,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest280, TestSize.Level0) EXPECT_NE(cipher->init, nullptr); EXPECT_NE(cipher->update, nullptr); EXPECT_NE(cipher->doFinal, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } @@ -396,9 +396,9 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest400, TestSize.Level0) res = HcfCipherCreate("RSA2048|PKCS1_OAEP|SHA256|MGF1_SHA256", &cipher); EXPECT_EQ(res, HCF_SUCCESS); EXPECT_NE(cipher, nullptr); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); cipher = NULL; - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } // init correct case @@ -418,9 +418,9 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest500, TestSize.Level0) res = cipher->init(cipher, ENCRYPT_MODE, (HcfKey *)keyPair->pubKey, NULL); EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest510, TestSize.Level0) @@ -439,9 +439,9 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest510, TestSize.Level0) res = cipher->init(cipher, DECRYPT_MODE, (HcfKey *)keyPair->priKey, NULL); EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); + HcfObjDestroy(cipher); } // init incorrect case @@ -461,9 +461,9 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest600, TestSize.Level0) res = cipher->init(cipher, ENCRYPT_MODE, (HcfKey *)keyPair->priKey, NULL); EXPECT_NE(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest610, TestSize.Level0) @@ -482,9 +482,9 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest610, TestSize.Level0) res = cipher->init(cipher, DECRYPT_MODE, (HcfKey *)keyPair->pubKey, NULL); EXPECT_NE(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); + HcfObjDestroy(cipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest620, TestSize.Level0) @@ -503,9 +503,9 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest620, TestSize.Level0) res = cipher->init(NULL, DECRYPT_MODE, (HcfKey *)keyPair->pubKey, NULL); EXPECT_NE(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); + HcfObjDestroy(cipher); } // incorrect case: use diff class, we ignore it in this version @@ -529,10 +529,10 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest630, TestSize.Level0) res = cipher->init(aesCipher, DECRYPT_MODE, (HcfKey *)keyPair->pubKey, NULL); EXPECT_NE(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(cipher); - OH_HCF_OBJ_DESTROY(aesCipher); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); + HcfObjDestroy(cipher); + HcfObjDestroy(aesCipher); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest640, TestSize.Level0) @@ -543,7 +543,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest640, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = cipher->init(cipher, DECRYPT_MODE, NULL, NULL); EXPECT_NE(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); } // correct case: update not support @@ -569,9 +569,9 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest700, TestSize.Level0) EXPECT_NE(res, HCF_SUCCESS); EXPECT_EQ(encoutput.data, nullptr); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); + HcfObjDestroy(cipher); } // dofinal correct case @@ -599,7 +599,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest800, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = cipher->doFinal(cipher, &input, &encoutput); EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); HcfBlob decoutput = {.data = NULL, .len = 0}; cipher = NULL; @@ -609,14 +609,14 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest800, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = cipher->doFinal(cipher, &encoutput, &decoutput); EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); EXPECT_STREQ((char *)plan, (char *)decoutput.data); HcfFree(encoutput.data); HcfFree(decoutput.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest810, TestSize.Level0) @@ -643,7 +643,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest810, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = cipher->doFinal(cipher, &input, &encoutput); EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); HcfBlob decoutput = {.data = NULL, .len = 0}; cipher = NULL; @@ -653,14 +653,14 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest810, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = cipher->doFinal(cipher, &encoutput, &decoutput); EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); EXPECT_STREQ((char *)plan, (char *)decoutput.data); HcfFree(encoutput.data); HcfFree(decoutput.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest820, TestSize.Level0) @@ -687,7 +687,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest820, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = cipher->doFinal(cipher, &input, &encoutput); EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); HcfBlob decoutput = {.data = NULL, .len = 0}; cipher = NULL; @@ -697,14 +697,14 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest820, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = cipher->doFinal(cipher, &encoutput, &decoutput); EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); EXPECT_STREQ((char *)plan, (char *)decoutput.data); HcfFree(encoutput.data); HcfFree(decoutput.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } // incorrect case: algName out of boundary @@ -733,7 +733,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest830, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = cipher->doFinal(cipher, &input, &encoutput); EXPECT_NE(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); HcfBlob decoutput = {.data = NULL, .len = 0}; cipher = NULL; @@ -743,14 +743,14 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest830, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = cipher->doFinal(cipher, &encoutput, &decoutput); EXPECT_NE(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); EXPECT_STRNE((char *)plan, (char *)decoutput.data); HcfFree(encoutput.data); HcfFree(decoutput.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } @@ -764,8 +764,8 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest840, TestSize.Level0) HcfKeyPair *keyPair = NULL; res = generator->generateKeyPair(generator, NULL, &keyPair); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(keyPair); + HcfObjDestroy(generator); + HcfObjDestroy(keyPair); HcfCipher *cipher = NULL; res = HcfCipherCreate("RSA1024|PKCS1_OAEP|SHA256", &cipher); @@ -783,8 +783,8 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest845, TestSize.Level0) HcfKeyPair *keyPair = NULL; res = generator->generateKeyPair(generator, NULL, &keyPair); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(keyPair); + HcfObjDestroy(generator); + HcfObjDestroy(keyPair); HcfCipher *cipher = NULL; res = HcfCipherCreate("RSA1024|PKCS1_OAEP|MGF1_SHA256", &cipher); @@ -815,8 +815,8 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest850, TestSize.Level0) res = generator->convertKey(generator, NULL, &pubKeyBlob, &priKeyBlob, &dupKeyPair); EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(generator); - OH_HCF_OBJ_DESTROY(keyPair); + HcfObjDestroy(generator); + HcfObjDestroy(keyPair); HcfBlob input = {.data = (uint8_t *)plan, .len = strlen((char *)plan)}; HcfBlob encoutput = {.data = NULL, .len = 0}; @@ -828,7 +828,7 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest850, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = cipher->doFinal(cipher, &input, &encoutput); EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); HcfBlob decoutput = {.data = NULL, .len = 0}; cipher = NULL; @@ -838,14 +838,14 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest850, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = cipher->doFinal(cipher, &encoutput, &decoutput); EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); EXPECT_STREQ((char *)plan, (char *)decoutput.data); HcfFree(encoutput.data); HcfFree(decoutput.data); HcfFree(pubKeyBlob.data); HcfFree(priKeyBlob.data); - OH_HCF_OBJ_DESTROY(dupKeyPair); + HcfObjDestroy(dupKeyPair); } // correct case: test OAEP Plaintext boundary: @@ -887,12 +887,12 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest860, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); HcfFree(encoutput1.data); HcfFree(encoutput2.data); HcfFree(encoutput3.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } // correct case: test nopadding boundary < RSA_size(rsa) @@ -933,11 +933,11 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest870, TestSize.Level0) res = cipher->doFinal(cipher, &input2, &encoutput2); EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); HcfFree(encoutput1.data); HcfFree(encoutput2.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } // correct case: test PKCS1 boundary < RSA_size(rsa) - 11 @@ -977,10 +977,10 @@ HWTEST_F(CryptoRsaCipherTest, CryptoRsaCipherTest880, TestSize.Level0) res = cipher->doFinal(cipher, &input2, &encoutput2); EXPECT_NE(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(cipher); + HcfObjDestroy(cipher); HcfFree(encoutput1.data); HcfFree(encoutput2.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } } diff --git a/test/unittest/src/crypto_rsa_sign_test.cpp b/test/unittest/src/crypto_rsa_sign_test.cpp index 652680e4ba46127aea74a25b9a6958546e1162de..5c03640e47074179b0415108ae5dc57749221168 100644 --- a/test/unittest/src/crypto_rsa_sign_test.cpp +++ b/test/unittest/src/crypto_rsa_sign_test.cpp @@ -51,7 +51,7 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest100, TestSize.Level0) EXPECT_NE(sign->init, nullptr); EXPECT_NE(sign->update, nullptr); EXPECT_NE(sign->sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest110, TestSize.Level0) @@ -66,7 +66,7 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest110, TestSize.Level0) EXPECT_NE(sign->init, nullptr); EXPECT_NE(sign->update, nullptr); EXPECT_NE(sign->sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest120, TestSize.Level0) @@ -81,7 +81,7 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest120, TestSize.Level0) EXPECT_NE(sign->init, nullptr); EXPECT_NE(sign->update, nullptr); EXPECT_NE(sign->sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest130, TestSize.Level0) @@ -96,7 +96,7 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest130, TestSize.Level0) EXPECT_NE(sign->init, nullptr); EXPECT_NE(sign->update, nullptr); EXPECT_NE(sign->sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest140, TestSize.Level0) @@ -111,7 +111,7 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest140, TestSize.Level0) EXPECT_NE(sign->init, nullptr); EXPECT_NE(sign->update, nullptr); EXPECT_NE(sign->sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest150, TestSize.Level0) @@ -126,7 +126,7 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest150, TestSize.Level0) EXPECT_NE(sign->init, nullptr); EXPECT_NE(sign->update, nullptr); EXPECT_NE(sign->sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest160, TestSize.Level0) @@ -141,7 +141,7 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest160, TestSize.Level0) EXPECT_NE(sign->init, nullptr); EXPECT_NE(sign->update, nullptr); EXPECT_NE(sign->sign, nullptr); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); } // HcfSignCreate Incorrect case @@ -227,10 +227,10 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest300, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest310, TestSize.Level0) @@ -252,10 +252,10 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest310, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest320, TestSize.Level0) @@ -277,10 +277,10 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest320, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest330, TestSize.Level0) @@ -302,10 +302,10 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest330, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest340, TestSize.Level0) @@ -327,10 +327,10 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest340, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest350, TestSize.Level0) @@ -352,10 +352,10 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest350, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest360, TestSize.Level0) @@ -377,10 +377,10 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest360, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest370, TestSize.Level0) @@ -402,10 +402,10 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest370, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest380, TestSize.Level0) @@ -427,10 +427,10 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest380, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest390, TestSize.Level0) @@ -452,10 +452,10 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest390, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest400, TestSize.Level0) @@ -477,10 +477,10 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest400, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest410, TestSize.Level0) @@ -502,9 +502,9 @@ HWTEST_F(CryptoRsaSignTest, CryptoRsaSignTest410, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } } diff --git a/test/unittest/src/crypto_rsa_verify_test.cpp b/test/unittest/src/crypto_rsa_verify_test.cpp index a4f1e3280bf3104659bac779a9eb24abf7172624..d6516f9936f8d10f0e5269e1c6ca8d626b6f6498 100644 --- a/test/unittest/src/crypto_rsa_verify_test.cpp +++ b/test/unittest/src/crypto_rsa_verify_test.cpp @@ -46,7 +46,7 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest100, TestSize.Level0) EXPECT_NE(res, HCF_SUCCESS); ASSERT_EQ(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest110, TestSize.Level0) @@ -56,7 +56,7 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest110, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); } HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest200, TestSize.Level0) @@ -78,7 +78,7 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest200, TestSize.Level0) res = sign->init(sign, NULL, prikey); EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfVerify *verify = NULL; res = HcfVerifyCreate("RSA1024|PSS|SHA256|MGF1_SHA256", &verify); @@ -87,11 +87,11 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest200, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = verify->verify(verify, &input, &verifyData); EXPECT_EQ(res, 1); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest210, TestSize.Level0) @@ -116,7 +116,7 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest210, TestSize.Level0) res = sign->init(sign, NULL, prikey); EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfVerify *verify = NULL; res = HcfVerifyCreate("RSA1024|PSS|SHA256|MGF1_SHA256", &verify); @@ -125,11 +125,11 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest210, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = verify->verify(verify, &input, &verifyData); EXPECT_EQ(res, 1); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest220, TestSize.Level0) @@ -154,7 +154,7 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest220, TestSize.Level0) res = sign->init(sign, NULL, prikey); EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfVerify *verify = NULL; res = HcfVerifyCreate("RSA1024|PSS|SHA256|MGF1_SHA512", &verify); @@ -163,11 +163,11 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest220, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = verify->verify(verify, &input, &verifyData); EXPECT_EQ(res, 1); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest230, TestSize.Level0) @@ -192,7 +192,7 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest230, TestSize.Level0) res = sign->init(sign, NULL, prikey); EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfVerify *verify = NULL; res = HcfVerifyCreate("RSA1024|PKCS1|SHA256", &verify); @@ -201,11 +201,11 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest230, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = verify->verify(verify, &input, &verifyData); EXPECT_EQ(res, 1); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest240, TestSize.Level0) @@ -232,7 +232,7 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest240, TestSize.Level0) res = sign->init(sign, NULL, prikey); EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfVerify *verify = NULL; res = HcfVerifyCreate("RSA1024|PKCS1|SHA256", &verify); @@ -241,11 +241,11 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest240, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = verify->verify(verify, &input, &invalidverifyData); EXPECT_EQ(res, 0); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } // Incorrect case: different mode @@ -271,7 +271,7 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest250, TestSize.Level0) res = sign->init(sign, NULL, prikey); EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfVerify *verify = NULL; res = HcfVerifyCreate("RSA1024|PSS|SHA256|MGF1_SHA512", &verify); @@ -280,11 +280,11 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest250, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = verify->verify(verify, &input, &verifyData); EXPECT_EQ(res, 0); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } // Incorrect case: different mgf1md @@ -310,7 +310,7 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest260, TestSize.Level0) res = sign->init(sign, NULL, prikey); EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfVerify *verify = NULL; res = HcfVerifyCreate("RSA1024|PSS|SHA256|MGF1_SHA512", &verify); @@ -319,11 +319,11 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest260, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = verify->verify(verify, &input, &verifyData); EXPECT_EQ(res, 0); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } @@ -350,7 +350,7 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest270, TestSize.Level0) res = sign->init(sign, NULL, prikey); EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input, &verifyData); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfVerify *verify = NULL; res = HcfVerifyCreate("RSA1024|PKCS1|SHA512", &verify); @@ -359,11 +359,11 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest270, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = verify->verify(verify, &input, &verifyData); EXPECT_EQ(res, 0); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } // check update_func in PSS padding @@ -395,7 +395,7 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest280, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &inputEx, &verifyData); EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfVerify *verify = NULL; res = HcfVerifyCreate("RSA1024|PSS|SHA256|MGF1_SHA256", &verify); @@ -406,11 +406,11 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest280, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = verify->verify(verify, &inputEx, &verifyData); EXPECT_EQ(res, 1); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } // check update in PKCS1 padding @@ -448,7 +448,7 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest290, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = sign->sign(sign, &input3, &verifyData); EXPECT_EQ(res, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(sign); + HcfObjDestroy(sign); HcfVerify *verify = NULL; res = HcfVerifyCreate("RSA1024|PKCS1|SHA256", &verify); @@ -461,10 +461,10 @@ HWTEST_F(CryptoRsaVerifyTest, CryptoRsaVerifyTest290, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); res = verify->verify(verify, &input3, &verifyData); EXPECT_EQ(res, 1); - OH_HCF_OBJ_DESTROY(verify); + HcfObjDestroy(verify); HcfFree(verifyData.data); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } } diff --git a/test/unittest/src/crypto_x509_cert_chain_validator_test.cpp b/test/unittest/src/crypto_x509_cert_chain_validator_test.cpp index 14b7468279236e77939cc98a3a68a3c72a68e0b3..1ae9d7dc158aa17d696dc7bf4c6b21991c2ecdfc 100644 --- a/test/unittest/src/crypto_x509_cert_chain_validator_test.cpp +++ b/test/unittest/src/crypto_x509_cert_chain_validator_test.cpp @@ -161,12 +161,12 @@ HWTEST_F(CryptoX509CertChainValidatorTest, GetAlgorithm001, TestSize.Level0) const char *algo = pathValidator->getAlgorithm(pathValidator); EXPECT_NE(algo, nullptr); if (algo == nullptr) { - OH_HCF_OBJ_DESTROY(pathValidator); + HcfObjDestroy(pathValidator); return; } string st("PKIX"); ASSERT_STREQ(algo, st.c_str()); - OH_HCF_OBJ_DESTROY(pathValidator); + HcfObjDestroy(pathValidator); } HWTEST_F(CryptoX509CertChainValidatorTest, GetAlgorithm002, TestSize.Level0) @@ -215,7 +215,7 @@ HWTEST_F(CryptoX509CertChainValidatorTest, VerifyTest001, TestSize.Level0) EXPECT_EQ(res, HCF_SUCCESS); OUT: free(certsData.data); - OH_HCF_OBJ_DESTROY(pathValidator); + HcfObjDestroy(pathValidator); } /* invalid cert chain. */ @@ -269,6 +269,6 @@ HWTEST_F(CryptoX509CertChainValidatorTest, VerifyTest002, TestSize.Level0) EXPECT_NE(res, HCF_SUCCESS); OUT: free(certsData.data); - OH_HCF_OBJ_DESTROY(pathValidator); + HcfObjDestroy(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 288ab1ddf9f63206141f7a04019ab67e3a704c35..0cd431fb3bd08713c9e0c016f0e2dbba38ecd9ca 100644 --- a/test/unittest/src/crypto_x509_certificate_test.cpp +++ b/test/unittest/src/crypto_x509_certificate_test.cpp @@ -277,7 +277,7 @@ HWTEST_F(CryptoX509CertificateTest, GenerateCert001, TestSize.Level0) HcfResult ret = HcfX509CertificateCreate(&inStream, &x509Cert); EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(x509Cert, nullptr); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* Invalid input. */ @@ -288,7 +288,7 @@ HWTEST_F(CryptoX509CertificateTest, GenerateCert002, TestSize.Level0) HcfResult ret = HcfX509CertificateCreate(&inStream, &x509Cert); EXPECT_NE(ret, HCF_SUCCESS); EXPECT_EQ(x509Cert, nullptr); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* Invalid PEM format. */ @@ -302,7 +302,7 @@ HWTEST_F(CryptoX509CertificateTest, GenerateCert003, TestSize.Level0) HcfResult ret = HcfX509CertificateCreate(&inStream, &x509Cert); EXPECT_NE(ret, HCF_SUCCESS); EXPECT_EQ(x509Cert, nullptr); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* Valid DER format. */ @@ -327,8 +327,8 @@ HWTEST_F(CryptoX509CertificateTest, GenerateCert004, TestSize.Level0) EXPECT_NE(certFromDerData, nullptr); free(derBlob.data); - OH_HCF_OBJ_DESTROY(certFromDerData); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(certFromDerData); + HcfObjDestroy(x509Cert); } /* verify self signed cert. */ @@ -348,8 +348,8 @@ HWTEST_F(CryptoX509CertificateTest, Verify001, TestSize.Level0) EXPECT_NE(keyOut, nullptr); ret = x509Cert->base.verify((HcfCertificate *)x509Cert, keyOut); EXPECT_EQ(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(keyOut); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(keyOut); + HcfObjDestroy(x509Cert); } /* use root ca cert's public key to verify next cert. */ @@ -378,9 +378,9 @@ HWTEST_F(CryptoX509CertificateTest, Verify002, TestSize.Level0) EXPECT_NE(rootCert, nullptr); ret = secondCert->base.verify((HcfCertificate *)secondCert, rootkeyOut); EXPECT_EQ(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(rootkeyOut); - OH_HCF_OBJ_DESTROY(rootCert); - OH_HCF_OBJ_DESTROY(secondCert); + HcfObjDestroy(rootkeyOut); + HcfObjDestroy(rootCert); + HcfObjDestroy(secondCert); } /* verify cert with wrong pub key. */ @@ -410,9 +410,9 @@ HWTEST_F(CryptoX509CertificateTest, Verify003, TestSize.Level0) ret = x509Cert->base.verify((HcfCertificate *)x509Cert, rootkeyOut); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(rootkeyOut); - OH_HCF_OBJ_DESTROY(rootCert); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(rootkeyOut); + HcfObjDestroy(rootCert); + HcfObjDestroy(x509Cert); } /* verify cert with invalid input pub key. */ @@ -429,7 +429,7 @@ HWTEST_F(CryptoX509CertificateTest, Verify004, TestSize.Level0) HcfPubKey *keyOut = nullptr; ret = x509Cert->base.verify((HcfCertificate *)x509Cert, keyOut); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetEncoded001, TestSize.Level0) @@ -449,7 +449,7 @@ HWTEST_F(CryptoX509CertificateTest, GetEncoded001, TestSize.Level0) EXPECT_NE(encodingBlob.data, nullptr); EXPECT_EQ(encodingBlob.encodingFormat, HCF_FORMAT_DER); free(encodingBlob.data); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* Invalid input. */ @@ -466,7 +466,7 @@ HWTEST_F(CryptoX509CertificateTest, GetEncoded002, TestSize.Level0) ret = x509Cert->base.getEncoded((HcfCertificate *)x509Cert, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetPublicKey, TestSize.Level0) @@ -484,8 +484,8 @@ HWTEST_F(CryptoX509CertificateTest, GetPublicKey, TestSize.Level0) ret = x509Cert->base.getPublicKey((HcfCertificate *)x509Cert, &keyOut); EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(keyOut, nullptr); - OH_HCF_OBJ_DESTROY(keyOut); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(keyOut); + HcfObjDestroy(x509Cert); } /* Input valid date. YYMMDDHHMMSSZ */ @@ -502,7 +502,7 @@ HWTEST_F(CryptoX509CertificateTest, CheckValidityWithDate001, TestSize.Level0) const char *date = "231018162433Z"; ret = x509Cert->checkValidityWithDate(x509Cert, date); EXPECT_EQ(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* Input valid date. time format: YYYYMMDDHHMMSSZ */ @@ -519,7 +519,7 @@ HWTEST_F(CryptoX509CertificateTest, CheckValidityWithDate002, TestSize.Level0) const char *date = "20231018162433Z"; ret = x509Cert->checkValidityWithDate(x509Cert, date); EXPECT_EQ(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* Input invalid date--expiered. */ @@ -536,7 +536,7 @@ HWTEST_F(CryptoX509CertificateTest, CheckValidityWithDate003, TestSize.Level0) const char *date = "20991018162433Z"; ret = x509Cert->checkValidityWithDate(x509Cert, date); EXPECT_EQ(ret, HCF_ERR_CERT_HAS_EXPIRED); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* Input invalid date. */ @@ -553,7 +553,7 @@ HWTEST_F(CryptoX509CertificateTest, CheckValidityWithDate004, TestSize.Level0) const char *date = "20191018162433Z"; ret = x509Cert->checkValidityWithDate(x509Cert, date); EXPECT_EQ(ret, HCF_ERR_CERT_NOT_YET_VALID); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* Input invalid date form. */ @@ -570,7 +570,7 @@ HWTEST_F(CryptoX509CertificateTest, CheckValidityWithDate005, TestSize.Level0) const char *date = "20191018"; ret = x509Cert->checkValidityWithDate(x509Cert, date); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetVersion, TestSize.Level0) @@ -585,7 +585,7 @@ HWTEST_F(CryptoX509CertificateTest, GetVersion, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); long ver = x509Cert->getVersion(x509Cert); EXPECT_EQ(ver, TEST_CERT_VERSION); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetSerialNumber, TestSize.Level0) @@ -600,7 +600,7 @@ HWTEST_F(CryptoX509CertificateTest, GetSerialNumber, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); long serialNumber = x509Cert->getSerialNumber(x509Cert); EXPECT_EQ(serialNumber, TEST_CERT_SERIAL_NUMBER); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetIssuerName001, TestSize.Level0) @@ -619,7 +619,7 @@ HWTEST_F(CryptoX509CertificateTest, GetIssuerName001, TestSize.Level0) EXPECT_NE(out.data, nullptr); printf("the IssuerDN = %s.\n", out.data); HcfBlobDataClearAndFree(&out); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* invalid input. */ @@ -635,7 +635,7 @@ HWTEST_F(CryptoX509CertificateTest, GetIssuerName002, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); ret = x509Cert->getIssuerName(x509Cert, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetSubjectName001, TestSize.Level0) @@ -654,7 +654,7 @@ HWTEST_F(CryptoX509CertificateTest, GetSubjectName001, TestSize.Level0) EXPECT_NE(out.data, nullptr); printf("the SubjectDN = %s.\n", out.data); HcfBlobDataClearAndFree(&out); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* invalid input. */ @@ -670,7 +670,7 @@ HWTEST_F(CryptoX509CertificateTest, GetSubjectName002, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); ret = x509Cert->getSubjectName(x509Cert, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetNotBeforeTime001, TestSize.Level0) @@ -688,7 +688,7 @@ HWTEST_F(CryptoX509CertificateTest, GetNotBeforeTime001, TestSize.Level0) EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(out.data, nullptr); HcfBlobDataClearAndFree(&out); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* invalid input. */ @@ -704,7 +704,7 @@ HWTEST_F(CryptoX509CertificateTest, GetNotBeforeTime002, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); ret = x509Cert->getNotBeforeTime(x509Cert, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetNotAfterTime001, TestSize.Level0) @@ -722,7 +722,7 @@ HWTEST_F(CryptoX509CertificateTest, GetNotAfterTime001, TestSize.Level0) EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(out.data, nullptr); HcfBlobDataClearAndFree(&out); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* invalid input. */ @@ -738,7 +738,7 @@ HWTEST_F(CryptoX509CertificateTest, GetNotAfterTime002, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); ret = x509Cert->getNotAfterTime(x509Cert, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetSignature001, TestSize.Level0) @@ -756,7 +756,7 @@ HWTEST_F(CryptoX509CertificateTest, GetSignature001, TestSize.Level0) EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(sigOut.data, nullptr); HcfBlobDataClearAndFree(&sigOut); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* invalid input. */ @@ -772,7 +772,7 @@ HWTEST_F(CryptoX509CertificateTest, GetSignature002, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); ret = x509Cert->getSignature(x509Cert, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgName001, TestSize.Level0) @@ -790,7 +790,7 @@ HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgName001, TestSize.Level0) EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(sigAlgName.data, nullptr); HcfBlobDataClearAndFree(&sigAlgName); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* invalid input. */ @@ -806,7 +806,7 @@ HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgName002, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); ret = x509Cert->getSignatureAlgName(x509Cert, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgOid001, TestSize.Level0) @@ -824,7 +824,7 @@ HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgOid001, TestSize.Level0) EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(sigAlgOID.data, nullptr); HcfBlobDataClearAndFree(&sigAlgOID); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* invalid input. */ @@ -840,7 +840,7 @@ HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgOid002, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); ret = x509Cert->getSignatureAlgOid(x509Cert, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgParams001, TestSize.Level0) @@ -858,7 +858,7 @@ HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgParams001, TestSize.Level0) EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(sigAlgParamsOut.data, nullptr); HcfBlobDataClearAndFree(&sigAlgParamsOut); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* invalid input. */ @@ -874,7 +874,7 @@ HWTEST_F(CryptoX509CertificateTest, GetSignatureAlgParams002, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); ret = x509Cert->getSignatureAlgParams(x509Cert, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetKeyUsage, TestSize.Level0) @@ -892,7 +892,7 @@ HWTEST_F(CryptoX509CertificateTest, GetKeyUsage, TestSize.Level0) EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(out.data, nullptr); HcfBlobDataClearAndFree(&out); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetExtKeyUsage001, TestSize.Level0) @@ -910,7 +910,7 @@ HWTEST_F(CryptoX509CertificateTest, GetExtKeyUsage001, TestSize.Level0) EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(keyUsageOut.data, nullptr); HcfArrayDataClearAndFree(&keyUsageOut); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* Cert which has no extended key usage. */ @@ -928,7 +928,7 @@ HWTEST_F(CryptoX509CertificateTest, GetExtKeyUsage002, TestSize.Level0) ret = x509Cert->getExtKeyUsage(x509Cert, &keyUsageOut); EXPECT_EQ(ret, HCF_ERR_CRYPTO_OPERATION); EXPECT_EQ(keyUsageOut.data, nullptr); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* not a CA cert */ @@ -944,7 +944,7 @@ HWTEST_F(CryptoX509CertificateTest, GetBasicConstraints001, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); int32_t pathLen = x509Cert->getBasicConstraints(x509Cert); EXPECT_EQ(pathLen, -1); /* cert path len is only valid for CA. */ - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* CA cert */ @@ -960,7 +960,7 @@ HWTEST_F(CryptoX509CertificateTest, GetBasicConstraints002, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); int32_t pathLen = x509Cert->getBasicConstraints(x509Cert); EXPECT_EQ(pathLen, TEST_CERT_CHAIN_LEN); /* g_testSelfSignedCaCert is CA and it's path len is 2. */ - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* invalid input. */ @@ -976,7 +976,7 @@ HWTEST_F(CryptoX509CertificateTest, GetBasicConstraints003, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); int32_t pathLen = x509Cert->getBasicConstraints(nullptr); EXPECT_EQ(pathLen, -1); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetSubjectAltNames001, TestSize.Level0) @@ -994,7 +994,7 @@ HWTEST_F(CryptoX509CertificateTest, GetSubjectAltNames001, TestSize.Level0) EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(outName.data, nullptr); HcfArrayDataClearAndFree(&outName); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* cert without subject alternative names. */ @@ -1012,7 +1012,7 @@ HWTEST_F(CryptoX509CertificateTest, GetSubjectAltNames002, TestSize.Level0) ret = x509Cert->getSubjectAltNames(x509Cert, &outName); EXPECT_EQ(ret, HCF_ERR_CRYPTO_OPERATION); EXPECT_EQ(outName.data, nullptr); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* invalid input. */ @@ -1028,7 +1028,7 @@ HWTEST_F(CryptoX509CertificateTest, GetSubjectAltNames003, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); ret = x509Cert->getSubjectAltNames(x509Cert, nullptr); EXPECT_EQ(ret, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } HWTEST_F(CryptoX509CertificateTest, GetIssuerAltNames001, TestSize.Level0) @@ -1046,7 +1046,7 @@ HWTEST_F(CryptoX509CertificateTest, GetIssuerAltNames001, TestSize.Level0) EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(outName.data, nullptr); HcfArrayDataClearAndFree(&outName); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* cert without issuer alternative names. */ @@ -1064,7 +1064,7 @@ HWTEST_F(CryptoX509CertificateTest, GetIssuerAltNames002, TestSize.Level0) ret = x509Cert->getIssuerAltNames(x509Cert, &outName); EXPECT_EQ(ret, HCF_ERR_CRYPTO_OPERATION); EXPECT_EQ(outName.data, nullptr); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } /* invalid input. */ @@ -1080,6 +1080,6 @@ HWTEST_F(CryptoX509CertificateTest, GetIssuerAltNames003, TestSize.Level0) EXPECT_NE(x509Cert, nullptr); ret = x509Cert->getIssuerAltNames(x509Cert, nullptr); EXPECT_EQ(ret, HCF_INVALID_PARAMS); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(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 c850ccb4a28be15f13679be77f56ce6ec5c88428..3f76849e6d599cb685127f8d9daeb3dd7d04a557 100644 --- a/test/unittest/src/crypto_x509_crl_test.cpp +++ b/test/unittest/src/crypto_x509_crl_test.cpp @@ -211,11 +211,11 @@ void CryptoX509CrlTest::SetUpTestCase() void CryptoX509CrlTest::TearDownTestCase() { if (g_x509Crl != nullptr) { - OH_HCF_OBJ_DESTROY(g_x509Crl); + HcfObjDestroy(g_x509Crl); g_x509Crl = nullptr; } if (g_keyPair != nullptr) { - OH_HCF_OBJ_DESTROY(g_keyPair); + HcfObjDestroy(g_keyPair); g_keyPair = nullptr; } if (g_lastUpdate != nullptr) { @@ -250,7 +250,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest001, TestSize.Level0) HcfResult ret = HcfX509CrlCreate(&inStreamCrl, &x509Crl); EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(x509Crl, nullptr); - OH_HCF_OBJ_DESTROY(x509Crl); + HcfObjDestroy(x509Crl); } // Test crl create DER true @@ -260,7 +260,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest002, TestSize.Level0) HcfResult ret = HcfX509CrlCreate(g_crlDerInStream, &x509Crl); EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(x509Crl, nullptr); - OH_HCF_OBJ_DESTROY(x509Crl); + HcfObjDestroy(x509Crl); } // Test crl create error | encodingFormat @@ -337,8 +337,8 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest011, TestSize.Level0) bool resIsRevoked = x509Crl->base.isRevoked((HcfCrl *)x509Crl, (HcfCertificate *)x509Cert); EXPECT_EQ(resIsRevoked, true); - OH_HCF_OBJ_DESTROY(x509Crl); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Crl); + HcfObjDestroy(x509Cert); } // Test crl isRevoked error | crl null @@ -356,7 +356,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest012, TestSize.Level0) bool resIsRevoked = g_x509Crl->base.isRevoked(nullptr, (HcfCertificate *)x509Cert); EXPECT_EQ(resIsRevoked, false); - OH_HCF_OBJ_DESTROY(x509Cert); + HcfObjDestroy(x509Cert); } // Test crl isRevoked error | x509Cert null @@ -374,7 +374,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest013, TestSize.Level0) bool resIsRevoked = x509Crl->base.isRevoked((HcfCrl *)x509Crl, nullptr); EXPECT_EQ(resIsRevoked, false); - OH_HCF_OBJ_DESTROY(x509Crl); + HcfObjDestroy(x509Crl); } // Test crl isRevoked error | x509Crl error @@ -398,8 +398,8 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest014, TestSize.Level0) bool resIsRevoked = x509Crl->base.isRevoked((HcfCrl *)x509Crl, (HcfCertificate *)x509Cert); EXPECT_EQ(resIsRevoked, false); - OH_HCF_OBJ_DESTROY(x509Cert); - OH_HCF_OBJ_DESTROY(x509Crl); + HcfObjDestroy(x509Cert); + HcfObjDestroy(x509Crl); } // Test crl isRevoked error | x509Crl error @@ -427,8 +427,8 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest015, TestSize.Level0) bool resIsRevoked = x509Crl->base.isRevoked((HcfCrl *)x509Crl, (HcfCertificate *)x509Cert); EXPECT_EQ(resIsRevoked, false); - OH_HCF_OBJ_DESTROY(x509Cert); - OH_HCF_OBJ_DESTROY(x509Crl); + HcfObjDestroy(x509Cert); + HcfObjDestroy(x509Crl); } // Test crl GetType true @@ -446,7 +446,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest021, TestSize.Level0) const char *resStr = x509Crl->base.getType((HcfCrl *)x509Crl); EXPECT_STREQ(resStr, "X509"); - OH_HCF_OBJ_DESTROY(x509Crl); + HcfObjDestroy(x509Crl); } // Test crl GetType error @@ -464,7 +464,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest022, TestSize.Level0) const char *resStr = x509Crl->base.getType(nullptr); EXPECT_EQ(resStr, nullptr); - OH_HCF_OBJ_DESTROY(x509Crl); + HcfObjDestroy(x509Crl); } // Test crl getEncoded DER true @@ -477,7 +477,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest031, TestSize.Level0) ret = HcfX509CrlCreate(&inStreamInput, &crl2); EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(crl2, nullptr); - OH_HCF_OBJ_DESTROY(crl2); + HcfObjDestroy(crl2); HcfFree(inStreamInput.data); } @@ -502,8 +502,8 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest032, TestSize.Level0) EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(crl2, nullptr); HcfFree(inStreamInput.data); - OH_HCF_OBJ_DESTROY(crl2); - OH_HCF_OBJ_DESTROY(x509Crl); + HcfObjDestroy(crl2); + HcfObjDestroy(x509Crl); } // Test crl getEncoded error @@ -545,8 +545,8 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest042, TestSize.Level0) HcfResult ret = g_x509Crl->verify(g_x509Crl, keyPair->pubKey); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(keyPair); - OH_HCF_OBJ_DESTROY(generator); + HcfObjDestroy(keyPair); + HcfObjDestroy(generator); } // Test crl verify false @@ -578,7 +578,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest045, TestSize.Level0) ret = x509Crl->verify(x509Crl, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Crl); + HcfObjDestroy(x509Crl); } // Test crl getVersion true @@ -704,7 +704,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest091, TestSize.Level0) HcfResult ret = g_x509Crl->getRevokedCert(g_x509Crl, 1000, &crlEntry); EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(crlEntry, nullptr); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); } // Test crl getRevokedCert false @@ -746,7 +746,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest101, TestSize.Level0) EXPECT_NE(crlEntry, nullptr); long sn = crlEntry->getSerialNumber(crlEntry); EXPECT_EQ(sn, 1000); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); } // Test crl entry getSerialNumber false @@ -758,7 +758,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest102, TestSize.Level0) EXPECT_NE(crlEntry, nullptr); long sn = crlEntry->getSerialNumber(nullptr); EXPECT_EQ(sn, -1); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); } // Test crl entry getSerialNumber false @@ -770,7 +770,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest103, TestSize.Level0) EXPECT_NE(crlEntry, nullptr); long sn = crlEntry->getSerialNumber(nullptr); EXPECT_EQ(sn, -1); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); } // Test crl entry getEncoded true @@ -785,7 +785,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest111, TestSize.Level0) ret = crlEntry->getEncoded(crlEntry, &encodingBlob); EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(encodingBlob.data, nullptr); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); HcfFree(encodingBlob.data); } @@ -801,7 +801,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest112, TestSize.Level0) ret = crlEntry->getEncoded(nullptr, &encodingBlob); EXPECT_NE(ret, HCF_SUCCESS); EXPECT_EQ(encodingBlob.data, nullptr); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); } // Test crl entry getEncoded false @@ -814,7 +814,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest113, TestSize.Level0) ret = crlEntry->getEncoded(crlEntry, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); } // Test crl entry getEncoded false @@ -827,7 +827,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest114, TestSize.Level0) ret = crlEntry->getEncoded(nullptr, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); } // Test crl entry getCertIssuer true @@ -843,7 +843,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest121, TestSize.Level0) EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(out.data, nullptr); EXPECT_STREQ("/CN=CRL issuer", (char *)out.data); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); HcfFree(out.data); } @@ -859,7 +859,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest122, TestSize.Level0) ret = crlEntry->getCertIssuer(nullptr, &out); EXPECT_NE(ret, HCF_SUCCESS); EXPECT_EQ(out.data, nullptr); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); } // Test crl entry getCertIssuer false @@ -872,7 +872,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest123, TestSize.Level0) ret = crlEntry->getCertIssuer(crlEntry, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); } // Test crl entry getRevocationDate true @@ -888,7 +888,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest131, TestSize.Level0) EXPECT_EQ(ret, HCF_SUCCESS); EXPECT_NE(out.data, nullptr); EXPECT_STREQ((char *)g_rvTime->data, (char *)out.data); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); HcfFree(out.data); } @@ -904,7 +904,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest132, TestSize.Level0) ret = crlEntry->getRevocationDate(nullptr, &out); EXPECT_NE(ret, HCF_SUCCESS); EXPECT_EQ(out.data, nullptr); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); } // Test crl entry getRevocationDate false @@ -917,7 +917,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest133, TestSize.Level0) ret = crlEntry->getRevocationDate(crlEntry, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); } // Test crl getRevokedCertWithCert true @@ -954,9 +954,9 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest141, TestSize.Level0) EXPECT_NE(out.data, nullptr); EXPECT_STREQ("220829065953Z", (char *)out.data); - OH_HCF_OBJ_DESTROY(x509Cert); - OH_HCF_OBJ_DESTROY(x509Crl); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(x509Cert); + HcfObjDestroy(x509Crl); + HcfObjDestroy(crlEntry); HcfFree(out.data); } @@ -995,9 +995,9 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest142, TestSize.Level0) EXPECT_STREQ("/C=CN/ST=shanghai/L=huawei/O=www.test.com/OU=test/CN=www.test.com/emailAddress=test@test.com", (char *)out.data); - OH_HCF_OBJ_DESTROY(x509Cert); - OH_HCF_OBJ_DESTROY(x509Crl); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(x509Cert); + HcfObjDestroy(x509Crl); + HcfObjDestroy(crlEntry); HcfFree(out.data); } @@ -1035,9 +1035,9 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest143, TestSize.Level0) EXPECT_NE(encodingBlob.data, nullptr); HcfFree(encodingBlob.data); - OH_HCF_OBJ_DESTROY(x509Cert); - OH_HCF_OBJ_DESTROY(x509Crl); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(x509Cert); + HcfObjDestroy(x509Crl); + HcfObjDestroy(crlEntry); } // Test crl getRevokedCertWithCert false @@ -1058,7 +1058,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest144, TestSize.Level0) EXPECT_NE(ret, HCF_SUCCESS); EXPECT_EQ(crlEntry, nullptr); - OH_HCF_OBJ_DESTROY(x509Crl); + HcfObjDestroy(x509Crl); } // Test crl getRevokedCertWithCert false @@ -1089,8 +1089,8 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest145, TestSize.Level0) EXPECT_NE(ret, HCF_SUCCESS); EXPECT_EQ(crlEntry, nullptr); - OH_HCF_OBJ_DESTROY(x509Cert); - OH_HCF_OBJ_DESTROY(x509Crl); + HcfObjDestroy(x509Cert); + HcfObjDestroy(x509Crl); } // Test crl getRevokedCertWithCert false @@ -1119,8 +1119,8 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest146, TestSize.Level0) ret = x509Crl->getRevokedCertWithCert(x509Crl, x509Cert, nullptr); EXPECT_NE(ret, HCF_SUCCESS); - OH_HCF_OBJ_DESTROY(x509Cert); - OH_HCF_OBJ_DESTROY(x509Crl); + HcfObjDestroy(x509Cert); + HcfObjDestroy(x509Crl); } // Test crl getRevokedCertWithCert false @@ -1156,9 +1156,9 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest147, TestSize.Level0) EXPECT_NE(ret, HCF_SUCCESS); EXPECT_EQ(out.data, nullptr); - OH_HCF_OBJ_DESTROY(x509Cert); - OH_HCF_OBJ_DESTROY(x509Crl); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(x509Cert); + HcfObjDestroy(x509Crl); + HcfObjDestroy(crlEntry); } // Test crl entry getRevokedCerts true @@ -1177,7 +1177,7 @@ HWTEST_F(CryptoX509CrlTest, X509CrlTest151, TestSize.Level0) EXPECT_STREQ((char *)g_rvTime->data, (char *)out.data); HcfFree(out.data); - OH_HCF_OBJ_DESTROY(crlEntry); + HcfObjDestroy(crlEntry); } // Test crl entry getRevokedCerts false