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

extract: support v3 index verification

cute-signatures
Timo Teräs 2021-08-23 14:38:01 +03:00
parent da7264733d
commit 91085a4874
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/adb.h
View File

@ -44,6 +44,7 @@ typedef uint32_t adb_val_t;
/* File Header */ /* File Header */
#define ADB_FORMAT_MAGIC 0x2e424441 // ADB. #define ADB_FORMAT_MAGIC 0x2e424441 // ADB.
#define ADB_SCHEMA_ANY 0
#define ADB_SCHEMA_IMPLIED 0x80000000 #define ADB_SCHEMA_IMPLIED 0x80000000
struct adb_file_header { struct adb_file_header {

33
src/extract_v3.c
View File

@ -167,6 +167,8 @@ static int apk_extract_v3_data_block(struct adb *db, struct adb_block *b, struct
int r; int r;
if (adb_block_type(b) != ADB_BLOCK_DATA) return 0; if (adb_block_type(b) != ADB_BLOCK_DATA) return 0;
if (db->schema != ADB_SCHEMA_PACKAGE) return -APKE_ADB_SCHEMA;
if (!ectx->ops->v3meta) return -APKE_FORMAT_NOT_SUPPORTED;
r = apk_extract_v3_next_file(ectx); r = apk_extract_v3_next_file(ectx);
if (r != 0) { if (r != 0) {
@ -188,6 +190,11 @@ static int apk_extract_v3_data_block(struct adb *db, struct adb_block *b, struct
return apk_extract_v3_file(ectx, sz, is); return apk_extract_v3_file(ectx, sz, is);
} }
static int apk_extract_v3_verify_index(struct apk_extract_ctx *ectx, struct adb *db)
{
return 0;
}
static int apk_extract_v3_verify_meta(struct apk_extract_ctx *ectx, struct adb *db) static int apk_extract_v3_verify_meta(struct apk_extract_ctx *ectx, struct adb *db)
{ {
return 0; return 0;
@ -203,6 +210,7 @@ static int apk_extract_v3_verify_file(struct apk_extract_ctx *ectx, const struct
} }
static const struct apk_extract_ops extract_v3verify_ops = { static const struct apk_extract_ops extract_v3verify_ops = {
.v3index = apk_extract_v3_verify_index,
.v3meta = apk_extract_v3_verify_meta, .v3meta = apk_extract_v3_verify_meta,
.file = apk_extract_v3_verify_file, .file = apk_extract_v3_verify_file,
}; };
@ -218,15 +226,30 @@ int apk_extract_v3(struct apk_extract_ctx *ectx, struct apk_istream *is)
if (IS_ERR(is)) return PTR_ERR(is); if (IS_ERR(is)) return PTR_ERR(is);
if (!ectx->ops) ectx->ops = &extract_v3verify_ops; if (!ectx->ops) ectx->ops = &extract_v3verify_ops;
if (!ectx->ops->v3meta) return apk_istream_close_error(is, -APKE_FORMAT_NOT_SUPPORTED); if (!ectx->ops->v3meta && !ectx->ops->v3index)
return apk_istream_close_error(is, -APKE_FORMAT_NOT_SUPPORTED);
ectx->pctx = &ctx; ectx->pctx = &ctx;
r = adb_m_process(&ctx.db, adb_decompress(is, 0), r = adb_m_process(&ctx.db, adb_decompress(is, 0),
ADB_SCHEMA_PACKAGE, trust, apk_extract_v3_data_block); ADB_SCHEMA_ANY, trust, apk_extract_v3_data_block);
if (r == 0) { if (r == 0) {
r = apk_extract_v3_next_file(ectx); switch (ctx.db.schema) {
if (r == 0) r = -APKE_ADB_BLOCK; case ADB_SCHEMA_PACKAGE:
if (r == 1) r = 0; r = apk_extract_v3_next_file(ectx);
if (r == 0) r = -APKE_ADB_BLOCK;
if (r == 1) r = 0;
break;
case ADB_SCHEMA_INDEX:
if (!ectx->ops->v3index) {
r = -APKE_FORMAT_NOT_SUPPORTED;
break;
}
r = ectx->ops->v3index(ectx, &ctx.db);
break;
default:
r = -APKE_ADB_SCHEMA;
break;
}
} }
if (r == -ECANCELED) r = 0; if (r == -ECANCELED) r = 0;
adb_free(&ctx.db); adb_free(&ctx.db);