]> git.ipfire.org Git - pakfire.git/commitdiff
downloader: Use unsigned char for digests
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 21 Sep 2021 11:00:30 +0000 (11:00 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 21 Sep 2021 11:00:30 +0000 (11:00 +0000)
To be consistent with the rest

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/libpakfire/downloader.c
src/libpakfire/include/pakfire/downloader.h
src/libpakfire/repo.c

index 5c01f53da9695a9f612a8b21d693f9b05e491a5e..6f98c52c2caff1b4f3e4d32ff24296d6467be3bc 100644 (file)
@@ -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);
index 6fea6e5cd1de48c6e6a23a52c6eb6837cf95d2a7..e4b38659705b9214156a0e486ed474defb0327c3 100644 (file)
@@ -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);
index 35321943c4dc64ce694160b2aa8f2f37022c953e..aaebdc1f868ce6cb95e5a4b80cd967d71f0a9b57 100644 (file)
@@ -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);