TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-01-03 04:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Directly use rust::Vec

Browse Source
This commit is contained in:
topjohnwu 2023-06-16 02:33:01 -07:00
parent 0493829231
commit 81493475f9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/src/core/lib.rs
View File

@ -25,13 +25,13 @@ pub mod ffi {
fn magisk_logging(); fn magisk_logging();
fn zygisk_logging(); fn zygisk_logging();
fn find_apk_path(pkg: &[u8], data: &mut [u8]) -> usize; fn find_apk_path(pkg: &[u8], data: &mut [u8]) -> usize;
fn read_certificate(fd: i32, version: i32) -> Vec<u8>;
} }
#[namespace = "rust"] #[namespace = "rust"]
extern "Rust" { extern "Rust" {
fn daemon_entry(); fn daemon_entry();
fn zygisk_entry(); fn zygisk_entry();
fn read_certificate(fd: i32, version: i32) -> Vec<u8>;
type MagiskD; type MagiskD;
fn get_magiskd() -> &'static MagiskD; fn get_magiskd() -> &'static MagiskD;

12
native/src/core/package.cpp
View File

@ -7,6 +7,7 @@
#include "core.hpp" #include "core.hpp"
using namespace std; using namespace std;
using rust::Vec;
#define ENFORCE_SIGNATURE (!MAGISK_DEBUG) #define ENFORCE_SIGNATURE (!MAGISK_DEBUG)
@ -21,13 +22,12 @@ static pthread_mutex_t pkg_lock = PTHREAD_MUTEX_INITIALIZER;
// pkg_lock protects all following variables // pkg_lock protects all following variables
static int mgr_app_id = -1; static int mgr_app_id = -1;
static string *mgr_pkg; static string *mgr_pkg;
static string *mgr_cert; static Vec<uint8_t> *mgr_cert;
static int stub_apk_fd = -1; static int stub_apk_fd = -1;
static const string *default_cert; static const Vec<uint8_t> *default_cert;
static string read_certificate(int fd, int version) { static bool operator==(const Vec<uint8_t> &a, const Vec<uint8_t> &b) {
auto cert = rust::read_certificate(fd, version); return a.size() == b.size() && memcmp(a.data(), b.data(), a.size()) == 0;
return string{cert.begin(), cert.end()};
} }
void check_pkg_refresh() { void check_pkg_refresh() {
@ -78,7 +78,7 @@ void preserve_stub_apk() {
unlink(stub_path.data()); unlink(stub_path.data());
auto cert = read_certificate(stub_apk_fd, -1); auto cert = read_certificate(stub_apk_fd, -1);
if (!cert.empty()) if (!cert.empty())
default_cert = new string(std::move(cert)); default_cert = new Vec(std::move(cert));
lseek(stub_apk_fd, 0, SEEK_SET); lseek(stub_apk_fd, 0, SEEK_SET);
} }