From 8dfb30fefe5c2d95c942c35fae0c3e983a111b80 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Tue, 24 May 2022 05:39:16 -0700
Subject: [PATCH] Skip cert check on debug builds

---
 native/jni/core/package.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/native/jni/core/package.cpp b/native/jni/core/package.cpp
index 6c0585f46..8a5d3c145 100644
--- a/native/jni/core/package.cpp
+++ b/native/jni/core/package.cpp
@@ -103,6 +103,7 @@ int get_manager(int user_id, string *pkg, bool install) {
         default_new(mgr_cert);
 
     auto check_dyn = [&](int u) -> bool {
+#if ENFORCE_SIGNATURE
         snprintf(app_path, sizeof(app_path),
             "%s/%d/%s/dyn/current.apk", APP_DATA_DIR, u, mgr_pkg->data());
         int dyn = open(app_path, O_RDONLY | O_CLOEXEC);
@@ -112,11 +113,10 @@ int get_manager(int user_id, string *pkg, bool install) {
         close(dyn);
         if (mismatch) {
             LOGE("pkg: dyn APK signature mismatch: %s\n", app_path);
-#if ENFORCE_SIGNATURE
             clear_pkg(mgr_pkg->data(), u);
             return false;
-#endif
         }
+#endif
         return true;
     };
 
@@ -227,22 +227,20 @@ int get_manager(int user_id, string *pkg, bool install) {
         auto check_pkg = [&](int u) -> bool {
             snprintf(app_path, sizeof(app_path), "%s/%d/" JAVA_PACKAGE_NAME, APP_DATA_DIR, u);
             if (stat(app_path, &st) == 0) {
+#if ENFORCE_SIGNATURE
                 string apk = find_apk_path(JAVA_PACKAGE_NAME);
                 int fd = xopen(apk.data(), O_RDONLY | O_CLOEXEC);
                 string cert = read_certificate(fd);
                 close(fd);
-
                 if (default_cert && cert != *default_cert) {
                     // Found APK with invalid signature, force replace with stub
                     LOGE("pkg: APK signature mismatch: %s\n", apk.data());
-#if ENFORCE_SIGNATURE
                     uninstall_pkg(JAVA_PACKAGE_NAME);
                     invalid = true;
                     install = true;
                     return false;
-#endif
                 }
-
+#endif
                 mgr_pkg->clear();
                 mgr_cert->clear();
                 mgr_app_id = to_app_id(st.st_uid);