diff --git a/hapsigntool_cpp_test/fuzztest/generate_ca/generateca010_fuzzer/generateca010_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/generate_ca/generateca010_fuzzer/generateca010_fuzzer.cpp index 3bfeb1af9620efc7553cb69e221f1ba8ea75c7af..bcfdd4cea327c55eb4338374c31fd9b6afe26163 100644 --- a/hapsigntool_cpp_test/fuzztest/generate_ca/generateca010_fuzzer/generateca010_fuzzer.cpp +++ b/hapsigntool_cpp_test/fuzztest/generate_ca/generateca010_fuzzer/generateca010_fuzzer.cpp @@ -66,7 +66,6 @@ bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) X509_REQ* subcsr = CertTools::GenerateCsr(keyPair, signAlg, issuer); X509* cert = X509_new(); CertTools::SignForSubCert(cert, subcsr, rootcsr, keyPair, params.get()); - return true; } } diff --git a/hapsigntool_cpp_test/unittest/hapVerify/hap_cert_verify_openssl_utils_test.cpp b/hapsigntool_cpp_test/unittest/hapVerify/hap_cert_verify_openssl_utils_test.cpp index f4b8a94c09ca4c27bc1c41c138fd033d7c9147ed..37a1d00072cdcb0aeb8704f8503020215d4c9a83 100644 --- a/hapsigntool_cpp_test/unittest/hapVerify/hap_cert_verify_openssl_utils_test.cpp +++ b/hapsigntool_cpp_test/unittest/hapVerify/hap_cert_verify_openssl_utils_test.cpp @@ -26,30 +26,6 @@ using namespace testing::ext; using namespace OHOS::SignatureTools; -namespace OHOS { - namespace SignatureTools { - bool Base64StringDecode(const std::string& base64String, ByteBuffer& output) - { - std::unique_ptr decodeBuffer = std::make_unique(base64String.size()); - if (decodeBuffer == nullptr) { - return false; - } - - const unsigned char* input = reinterpret_cast(base64String.c_str()); - int32_t len = EVP_DecodeBlock(reinterpret_cast(decodeBuffer.get()), - input, base64String.size()); - if (len <= 0) { - return false; - } - - output.SetCapacity(len); - output.PutData(0, decodeBuffer.get(), len); - decodeBuffer.reset(nullptr); - return true; - } - } // namespace SignatureTools -} // namespace OHOS - namespace { class VerifyCertOpensslUtilsTest : public testing::Test { public: diff --git a/hapsigntool_cpp_test/unittest/hapVerify/hap_cert_verify_openssl_utils_test.h b/hapsigntool_cpp_test/unittest/hapVerify/hap_cert_verify_openssl_utils_test.h index b7ae2ebfe3a4d68dfecbf02358713398ee9be95f..836b4cfbad295b53bdb6d91de1b0fbfceb127018 100644 --- a/hapsigntool_cpp_test/unittest/hapVerify/hap_cert_verify_openssl_utils_test.h +++ b/hapsigntool_cpp_test/unittest/hapVerify/hap_cert_verify_openssl_utils_test.h @@ -19,15 +19,8 @@ #include #include "byte_buffer.h" - #include "test_const.h" -namespace OHOS { - namespace SignatureTools { - bool Base64StringDecode(const std::string& base64String, SignatureTools::ByteBuffer& output); - } -} - int32_t GetCertInfo001(void); int32_t CertVerify001(void); int32_t Base64NotUrlSafeCertTest001(void); diff --git a/hapsigntool_cpp_test/unittest/signProfile/profile_test.cpp b/hapsigntool_cpp_test/unittest/signProfile/profile_test.cpp index 65ed878bc8a321663e54780b73c62e4b8a53a897..72b4010517a6c3847c78f808081d64a0d24271f5 100644 --- a/hapsigntool_cpp_test/unittest/signProfile/profile_test.cpp +++ b/hapsigntool_cpp_test/unittest/signProfile/profile_test.cpp @@ -102,7 +102,7 @@ void ProfileTest::TearDown() HWTEST_F(ProfileTest, profile_test004, testing::ext::TestSize.Level1) { std::string content; - SignerConfig* config = NULL; + SignerConfig* config = nullptr; std::string ret; std::shared_ptr generator = std::make_shared(); int result = generator->GenerateSignedData(content, config, ret); @@ -111,7 +111,7 @@ HWTEST_F(ProfileTest, profile_test004, testing::ext::TestSize.Level1) /** * @tc.name: profile_test005 - * @tc.desc: Test function of Pkcs7Generator::GenerateSignedData() failed for NULL config. + * @tc.desc: Test function of Pkcs7Generator::GenerateSignedData() failed for nullptr config. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 @@ -120,7 +120,7 @@ HWTEST_F(ProfileTest, profile_test004, testing::ext::TestSize.Level1) HWTEST_F(ProfileTest, profile_test005, testing::ext::TestSize.Level1) { std::string content = "hello,world"; - SignerConfig* config = NULL; + SignerConfig* config = nullptr; std::string ret; std::shared_ptr generator = std::make_shared(); int result = generator->GenerateSignedData(content, config, ret); @@ -129,7 +129,7 @@ HWTEST_F(ProfileTest, profile_test005, testing::ext::TestSize.Level1) /** * @tc.name: profile_test006 - * @tc.desc: Test function of Pkcs7Generator::GenerateSignedData() failed for NULL signer. + * @tc.desc: Test function of Pkcs7Generator::GenerateSignedData() failed for nullptr signer. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 @@ -360,11 +360,11 @@ HWTEST_F(ProfileTest, profile_test011, testing::ext::TestSize.Level1) std::shared_ptr signer = factory.GetSigner(adapter); PKCS7Data p7; std::string p7b; - PKCS7* pkcs7 = NULL; + PKCS7* pkcs7 = nullptr; int result = p7.Sign(content, signer, "SHA384withECDSA", p7b); EXPECT_EQ(result, 0); const unsigned char* p = reinterpret_cast(p7b.data()); - pkcs7 = d2i_PKCS7(NULL, &p, static_cast(p7b.size())); + pkcs7 = d2i_PKCS7(nullptr, &p, static_cast(p7b.size())); STACK_OF(X509)* certs = pkcs7->d.sign->cert; int num = 1; while (sk_X509_num(certs) > num) { @@ -373,7 +373,7 @@ HWTEST_F(ProfileTest, profile_test011, testing::ext::TestSize.Level1) } sk_X509_push(certs, sk_X509_value(certs, 0)); X509_up_ref(sk_X509_value(certs, 0)); - unsigned char* out = NULL; + unsigned char* out = nullptr; int len = 0; len = i2d_PKCS7(pkcs7, &out); p7b.assign(out, out + len); @@ -413,14 +413,14 @@ HWTEST_F(ProfileTest, profile_test013, testing::ext::TestSize.Level1) std::shared_ptr signer = factory.GetSigner(adapter); PKCS7Data p7; std::string p7b; - PKCS7* pkcs7 = NULL; + PKCS7* pkcs7 = nullptr; int result = p7.Sign(content, signer, "SHA384withECDSA", p7b); EXPECT_EQ(result, 0); const unsigned char* p = reinterpret_cast(p7b.data()); - pkcs7 = d2i_PKCS7(NULL, &p, static_cast(p7b.size())); + pkcs7 = d2i_PKCS7(nullptr, &p, static_cast(p7b.size())); STACK_OF(X509)* certs = pkcs7->d.sign->cert; sk_X509_delete(certs, 2); - unsigned char* out = NULL; + unsigned char* out = nullptr; int len = 0; len = i2d_PKCS7(pkcs7, &out); p7b.assign(out, out + len); @@ -460,17 +460,17 @@ HWTEST_F(ProfileTest, profile_test014, testing::ext::TestSize.Level1) std::shared_ptr signer = factory.GetSigner(adapter); PKCS7Data p7; std::string p7b; - PKCS7* pkcs7 = NULL; + PKCS7* pkcs7 = nullptr; int result = p7.Sign(content, signer, "SHA384withECDSA", p7b); EXPECT_EQ(result, 0); const unsigned char* p = reinterpret_cast(p7b.data()); - pkcs7 = d2i_PKCS7(NULL, &p, static_cast(p7b.size())); + pkcs7 = d2i_PKCS7(nullptr, &p, static_cast(p7b.size())); STACK_OF(X509)* certs = pkcs7->d.sign->cert; sk_X509_delete(certs, 2); sk_X509_push(certs, sk_X509_value(certs, 1)); X509_up_ref(sk_X509_value(certs, 1)); PKCS7Data::PrintCertChainSub(certs); - unsigned char* out = NULL; + unsigned char* out = nullptr; int len = 0; len = i2d_PKCS7(pkcs7, &out); p7b.assign(out, out + len); @@ -492,7 +492,7 @@ HWTEST_F(ProfileTest, profile_test014, testing::ext::TestSize.Level1) */ HWTEST_F(ProfileTest, profile_test015, testing::ext::TestSize.Level1) { - ProfileInfo* info = NULL; + ProfileInfo* info = nullptr; ProfileInfo info2; info = &info2; info2 = *info; @@ -549,7 +549,7 @@ HWTEST_F(ProfileTest, profile_test016, testing::ext::TestSize.Level1) */ HWTEST_F(ProfileTest, test017, testing::ext::TestSize.Level1) { - STACK_OF(X509)* certs = sk_X509_new(NULL); + STACK_OF(X509)* certs = sk_X509_new(nullptr); EXPECT_TRUE(PKCS7Data::SortX509Stack(certs) < 0); sk_X509_free(certs); } @@ -564,13 +564,13 @@ HWTEST_F(ProfileTest, test017, testing::ext::TestSize.Level1) */ HWTEST_F(ProfileTest, profile_test019, testing::ext::TestSize.Level1) { - STACK_OF(X509)* certs = NULL; + STACK_OF(X509)* certs = nullptr; PKCS7Data::PrintCertChainSub(certs); } /** * @tc.name: profile_test020 - * @tc.desc: Test function of PKCS7Data::GetASN1Time() failed for NULL asn1_time. + * @tc.desc: Test function of PKCS7Data::GetASN1Time() failed for nullptr asn1_time. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 @@ -578,7 +578,7 @@ HWTEST_F(ProfileTest, profile_test019, testing::ext::TestSize.Level1) */ HWTEST_F(ProfileTest, profile_test020, testing::ext::TestSize.Level1) { - ASN1_TIME* time = NULL; + ASN1_TIME* time = nullptr; std::string result = PKCS7Data::GetASN1Time(time); EXPECT_TRUE(result.empty()); } @@ -593,7 +593,7 @@ HWTEST_F(ProfileTest, profile_test020, testing::ext::TestSize.Level1) */ HWTEST_F(ProfileTest, profile_test021, testing::ext::TestSize.Level1) { - STACK_OF(X509)* certs = NULL; + STACK_OF(X509)* certs = nullptr; EXPECT_TRUE(PKCS7Data::SortX509Stack(certs) < 0); } @@ -894,16 +894,16 @@ HWTEST_F(ProfileTest, profile_test030, testing::ext::TestSize.Level1) static STACK_OF(X509)* ReadCerts(const std::string& path) { - X509* cert = NULL; - BIO* in = NULL; - STACK_OF(X509)* certs = NULL; - certs = sk_X509_new(NULL); - if (certs == NULL) + X509* cert = nullptr; + BIO* in = nullptr; + STACK_OF(X509)* certs = nullptr; + certs = sk_X509_new(nullptr); + if (certs == nullptr) goto err; in = BIO_new_file(path.c_str(), "rb"); - if (in == NULL) + if (in == nullptr) goto err; - while ((cert = PEM_read_bio_X509(in, NULL, NULL, NULL))) + while ((cert = PEM_read_bio_X509(in, nullptr, nullptr, nullptr))) { sk_X509_push(certs, cert); } @@ -912,7 +912,7 @@ static STACK_OF(X509)* ReadCerts(const std::string& path) err: BIO_free(in); sk_X509_pop_free(certs, X509_free); - return NULL; + return nullptr; } /** diff --git a/hapsigntool_cpp_test/unittest/zip/zip_signer_test.cpp b/hapsigntool_cpp_test/unittest/zip/zip_signer_test.cpp index a6354241fc934fd9ce392e9ba2b5ac2e2bdd9cfc..7866fb3b833ac34aa24a5a0c447d9c6ae337433a 100644 --- a/hapsigntool_cpp_test/unittest/zip/zip_signer_test.cpp +++ b/hapsigntool_cpp_test/unittest/zip/zip_signer_test.cpp @@ -376,7 +376,7 @@ HWTEST_F(ZipSignerTest, EndOfCentralDirectoryGetEOCDByBytesTest001, testing::ext input.seekg(0, std::ios::beg); int eocdLength = EndOfCentralDirectory::EOCD_LENGTH; - uint64_t eocdOffset = (uint64_t)(fileSize - eocdLength); + uint64_t eocdOffset = reinterpret_cast(fileSize - eocdLength); std::string retStr; int res = FileUtils::ReadFileByOffsetAndLength(input, eocdOffset, eocdLength, retStr);