From 862592deebd5b6d68b9352689cc3c26b3da18157 Mon Sep 17 00:00:00 2001 From: winnie-hu Date: Sat, 29 Oct 2022 16:04:29 +0800 Subject: [PATCH] fix fuzz test code check Signed-off-by: winnie-hu --- .../certificate/x509crl_fuzzer/x509crl_fuzzer.cpp | 3 ++- .../hcfkeyagreementcreate_fuzzer.cpp | 2 +- .../hcfsigncreate_fuzzer/hcfsigncreate_fuzzer.cpp | 10 +++++----- .../asykeygenerator_fuzzer.cpp | 14 +++++++------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/test/fuzztest/certificate/x509crl_fuzzer/x509crl_fuzzer.cpp b/test/fuzztest/certificate/x509crl_fuzzer/x509crl_fuzzer.cpp index 28fa934..7637a03 100755 --- a/test/fuzztest/certificate/x509crl_fuzzer/x509crl_fuzzer.cpp +++ b/test/fuzztest/certificate/x509crl_fuzzer/x509crl_fuzzer.cpp @@ -116,8 +116,9 @@ namespace OHOS { // Set Issuer X509_NAME *issuer = X509_NAME_new(); + const char *tmp = "CRL issuer"; ret = X509_NAME_add_entry_by_NID(issuer, NID_commonName, V_ASN1_PRINTABLESTRING, - (const unsigned char *)"CRL issuer", 10, -1, 0); + reinterpret_cast(tmp), 10, -1, 0); ret = X509_CRL_set_issuer_name(crl, issuer); g_lastUpdate = ASN1_TIME_new(); diff --git a/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/hcfkeyagreementcreate_fuzzer.cpp b/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/hcfkeyagreementcreate_fuzzer.cpp index 83c59fa..09dd8ff 100755 --- a/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/hcfkeyagreementcreate_fuzzer.cpp +++ b/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/hcfkeyagreementcreate_fuzzer.cpp @@ -26,7 +26,7 @@ namespace OHOS { bool HcfKeyAgreementCreateFuzzTest(const uint8_t* data, size_t size) { - HcfKeyAgreement *keyAgreement = NULL; + HcfKeyAgreement *keyAgreement = nullptr; std::string algoName(reinterpret_cast(data), size); int32_t res = HcfKeyAgreementCreate(algoName.c_str(), &keyAgreement); if (res != HCF_SUCCESS) { diff --git a/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/hcfsigncreate_fuzzer.cpp b/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/hcfsigncreate_fuzzer.cpp index 31c7ee2..104200b 100755 --- a/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/hcfsigncreate_fuzzer.cpp +++ b/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/hcfsigncreate_fuzzer.cpp @@ -30,20 +30,20 @@ const int INPUT_MSG_LEN = 12; namespace OHOS { static void TestSign(void) { - HcfAsyKeyGenerator *generator = NULL; + HcfAsyKeyGenerator *generator = nullptr; HcfResult res = HcfAsyKeyGeneratorCreate("ECC384", &generator); if (res != HCF_SUCCESS) { return; } - HcfKeyPair *ecc384KeyPair = NULL; - res = generator->generateKeyPair(generator, NULL, &ecc384KeyPair); + HcfKeyPair *ecc384KeyPair = nullptr; + res = generator->generateKeyPair(generator, nullptr, &ecc384KeyPair); HcfObjDestroy(generator); if (res != HCF_SUCCESS) { return; } - HcfSign *sign = NULL; + HcfSign *sign = nullptr; res = HcfSignCreate("ECC384|SHA384", &sign); if (res != HCF_SUCCESS) { HcfObjDestroy(ecc384KeyPair); @@ -53,7 +53,7 @@ namespace OHOS { .data = (uint8_t *)g_mockMessage, .len = INPUT_MSG_LEN }; - res = sign->init(sign, NULL, ecc384KeyPair->priKey); + res = sign->init(sign, nullptr, ecc384KeyPair->priKey); res = sign->update(sign, &mockInput); HcfObjDestroy(ecc384KeyPair); HcfObjDestroy(sign); diff --git a/test/fuzztest/key/asykeygenerator_fuzzer/asykeygenerator_fuzzer.cpp b/test/fuzztest/key/asykeygenerator_fuzzer/asykeygenerator_fuzzer.cpp index d80229d..25725c8 100755 --- a/test/fuzztest/key/asykeygenerator_fuzzer/asykeygenerator_fuzzer.cpp +++ b/test/fuzztest/key/asykeygenerator_fuzzer/asykeygenerator_fuzzer.cpp @@ -28,12 +28,12 @@ static bool g_testFlag = true; namespace OHOS { static const int ECC224_PUB_KEY_LEN = 57; static const int ECC224_PRI_KEY_LEN = 28; - static uint8_t mockEcc224PubKeyBlobData[ECC224_PUB_KEY_LEN] = { 4, 189, 186, 122, 21, 9, 8, 231, 90, 111, 68, 222, - 207, 200, 53, 114, 236, 246, 204, 9, 171, 197, 57, 173, 138, 38, 180, 217, 55, 234, 181, 87, 143, 199, 250, 222, - 101, 120, 193, 184, 132, 9, 139, 177, 112, 246, 97, 25, 57, 43, 252, 212, 33, 181, 114, 89, 151 }; + static uint8_t g_mockEcc224PubKeyBlobData[ECC224_PUB_KEY_LEN] = { 4, 189, 186, 122, 21, 9, 8, 231, 90, 111, 68, + 222, 207, 200, 53, 114, 236, 246, 204, 9, 171, 197, 57, 173, 138, 38, 180, 217, 55, 234, 181, 87, 143, 199, + 250, 222, 101, 120, 193, 184, 132, 9, 139, 177, 112, 246, 97, 25, 57, 43, 252, 212, 33, 181, 114, 89, 151 }; - static uint8_t mockEcc224PriKeyBlobData[ECC224_PRI_KEY_LEN] = { 7, 13, 160, 20, 7, 190, 2, 157, 233, 245, 164, 249, - 218, 30, 241, 3, 198, 136, 155, 15, 168, 198, 237, 117, 95, 45, 142, 183 }; + static uint8_t g_mockEcc224PriKeyBlobData[ECC224_PRI_KEY_LEN] = { 7, 13, 160, 20, 7, 190, 2, 157, 233, + 245, 164, 249, 218, 30, 241, 3, 198, 136, 155, 15, 168, 198, 237, 117, 95, 45, 142, 183 }; static void TestEccKey(void) { @@ -51,12 +51,12 @@ namespace OHOS { } HcfKeyPair *convertKeyPair = nullptr; static HcfBlob mockEcc224PubKeyBlob = { - .data = mockEcc224PubKeyBlobData, + .data = g_mockEcc224PubKeyBlobData, .len = ECC224_PUB_KEY_LEN }; static HcfBlob mockEcc224PriKeyBlob = { - .data = mockEcc224PriKeyBlobData, + .data = g_mockEcc224PriKeyBlobData, .len = ECC224_PRI_KEY_LEN }; res = generator->convertKey(generator, nullptr, &mockEcc224PubKeyBlob, &mockEcc224PriKeyBlob, &convertKeyPair); -- Gitee