From c0d5f3b3242b97f3d448cba298fd84dcf01aeec8 Mon Sep 17 00:00:00 2001
From: Richard <1256827031@qq.com>
Date: Tue, 20 May 2025 10:01:51 +0000
Subject: [PATCH 1/3] =?UTF-8?q?DIFF=5FPATCH=5FSDK=E5=AE=8F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Richard <1256827031@qq.com>
---
 services/package/BUILD.gn                   | 29 ++++++++++++++++-----
 services/package/pkg_verify/cert_verify.cpp |  4 +++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/services/package/BUILD.gn b/services/package/BUILD.gn
index e77a4707..cc45967a 100644
--- a/services/package/BUILD.gn
+++ b/services/package/BUILD.gn
@@ -85,8 +85,15 @@ ohos_static_library("libupdaterpackage") {
     "${updater_path}/services/log:libupdaterlog",
   ]
 
-  if (!is_linux && !is_mingw && !is_mac && host_cpu != "arm64") {
-    deps += [ "../rust/hash_signed_data:rust_hash_signed_data" ]
+  if (!is_linux && !is_mingw && !is_mac) {
+    if (host_cpu != "arm64") {
+      deps += [ "../rust/hash_signed_data:rust_hash_signed_data" ]
+    } 
+    deps += [
+      "${updater_path}/interfaces/kits/misc_info:libmiscinfo",
+      "${updater_path}/services/fs_manager:libfsmanager",
+      "${updater_path}/utils:libutils",
+    ]
   }
 
   external_deps = [
@@ -117,6 +124,9 @@ ohos_static_library("libupdaterpackage") {
     ]
   }
   defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ]
+  if (is_linux || is_mingw || is_mac) {
+    defines += [ "DIFF_PATCH_SDK" ]
+  }
 
   subsystem_name = "updater"
   part_name = "updater"
@@ -138,16 +148,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 6a954544..f5bbfe31 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 &&
-- 
Gitee


From e0f6f29467c0965ea12d4a6c4a0f39905cd83fa5 Mon Sep 17 00:00:00 2001
From: Richard <1256827031@qq.com>
Date: Wed, 21 May 2025 01:11:51 +0000
Subject: [PATCH 2/3] add

Signed-off-by: Richard <1256827031@qq.com>
---
 services/package/BUILD.gn | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/services/package/BUILD.gn b/services/package/BUILD.gn
index cc45967a..ec770d94 100644
--- a/services/package/BUILD.gn
+++ b/services/package/BUILD.gn
@@ -85,16 +85,9 @@ ohos_static_library("libupdaterpackage") {
     "${updater_path}/services/log:libupdaterlog",
   ]
 
-  if (!is_linux && !is_mingw && !is_mac) {
-    if (host_cpu != "arm64") {
+  if (!is_linux && !is_mingw && !is_mac && host_cpu != "arm64") {
       deps += [ "../rust/hash_signed_data:rust_hash_signed_data" ]
-    } 
-    deps += [
-      "${updater_path}/interfaces/kits/misc_info:libmiscinfo",
-      "${updater_path}/services/fs_manager:libfsmanager",
-      "${updater_path}/utils:libutils",
-    ]
-  }
+  } 
 
   external_deps = [
     "bounds_checking_function:libsec_static",
@@ -124,9 +117,6 @@ ohos_static_library("libupdaterpackage") {
     ]
   }
   defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ]
-  if (is_linux || is_mingw || is_mac) {
-    defines += [ "DIFF_PATCH_SDK" ]
-  }
 
   subsystem_name = "updater"
   part_name = "updater"
-- 
Gitee


From 2dafca6164cd97876976ac5779c7cd3b81b68455 Mon Sep 17 00:00:00 2001
From: Richard <1256827031@qq.com>
Date: Wed, 21 May 2025 01:12:30 +0000
Subject: [PATCH 3/3] add

Signed-off-by: Richard <1256827031@qq.com>
---
 services/package/BUILD.gn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/package/BUILD.gn b/services/package/BUILD.gn
index ec770d94..2e86c6c6 100644
--- a/services/package/BUILD.gn
+++ b/services/package/BUILD.gn
@@ -86,8 +86,8 @@ ohos_static_library("libupdaterpackage") {
   ]
 
   if (!is_linux && !is_mingw && !is_mac && host_cpu != "arm64") {
-      deps += [ "../rust/hash_signed_data:rust_hash_signed_data" ]
-  } 
+    deps += [ "../rust/hash_signed_data:rust_hash_signed_data" ]
+  }
 
   external_deps = [
     "bounds_checking_function:libsec_static",
-- 
Gitee