From: Michael Tremer Date: Tue, 21 Sep 2021 11:00:30 +0000 (+0000) Subject: downloader: Use unsigned char for digests X-Git-Tag: 0.9.28~963 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b894fdf969e59cba74c684d51bd6c2126dd6c72;p=pakfire.git downloader: Use unsigned char for digests To be consistent with the rest Signed-off-by: Michael Tremer --- diff --git a/src/libpakfire/downloader.c b/src/libpakfire/downloader.c index 5c01f53da..6f98c52c2 100644 --- a/src/libpakfire/downloader.c +++ b/src/libpakfire/downloader.c @@ -258,9 +258,15 @@ static int debug_callback(CURL *handle, curl_infotype type, #endif static struct pakfire_transfer* pakfire_downloader_create_transfer( - struct pakfire_downloader* downloader, const char* baseurl, struct pakfire_mirrorlist* mirrors, - const char* title, const char* url, const char* path, - enum pakfire_digests md, const char* expected_digest, const size_t expected_digest_length, + struct pakfire_downloader* downloader, + const char* baseurl, + struct pakfire_mirrorlist* mirrors, + const char* title, + const char* url, + const char* path, + enum pakfire_digests md, + const unsigned char* expected_digest, + const size_t expected_digest_length, enum pakfire_transfer_flags flags) { struct pakfire_config* config = NULL; @@ -406,10 +412,16 @@ ERROR: return NULL; } -int pakfire_downloader_add_transfer(struct pakfire_downloader* downloader, - const char* baseurl, struct pakfire_mirrorlist* mirrors, const char* title, - const char* url, const char* path, enum pakfire_digests md, - const char* expected_digest, const size_t expected_digest_length, +int pakfire_downloader_add_transfer( + struct pakfire_downloader* downloader, + const char* baseurl, + struct pakfire_mirrorlist* mirrors, + const char* title, + const char* url, + const char* path, + enum pakfire_digests md, + const unsigned char* expected_digest, + const size_t expected_digest_length, enum pakfire_transfer_flags flags) { struct pakfire_transfer* transfer = pakfire_downloader_create_transfer( downloader, baseurl, mirrors, title, url, path, md, expected_digest, expected_digest_length, flags); @@ -879,10 +891,16 @@ AGAIN: return r; } -int pakfire_downloader_retrieve(struct pakfire_downloader* downloader, - const char* baseurl, struct pakfire_mirrorlist* mirrors, const char* title, - const char* url, const char* path, enum pakfire_digests md, - const char* expected_digest, const size_t expected_digest_length, +int pakfire_downloader_retrieve( + struct pakfire_downloader* downloader, + const char* baseurl, + struct pakfire_mirrorlist* mirrors, + const char* title, + const char* url, + const char* path, + enum pakfire_digests md, + const unsigned char* expected_digest, + const size_t expected_digest_length, enum pakfire_transfer_flags flags) { struct pakfire_transfer* transfer = pakfire_downloader_create_transfer( downloader, baseurl, mirrors, title, url, path, md, expected_digest, expected_digest_length, flags); diff --git a/src/libpakfire/include/pakfire/downloader.h b/src/libpakfire/include/pakfire/downloader.h index 6fea6e5cd..e4b386597 100644 --- a/src/libpakfire/include/pakfire/downloader.h +++ b/src/libpakfire/include/pakfire/downloader.h @@ -39,15 +39,27 @@ int pakfire_downloader_create(struct pakfire_downloader** downloader, struct pak struct pakfire_downloader* pakfire_downloader_ref(struct pakfire_downloader* downloader); struct pakfire_downloader* pakfire_downloader_unref(struct pakfire_downloader* downloader); -int pakfire_downloader_retrieve(struct pakfire_downloader* downloader, - const char* baseurl, struct pakfire_mirrorlist* mirrors, const char* title, - const char* url, const char* path, enum pakfire_digests md, - const char* expected_digest, const size_t expected_digest_length, +int pakfire_downloader_retrieve( + struct pakfire_downloader* downloader, + const char* baseurl, + struct pakfire_mirrorlist* mirrors, + const char* title, + const char* url, + const char* path, + enum pakfire_digests md, + const unsigned char* expected_digest, + const size_t expected_digest_length, enum pakfire_transfer_flags flags); -int pakfire_downloader_add_transfer(struct pakfire_downloader* downloader, - const char* baseurl, struct pakfire_mirrorlist* mirrors, const char* title, - const char* url, const char* path, enum pakfire_digests md, - const char* expected_digest, const size_t expected_digest_length, +int pakfire_downloader_add_transfer( + struct pakfire_downloader* downloader, + const char* baseurl, + struct pakfire_mirrorlist* mirrors, + const char* title, + const char* url, + const char* path, + enum pakfire_digests md, + const unsigned char* expected_digest, + const size_t expected_digest_length, enum pakfire_transfer_flags flags); int pakfire_downloader_run(struct pakfire_downloader* downloader); diff --git a/src/libpakfire/repo.c b/src/libpakfire/repo.c index 35321943c..aaebdc1f8 100644 --- a/src/libpakfire/repo.c +++ b/src/libpakfire/repo.c @@ -85,9 +85,14 @@ static int pakfire_repo_is_internal(struct pakfire_repo* repo) { return (*name == '@'); } -static int pakfire_repo_retrieve(struct pakfire_repo* repo, const char* title, - const char* url, const char* path, enum pakfire_digests md, - const char* expected_digest, const size_t expected_digest_length, +static int pakfire_repo_retrieve( + struct pakfire_repo* repo, + const char* title, + const char* url, + const char* path, + enum pakfire_digests md, + const unsigned char* expected_digest, + const size_t expected_digest_length, enum pakfire_transfer_flags flags) { struct pakfire_downloader* downloader; int r = pakfire_downloader_create(&downloader, repo->pakfire);