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

verify: support v3 packages

cute-signatures
Timo Teräs 2021-07-30 18:06:34 +03:00
parent d3e71bb406
commit 727ecc440c
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/extract_v2.c
View File

@ -356,7 +356,7 @@ int apk_extract_v2(struct apk_extract_ctx *ectx, struct apk_istream *is)
apk_istream_gunzip_mpart(is, apk_sign_ctx_mpart_cb, &sctx), apk_istream_gunzip_mpart(is, apk_sign_ctx_mpart_cb, &sctx),
apk_extract_v2_entry, ectx, apk_ctx_get_id_cache(ac)); apk_extract_v2_entry, ectx, apk_ctx_get_id_cache(ac));
if (r == -ECANCELED) r = 0; if (r == -ECANCELED) r = 0;
if (r == 0 && !ectx->is_package && !ectx->is_index) if ((r == 0 || r == -APKE_SIGNATURE_UNTRUSTED || r == -APKE_EOF) && !ectx->is_package && !ectx->is_index)
r = ectx->ops->v2index ? -APKE_V2NDX_FORMAT : -APKE_V2PKG_FORMAT; r = ectx->ops->v2index ? -APKE_V2NDX_FORMAT : -APKE_V2PKG_FORMAT;
if (ectx->generate_identity) *ectx->identity = sctx.identity; if (ectx->generate_identity) *ectx->identity = sctx.identity;
apk_sign_ctx_free(&sctx); apk_sign_ctx_free(&sctx);

26
src/extract_v3.c
View File

@ -188,6 +188,25 @@ 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_meta(struct apk_extract_ctx *ectx, struct adb *db)
{
return 0;
}
static int apk_extract_v3_verify_file(struct apk_extract_ctx *ectx, const struct apk_file_info *fi, struct apk_istream *is)
{
if (is) {
apk_istream_read(is, 0, fi->size);
return apk_istream_close(is);
}
return 0;
}
static const struct apk_extract_ops extract_v3verify_ops = {
.v3meta = apk_extract_v3_verify_meta,
.file = apk_extract_v3_verify_file,
};
int apk_extract_v3(struct apk_extract_ctx *ectx, struct apk_istream *is) int apk_extract_v3(struct apk_extract_ctx *ectx, struct apk_istream *is)
{ {
struct apk_ctx *ac = ectx->ac; struct apk_ctx *ac = ectx->ac;
@ -198,8 +217,8 @@ int apk_extract_v3(struct apk_extract_ctx *ectx, struct apk_istream *is)
int r; int r;
if (IS_ERR(is)) return PTR_ERR(is); if (IS_ERR(is)) return PTR_ERR(is);
if (!ectx->ops || !ectx->ops->v3meta) if (!ectx->ops) ectx->ops = &extract_v3verify_ops;
return apk_istream_close_error(is, -APKE_FORMAT_NOT_SUPPORTED); if (!ectx->ops->v3meta) 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),
@ -211,6 +230,7 @@ int apk_extract_v3(struct apk_extract_ctx *ectx, struct apk_istream *is)
} }
if (r == -ECANCELED) r = 0; if (r == -ECANCELED) r = 0;
adb_free(&ctx.db); adb_free(&ctx.db);
ectx->pctx = 0; apk_extract_reset(ectx);
return r; return r;
} }