diff --git a/services/package/BUILD.gn b/services/package/BUILD.gn index e77a4707ab85a62895dbbf59135e132e172fac63..2e86c6c652673112709ba178485c44e68de9fd5c 100644 --- a/services/package/BUILD.gn +++ b/services/package/BUILD.gn @@ -138,16 +138,21 @@ ohos_shared_library("libupdaterpackage_shared") { ] if (!is_linux && !is_mingw && !is_mac) { - deps += [ "../rust/hash_signed_data:rust_hash_signed_data" ] + deps += [ + "../rust/hash_signed_data:rust_hash_signed_data", + "${updater_path}/utils:libutils", + "${updater_path}/interfaces/kits/misc_info:libmiscinfo", + "${updater_path}/services/fs_manager:libfsmanager", + ] } configs = [ ":package_config" ] public_configs = [ ":libupdaterpackage_exported_headers" ] - defines = [ - "DIFF_PATCH_SDK", - "OPENSSL_SUPPRESS_DEPRECATED", - ] + defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ] + if (is_linux || is_mingw || is_mac) { + defines += [ "DIFF_PATCH_SDK" ] + } subsystem_name = "updater" part_name = "updater" diff --git a/services/package/pkg_verify/cert_verify.cpp b/services/package/pkg_verify/cert_verify.cpp index 6a9545449e7f1dbce3964316e395dd8e278b6219..f5bbfe31fee06d15cd1278631f992240b266d0e9 100644 --- a/services/package/pkg_verify/cert_verify.cpp +++ b/services/package/pkg_verify/cert_verify.cpp @@ -120,6 +120,10 @@ int32_t SingleCertHelper::VerifySingleCert(X509 *cert) int32_t SingleCertHelper::CompareCertSubjectAndIssuer(X509 *cert) { + if (rootInfo_.subject.empty() || rootInfo_.issuer.empty()) { + PKG_LOGW("rootInfo_ is null"); + return -1; + } string certSubject = GetX509CertSubjectName(cert); string certIssuer = GetX509CertIssuerName(cert); if (rootInfo_.subject.compare(certSubject) == 0 &&