MarcoBuster/Magisk
1
1
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Add new verity and encryption patterns

Browse Source 
Close #2118
This commit is contained in:
topjohnwu 2019-12-03 05:39:39 -05:00
parent 8d21988656
commit 03428329ef
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
native/jni/magiskboot/pattern.cpp
View File

@ -5,15 +5,16 @@
#include "magiskboot.h" #include "magiskboot.h"
#define MATCH(p) else if (strncmp(s + skip, p, sizeof(p) - 1) == 0) skip += (sizeof(p) - 1)
static int check_verity_pattern(const char *s) { static int check_verity_pattern(const char *s) {
int skip = 0; int skip = s[0] == ',';
if (s[0] == ',') ++skip;
if (strncmp(s + skip, "verify", 6) == 0) if (0) {}
skip += 6; MATCH("verify");
else if (strncmp(s + skip, "avb", 3) == 0) MATCH("avb");
skip += 3; MATCH("support_scfs");
else else return -1;
return -1;
if (s[skip] == '=') { if (s[skip] == '=') {
while (s[skip] != '\0' && s[skip] != ' ' && s[skip] != '\n' && s[skip] != ',') while (s[skip] != '\0' && s[skip] != ' ' && s[skip] != '\n' && s[skip] != ',')
@ -22,14 +23,15 @@ static int check_verity_pattern(const char *s) {
return skip; return skip;
} }
#undef MATCH
#define MATCH(p) else if (strncmp(s, p, sizeof(p) - 1) == 0) return (sizeof(p) - 1)
static int check_encryption_pattern(const char *s) { static int check_encryption_pattern(const char *s) {
constexpr const char *encrypt_list[] = { "forceencrypt", "forcefdeorfbe" }; if (0) {}
for (auto enc : encrypt_list) { MATCH("forceencrypt");
int len = strlen(enc); MATCH("forcefdeorfbe");
if (strncmp(s, enc, len) == 0) MATCH("fileencryption");
return len; else return -1;
}
return -1;
} }
char *patch_verity(const void *buf, uint32_t &size, bool inplace) { char *patch_verity(const void *buf, uint32_t &size, bool inplace) {