jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adb: fix --allow-untrusted to work again 

and fix the error code if untrusted adb is seen
cute-signatures
Timo Teräs 2021-09-13 13:17:26 +03:00
parent a278d11287
commit 9f07a3447e
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/adb.c
View File

@ -82,7 +82,7 @@ static int __adb_m_parse(struct adb *db, apk_blob_t data, struct apk_trust *t,
struct adb_verify_ctx vfy = {}; struct adb_verify_ctx vfy = {};
struct adb_block *blk; struct adb_block *blk;
struct apk_istream is; struct apk_istream is;
int r = 0, trusted = t ? 0 : 1; int r = 0, trusted = (t && t->allow_untrusted) ? 1 : 0;
uint32_t type, allowed = BIT(ADB_BLOCK_ADB); uint32_t type, allowed = BIT(ADB_BLOCK_ADB);
adb_foreach_block(blk, data) { adb_foreach_block(blk, data) {
@ -112,7 +112,10 @@ static int __adb_m_parse(struct adb *db, apk_blob_t data, struct apk_trust *t,
break; break;
case ADB_BLOCK_DATA: case ADB_BLOCK_DATA:
allowed = BIT(ADB_BLOCK_DATA) | BIT(ADB_BLOCK_DATAX); allowed = BIT(ADB_BLOCK_DATA) | BIT(ADB_BLOCK_DATAX);
if (!trusted) goto err; if (!trusted) {
r = -APKE_SIGNATURE_UNTRUSTED;
goto err;
}
break; break;
case ADB_BLOCK_DATAX: case ADB_BLOCK_DATAX:
r = -APKE_ADB_BLOCK; r = -APKE_ADB_BLOCK;
@ -170,7 +173,7 @@ static int __adb_m_stream(struct adb *db, struct apk_istream *is, uint32_t expec
struct adb_block blk; struct adb_block blk;
struct apk_segment_istream seg; struct apk_segment_istream seg;
void *sig; void *sig;
int r = 0, trusted = t ? 0 : 1; int r = 0, trusted = (t && t->allow_untrusted) ? 1 : 0;
uint32_t type, allowed = BIT(ADB_BLOCK_ADB); uint32_t type, allowed = BIT(ADB_BLOCK_ADB);
size_t sz; size_t sz;
@ -229,7 +232,10 @@ static int __adb_m_stream(struct adb *db, struct apk_istream *is, uint32_t expec
break; break;
case ADB_BLOCK_DATA: case ADB_BLOCK_DATA:
allowed = BIT(ADB_BLOCK_DATA) | BIT(ADB_BLOCK_DATAX); allowed = BIT(ADB_BLOCK_DATA) | BIT(ADB_BLOCK_DATAX);
if (!trusted) goto err; if (!trusted) {
r = -APKE_SIGNATURE_UNTRUSTED;
goto err;
}
break; break;
case ADB_BLOCK_DATAX: case ADB_BLOCK_DATAX:
r = -APKE_ADB_BLOCK; r = -APKE_ADB_BLOCK;

1
src/context.c
View File

@ -38,6 +38,7 @@ int apk_ctx_prepare(struct apk_ctx *ac)
ac->open_flags &= ~(APK_OPENF_CREATE | APK_OPENF_WRITE); ac->open_flags &= ~(APK_OPENF_CREATE | APK_OPENF_WRITE);
ac->open_flags |= APK_OPENF_READ; ac->open_flags |= APK_OPENF_READ;
} }
if (ac->flags & APK_ALLOW_UNTRUSTED) ac->trust.allow_untrusted = 1;
if (!ac->cache_dir) ac->cache_dir = "etc/apk/cache"; if (!ac->cache_dir) ac->cache_dir = "etc/apk/cache";
if (!ac->keys_dir) ac->keys_dir = "etc/apk/keys"; if (!ac->keys_dir) ac->keys_dir = "etc/apk/keys";
if (!ac->root) ac->root = "/"; if (!ac->root) ac->root = "/";