diff options
author | Lennart Poettering <lennart@poettering.net> | 2021-01-29 16:24:14 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2021-01-29 16:40:20 +0100 |
commit | ff2f7797587e6b0a4b6ef86a7d0bfdb08a5c3ffe (patch) | |
tree | 4736df897cda58c6b818d6b438b9d37723c51089 /src/import/pull-common.h | |
parent | c9b6ebef8c4ed28edc930bcb77906cee74c0cb34 (diff) | |
download | systemd-ff2f7797587e6b0a4b6ef86a7d0bfdb08a5c3ffe.tar.gz |
import: properly verify roothash_signature + verity download, too
Follow-up for 133b34f69a72dc90d4e336837d699245390c9f50 where this was
forgotten.
While we are at it, bring the parameters into the same order as we
declare them in the PullRaw/PullTar objects, i.e. match them to the
canonical order.
Diffstat (limited to 'src/import/pull-common.h')
-rw-r--r-- | src/import/pull-common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/import/pull-common.h b/src/import/pull-common.h index acbbab7eab..d420025fab 100644 --- a/src/import/pull-common.h +++ b/src/import/pull-common.h @@ -27,7 +27,7 @@ int pull_make_path(const char *url, const char *etag, const char *image_root, co int pull_make_auxiliary_job(PullJob **ret, const char *url, int (*strip_suffixes)(const char *name, char **ret), const char *suffix, CurlGlue *glue, PullJobFinished on_finished, void *userdata); int pull_make_verification_jobs(PullJob **ret_checksum_job, PullJob **ret_signature_job, ImportVerify verify, const char *url, CurlGlue *glue, PullJobFinished on_finished, void *userdata); -int pull_verify(ImportVerify verify, PullJob *main_job, PullJob *roothash_job, PullJob *settings_job, PullJob *checksum_job, PullJob *signature_job); +int pull_verify(ImportVerify verify, PullJob *main_job, PullJob *checksum_job, PullJob *signature_job, PullJob *settings_job, PullJob *roothash_job, PullJob *roothash_signature_job, PullJob *verity_job); typedef enum VerificationStyle { VERIFICATION_PER_FILE, /* SuSE-style ".sha256" files with inline gpg signature */ |