]> git.ipfire.org Git - pakfire.git/commitdiff
digests: Split off into a new set of files
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 24 Aug 2022 10:03:28 +0000 (10:03 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 24 Aug 2022 10:03:28 +0000 (10:03 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
19 files changed:
Makefile.am
src/_pakfire/file.c
src/_pakfire/package.c
src/libpakfire/archive.c
src/libpakfire/db.c
src/libpakfire/digest.c [new file with mode: 0644]
src/libpakfire/downloader.c
src/libpakfire/file.c
src/libpakfire/include/pakfire/archive.h
src/libpakfire/include/pakfire/digest.h [new file with mode: 0644]
src/libpakfire/include/pakfire/downloader.h
src/libpakfire/include/pakfire/file.h
src/libpakfire/include/pakfire/package.h
src/libpakfire/include/pakfire/pakfire.h
src/libpakfire/include/pakfire/util.h
src/libpakfire/package.c
src/libpakfire/repo.c
src/libpakfire/transaction.c
src/libpakfire/util.c

index 2182053fc2eafdd82610cabd46086da87c5c8aa7..ac558803a3d70389fff3d579bd8af5c7ad574e98 100644 (file)
@@ -225,6 +225,7 @@ libpakfire_la_SOURCES = \
        src/libpakfire/config.c \
        src/libpakfire/db.c \
        src/libpakfire/dependencies.c \
+       src/libpakfire/digest.c \
        src/libpakfire/dist.c \
        src/libpakfire/downloader.c \
        src/libpakfire/file.c \
@@ -264,6 +265,7 @@ pkginclude_HEADERS += \
        src/libpakfire/include/pakfire/constants.h \
        src/libpakfire/include/pakfire/db.h \
        src/libpakfire/include/pakfire/dependencies.h \
+       src/libpakfire/include/pakfire/digest.h \
        src/libpakfire/include/pakfire/dist.h \
        src/libpakfire/include/pakfire/downloader.h \
        src/libpakfire/include/pakfire/file.h \
index 339cdeed3736145fb52c00635126e699227a912a..fff20d8eed244344469a7ecc093b1a7910f851ab 100644 (file)
@@ -21,6 +21,7 @@
 #include <Python.h>
 #include <datetime.h>
 
+#include <pakfire/digest.h>
 #include <pakfire/file.h>
 
 #include "file.h"
@@ -227,7 +228,7 @@ static int File_set_mtime(FileObject* self, PyObject* value) {
        return 0;
 }
 
-static PyObject* _File_digest(FileObject* self, enum pakfire_digests type) {
+static PyObject* _File_digest(FileObject* self, enum pakfire_digest_types type) {
        size_t length = 0;
 
        // Fetch the digest
@@ -247,7 +248,7 @@ static PyObject* File_digest(FileObject* self, PyObject* args) {
        return _File_digest(self, type);
 }
 
-static PyObject* _File_hexdigest(FileObject* self, enum pakfire_digests type) {
+static PyObject* _File_hexdigest(FileObject* self, enum pakfire_digest_types type) {
        char* hexdigest = pakfire_file_get_hexdigest(self->file, type);
        if (!hexdigest)
                Py_RETURN_NONE;
index dcb039dbd145c86ed7690938ffc38d102dc594da..45211a878e24343172c96789d746df99458282b0 100644 (file)
@@ -20,6 +20,7 @@
 
 #include <Python.h>
 
+#include <pakfire/digest.h>
 #include <pakfire/file.h>
 #include <pakfire/filelist.h>
 #include <pakfire/package.h>
@@ -193,8 +194,8 @@ static void Package_set_uuid(PackageObject* self, PyObject* value) {
        pakfire_package_set_uuid(self->package, uuid);
 }
 
-static PyObject* Package_get_hexdigest(PackageObject* self, enum pakfire_digests type) {
-       enum pakfire_digests digest = 0;
+static PyObject* Package_get_hexdigest(PackageObject* self, enum pakfire_digest_types type) {
+       enum pakfire_digest_types digest = 0;
 
        const char* hexdigest = pakfire_package_get_hexdigest(self->package, &digest);
        if (!hexdigest)
@@ -216,7 +217,7 @@ static PyObject* Package_get_hexdigest_sha512(PackageObject* self) {
 }
 
 static int Package_set_hexdigest(PackageObject* self,
-               enum pakfire_digests type, PyObject* value) {
+               enum pakfire_digest_types type, PyObject* value) {
        const char* hexdigest = PyUnicode_FromValue(value);
 
        return pakfire_package_set_hexdigest(self->package, type, hexdigest);
index c92a71cd0766b5370a87b00308a66cd3ae33e209..d7c19e0e67769306e037accbade7cb83a048dbdd 100644 (file)
@@ -43,6 +43,7 @@
 #include <pakfire/archive.h>
 #include <pakfire/compress.h>
 #include <pakfire/dependencies.h>
+#include <pakfire/digest.h>
 #include <pakfire/file.h>
 #include <pakfire/filelist.h>
 #include <pakfire/i18n.h>
@@ -846,7 +847,7 @@ PAKFIRE_EXPORT ssize_t pakfire_archive_get_size(struct pakfire_archive* archive)
 }
 
 int pakfire_archive_digest(struct pakfire_archive* archive,
-               enum pakfire_digests type, unsigned char* digest, size_t* length) {
+               enum pakfire_digest_types type, unsigned char* digest, size_t* length) {
        int r = 1;
 
        const EVP_MD* md = NULL;
index d7c0f842449ddee76b0fbcfc2be9572dce67d3b4..0596f9fa79f20399032cefe1b4d14eb5300546bb 100644 (file)
@@ -30,6 +30,7 @@
 #include <pakfire/archive.h>
 #include <pakfire/db.h>
 #include <pakfire/dependencies.h>
+#include <pakfire/digest.h>
 #include <pakfire/file.h>
 #include <pakfire/filelist.h>
 #include <pakfire/logging.h>
@@ -832,7 +833,7 @@ static void pakfire_db_add_userinstalled(struct pakfire* pakfire, const char* na
 }
 
 static const struct pakfire_digest {
-       enum pakfire_digests type;
+       enum pakfire_digest_types type;
        const char* prefix;
 } pakfire_digests[] = {
        { PAKFIRE_DIGEST_SHA512, "sha512:" },
@@ -840,7 +841,7 @@ static const struct pakfire_digest {
        { 0, NULL },
 };
 
-static char* pakfire_db_pack_digest(enum pakfire_digests type, const char* hexdigest) {
+static char* pakfire_db_pack_digest(enum pakfire_digest_types type, const char* hexdigest) {
        char* s = NULL;
        int r;
 
@@ -857,7 +858,7 @@ static char* pakfire_db_pack_digest(enum pakfire_digests type, const char* hexdi
        return NULL;
 }
 
-static const char* pakfire_db_unpack_digest(const char* hexdigest, enum pakfire_digests* type) {
+static const char* pakfire_db_unpack_digest(const char* hexdigest, enum pakfire_digest_types* type) {
        *type = 0;
 
        // Don't do anything for empty input
@@ -1377,7 +1378,7 @@ int pakfire_db_add_package(struct pakfire_db* db,
                goto ERROR;
        }
 
-       enum pakfire_digests digest_type = 0;
+       enum pakfire_digest_types digest_type = 0;
 
        const char* hexdigest = pakfire_package_get_hexdigest(pkg, &digest_type);
        if (hexdigest) {
@@ -1758,7 +1759,7 @@ static int pakfire_db_load_package(struct pakfire_db* db, struct pakfire_repo* r
        // Digest
        const char* digest = (const char*)sqlite3_column_text(stmt, 8);
        if (digest) {
-               enum pakfire_digests digest_type = 0;
+               enum pakfire_digest_types digest_type = 0;
 
                // Unpack digest
                const char* hexdigest = pakfire_db_unpack_digest(digest, &digest_type);
@@ -2022,7 +2023,7 @@ ERROR:
 }
 
 static int pakfire_db_load_file_digest(struct pakfire_db* db, struct pakfire_file* file,
-               sqlite3_stmt* stmt, const enum pakfire_digests type, const int field) {
+               sqlite3_stmt* stmt, const enum pakfire_digest_types type, const int field) {
        // Fetch digest
        const unsigned char* digest = sqlite3_column_blob(stmt, field);
 
diff --git a/src/libpakfire/digest.c b/src/libpakfire/digest.c
new file mode 100644 (file)
index 0000000..e69e9af
--- /dev/null
@@ -0,0 +1,19 @@
+/*#############################################################################
+#                                                                             #
+# Pakfire - The IPFire package management system                              #
+# Copyright (C) 2022 Pakfire development team                                 #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+#############################################################################*/
index 626a66c0b31cf83e942cacf3e3cebe422a131cfa..2fead72b0f15c1ec061ff3a24d44632ae468aa9d 100644 (file)
@@ -29,6 +29,7 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 
+#include <pakfire/digest.h>
 #include <pakfire/downloader.h>
 #include <pakfire/i18n.h>
 #include <pakfire/logging.h>
@@ -265,7 +266,7 @@ static struct pakfire_transfer* pakfire_downloader_create_transfer(
                const char* title,
                const char* url,
                const char* path,
-               enum pakfire_digests md,
+               enum pakfire_digest_types md,
                const unsigned char* expected_digest,
                const size_t expected_digest_length,
                enum pakfire_transfer_flags flags) {
@@ -413,7 +414,7 @@ int pakfire_downloader_add_transfer(
                const char* title,
                const char* url,
                const char* path,
-               enum pakfire_digests md,
+               enum pakfire_digest_types md,
                const unsigned char* expected_digest,
                const size_t expected_digest_length,
                enum pakfire_transfer_flags flags) {
@@ -897,7 +898,7 @@ int pakfire_downloader_retrieve(
                const char* title,
                const char* url,
                const char* path,
-               enum pakfire_digests md,
+               enum pakfire_digest_types md,
                const unsigned char* expected_digest,
                const size_t expected_digest_length,
                enum pakfire_transfer_flags flags) {
index eb9c0d36ff8ade16fad22829b7e9b789064e98e7..4aee3cc80cf2a7786c918a6635b88a0478ef7f07 100644 (file)
@@ -30,9 +30,9 @@
 #include <archive_entry.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
-#include <openssl/sha.h>
 
 #include <pakfire/constants.h>
+#include <pakfire/digest.h>
 #include <pakfire/file.h>
 #include <pakfire/logging.h>
 #include <pakfire/pakfire.h>
@@ -75,13 +75,7 @@ struct pakfire_file {
        char symlink[PATH_MAX];
 
        // Digests
-       struct pakfire_file_digests {
-               // SHA-512
-               unsigned char sha512[SHA512_DIGEST_LENGTH];
-
-               // SHA-256
-               unsigned char sha256[SHA256_DIGEST_LENGTH];
-       } digests;
+       struct pakfire_digests digests;
 
        // Verification Status
        int verify_status;
@@ -476,7 +470,7 @@ PAKFIRE_EXPORT void pakfire_file_set_mtime(struct pakfire_file* file, time_t tim
 }
 
 PAKFIRE_EXPORT const unsigned char* pakfire_file_get_digest(
-               struct pakfire_file* file, const enum pakfire_digests type, size_t* length) {
+               struct pakfire_file* file, const enum pakfire_digest_types type, size_t* length) {
 
        switch (type) {
                case PAKFIRE_DIGEST_SHA512:
@@ -502,7 +496,7 @@ PAKFIRE_EXPORT const unsigned char* pakfire_file_get_digest(
 }
 
 PAKFIRE_EXPORT int pakfire_file_set_digest(struct pakfire_file* file,
-               const enum pakfire_digests type, const unsigned char* digest, const size_t length) {
+               const enum pakfire_digest_types type, const unsigned char* digest, const size_t length) {
        if (!digest) {
                errno = EINVAL;
                return 1;
@@ -530,7 +524,7 @@ PAKFIRE_EXPORT int pakfire_file_set_digest(struct pakfire_file* file,
 }
 
 PAKFIRE_EXPORT char* pakfire_file_get_hexdigest(
-               struct pakfire_file* file, const enum pakfire_digests type) {
+               struct pakfire_file* file, const enum pakfire_digest_types type) {
        const unsigned char* digest = NULL;
        size_t length = 0;
 
@@ -739,7 +733,7 @@ static int pakfire_file_verify_payload(struct pakfire_file* file, const struct s
        EVP_MD_CTX* sha512_ctx = NULL;
        EVP_MD_CTX* sha256_ctx = NULL;
 
-       struct pakfire_file_digests computed_digests;
+       struct pakfire_digests computed_digests;
 
        // Nothing to do for anything that isn't a regular file
        if (!S_ISREG(st->st_mode))
index e23a2dea080a8ef78315e62e0f3f5d8a10232636..0c1d3a028cc8f7fb312b8a885078aa800661b43b 100644 (file)
@@ -25,6 +25,7 @@
 
 struct pakfire_archive;
 
+#include <pakfire/digest.h>
 #include <pakfire/filelist.h>
 #include <pakfire/package.h>
 #include <pakfire/repo.h>
@@ -59,7 +60,7 @@ int pakfire_archive_make_package(struct pakfire_archive* archive,
 int pakfire_archive_copy(struct pakfire_archive* archive, const char* path);
 
 int pakfire_archive_digest(struct pakfire_archive* archive,
-       enum pakfire_digests type, unsigned char* digest, size_t* length);
+       enum pakfire_digest_types type, unsigned char* digest, size_t* length);
 
 struct pakfire_scriptlet* pakfire_archive_get_scriptlet(
        struct pakfire_archive* archive, const char* type);
diff --git a/src/libpakfire/include/pakfire/digest.h b/src/libpakfire/include/pakfire/digest.h
new file mode 100644 (file)
index 0000000..887148e
--- /dev/null
@@ -0,0 +1,45 @@
+/*#############################################################################
+#                                                                             #
+# Pakfire - The IPFire package management system                              #
+# Copyright (C) 2022 Pakfire development team                                 #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+#############################################################################*/
+
+#ifndef PAKFIRE_DIGEST_H
+#define PAKFIRE_DIGEST_H
+
+// Pakfire knows these digests
+enum pakfire_digest_types {
+       PAKFIRE_DIGEST_SHA256 = 1,
+       PAKFIRE_DIGEST_SHA512 = 2,
+};
+
+#ifdef PAKFIRE_PRIVATE
+
+#include <openssl/sha.h>
+
+// Digests
+struct pakfire_digests {
+       // SHA-512
+       unsigned char sha512[SHA512_DIGEST_LENGTH];
+
+       // SHA-256
+       unsigned char sha256[SHA256_DIGEST_LENGTH];
+};
+
+#endif
+
+#endif /* PAKFIRE_DIGEST_H */
index e4b38659705b9214156a0e486ed474defb0327c3..f275355c89edc427ec39236dd34a193b04eb79ac 100644 (file)
@@ -26,6 +26,7 @@
 struct pakfire_downloader;
 struct pakfire_mirrorlist;
 
+#include <pakfire/digest.h>
 #include <pakfire/pakfire.h>
 
 enum pakfire_transfer_flags {
@@ -46,7 +47,7 @@ int pakfire_downloader_retrieve(
        const char* title,
        const char* url,
        const char* path,
-       enum pakfire_digests md,
+       enum pakfire_digest_types md,
        const unsigned char* expected_digest,
        const size_t expected_digest_length,
        enum pakfire_transfer_flags flags);
@@ -57,7 +58,7 @@ int pakfire_downloader_add_transfer(
        const char* title,
        const char* url,
        const char* path,
-       enum pakfire_digests md,
+       enum pakfire_digest_types md,
        const unsigned char* expected_digest,
        const size_t expected_digest_length,
        enum pakfire_transfer_flags flags);
index fa91e8c9aa31b3c7d170ed619adfd48616f9b945..1b7a89a9490d61e4be2936b53feeec6c540f67a5 100644 (file)
@@ -27,6 +27,7 @@
 
 struct pakfire_file;
 
+#include <pakfire/digest.h>
 #include <pakfire/pakfire.h>
 
 int pakfire_file_create(struct pakfire_file** file, struct pakfire* pakfire);
@@ -70,11 +71,11 @@ time_t pakfire_file_get_mtime(struct pakfire_file* file);
 void pakfire_file_set_mtime(struct pakfire_file* file, time_t time);
 
 const unsigned char* pakfire_file_get_digest(struct pakfire_file* file,
-       const enum pakfire_digests type, size_t* length);
+       const enum pakfire_digest_types type, size_t* length);
 char* pakfire_file_get_hexdigest(struct pakfire_file* file,
-       const enum pakfire_digests type);
+       const enum pakfire_digest_types type);
 int pakfire_file_set_digest(struct pakfire_file* file,
-       const enum pakfire_digests type, const unsigned char* digest, const size_t length);
+       const enum pakfire_digest_types type, const unsigned char* digest, const size_t length);
 
 struct pakfire_file* pakfire_file_parse_from_file(const char* list, unsigned int format);
 
index 728e7e7bb994f3abb3d2d086ebb81ca0b2b33f4b..3ca6cda782623f65e9568fd07a01a478b9678ad1 100644 (file)
@@ -25,6 +25,7 @@
 
 struct pakfire_package;
 
+#include <pakfire/digest.h>
 #include <pakfire/filelist.h>
 #include <pakfire/packagelist.h>
 #include <pakfire/pakfire.h>
@@ -52,13 +53,13 @@ void pakfire_package_set_arch(struct pakfire_package* pkg, const char* arch);
 const char* pakfire_package_get_uuid(struct pakfire_package* pkg);
 void pakfire_package_set_uuid(struct pakfire_package* pkg, const char* uuid);
 const unsigned char* pakfire_package_get_digest(struct pakfire_package* pkg,
-       enum pakfire_digests* type);
+       enum pakfire_digest_types* type);
 const char* pakfire_package_get_hexdigest(struct pakfire_package* pkg,
-       enum pakfire_digests* type);
+       enum pakfire_digest_types* type);
 int pakfire_package_set_digest(struct pakfire_package* pkg,
-       enum pakfire_digests type, const unsigned char* digest);
+       enum pakfire_digest_types type, const unsigned char* digest);
 int pakfire_package_set_hexdigest(struct pakfire_package* pkg,
-       enum pakfire_digests type, const char* hexdigest);
+       enum pakfire_digest_types type, const char* hexdigest);
 const char* pakfire_package_get_summary(struct pakfire_package* pkg);
 void pakfire_package_set_summary(struct pakfire_package* pkg, const char* summary);
 const char* pakfire_package_get_description(struct pakfire_package* pkg);
index b08782871e83f83ce563640f2da1c5aba84a9546..5fdd850da8e660e9da1bde2ee1efb70853001434 100644 (file)
 
 struct pakfire;
 
-enum pakfire_digests {
-       PAKFIRE_DIGEST_SHA256 = 1,
-       PAKFIRE_DIGEST_SHA512 = 2,
-};
-
 #include <pakfire/filelist.h>
 #include <pakfire/key.h>
 #include <pakfire/packagelist.h>
index b9d947ed81ff5ce19f3a2f1c106c07ecbaffe6d0..e7080dbb77fccf739d68de8e49570539fc903f8e 100644 (file)
@@ -28,6 +28,7 @@
 
 #include <archive.h>
 
+#include <pakfire/digest.h>
 #include <pakfire/pakfire.h>
 
 char* pakfire_unquote_in_place(char* s);
@@ -74,7 +75,7 @@ int pakfire_tty_is_noninteractive(void);
 
 // Digests
 
-size_t pakfire_digest_length(enum pakfire_digests digest);
+size_t pakfire_digest_length(enum pakfire_digest_types digest);
 
 // Archive Stuff
 
index 735ca0f9f47c6b6bdaf2f4b185af5f12a7656a50..85eb978e8742cf93648ad8384b500668b820b5c8 100644 (file)
@@ -35,6 +35,7 @@
 #include <pakfire/archive.h>
 #include <pakfire/constants.h>
 #include <pakfire/dependencies.h>
+#include <pakfire/digest.h>
 #include <pakfire/file.h>
 #include <pakfire/filelist.h>
 #include <pakfire/i18n.h>
@@ -395,7 +396,7 @@ PAKFIRE_EXPORT void pakfire_package_set_uuid(struct pakfire_package* pkg, const
        pakfire_package_set_string(pkg, SOLVABLE_PKGID, uuid);
 }
 
-static enum pakfire_digests pakfire_package_id2digest(Id id) {
+static enum pakfire_digest_types pakfire_package_id2digest(Id id) {
        switch (id) {
                case REPOKEY_TYPE_SHA512:
                        return PAKFIRE_DIGEST_SHA512;
@@ -408,7 +409,7 @@ static enum pakfire_digests pakfire_package_id2digest(Id id) {
 }
 
 PAKFIRE_EXPORT const unsigned char* pakfire_package_get_digest(
-               struct pakfire_package* pkg, enum pakfire_digests* type) {
+               struct pakfire_package* pkg, enum pakfire_digest_types* type) {
        Solvable* s = get_solvable(pkg);
        Id id;
 
@@ -425,7 +426,7 @@ PAKFIRE_EXPORT const unsigned char* pakfire_package_get_digest(
 }
 
 PAKFIRE_EXPORT const char* pakfire_package_get_hexdigest(
-               struct pakfire_package* pkg, enum pakfire_digests* type) {
+               struct pakfire_package* pkg, enum pakfire_digest_types* type) {
        Solvable* s = get_solvable(pkg);
        Id id;
 
@@ -442,7 +443,7 @@ PAKFIRE_EXPORT const char* pakfire_package_get_hexdigest(
 }
 
 PAKFIRE_EXPORT int pakfire_package_set_digest(struct pakfire_package* pkg,
-               enum pakfire_digests type, const unsigned char* digest) {
+               enum pakfire_digest_types type, const unsigned char* digest) {
        Solvable* s = get_solvable(pkg);
        Pool* pool = s->repo->pool;
        Id id;
@@ -480,7 +481,7 @@ ERROR:
 }
 
 PAKFIRE_EXPORT int pakfire_package_set_hexdigest(struct pakfire_package* pkg,
-               enum pakfire_digests type, const char* hexdigest) {
+               enum pakfire_digest_types type, const char* hexdigest) {
        const size_t digest_length = pakfire_digest_length(type);
 
        if (!digest_length) {
@@ -586,7 +587,7 @@ PAKFIRE_EXPORT void pakfire_package_set_maintainer(struct pakfire_package* pkg,
 static int pakfire_package_make_cache_path(struct pakfire_package* pkg) {
        const char* filename = pakfire_package_get_filename(pkg);
 
-       enum pakfire_digests digest;
+       enum pakfire_digest_types digest;
        const char* hexdigest = pakfire_package_get_hexdigest(pkg, &digest);
 
        if (hexdigest && strlen(hexdigest) >= 3)
@@ -1135,7 +1136,7 @@ PAKFIRE_EXPORT char* pakfire_package_dump(struct pakfire_package* pkg, int flags
                if (build_id)
                        pakfire_package_dump_add_line(&string, _("Build ID"), build_id);
 
-               enum pakfire_digests digest = 0;
+               enum pakfire_digest_types digest = 0;
 
                // Digest
                const char* hexdigest = pakfire_package_get_hexdigest(pkg, &digest);
index 17c19fca2f4cd3cf89600cda1d42f59a22b1ae0b..822f97cccf0e16986c42310d53215a36395ef38c 100644 (file)
@@ -102,7 +102,7 @@ static int pakfire_repo_retrieve(
                const char* title,
                const char* url,
                const char* path,
-               enum pakfire_digests md,
+               enum pakfire_digest_types md,
                const unsigned char* expected_digest,
                const size_t expected_digest_length,
                enum pakfire_transfer_flags flags) {
index 7d551e283b15b7c259c0efae156053df3f8e142b..f2f1fbce0f1c87ba289eb590df5dced959eb103f 100644 (file)
@@ -29,6 +29,7 @@
 
 #include <pakfire/archive.h>
 #include <pakfire/db.h>
+#include <pakfire/digest.h>
 #include <pakfire/downloader.h>
 #include <pakfire/file.h>
 #include <pakfire/filelist.h>
@@ -691,7 +692,7 @@ static int pakfire_transaction_verify(struct pakfire_transaction* transaction,
                return 0;
        }
 
-       enum pakfire_digests digest_type = 0;
+       enum pakfire_digest_types digest_type = 0;
 
        // Fetch digest from package
        const unsigned char* expected_digest = pakfire_package_get_digest(pkg, &digest_type);
@@ -1169,7 +1170,7 @@ static int pakfire_transaction_download_package(struct pakfire_transaction* tran
                goto ERROR;
        }
 
-       enum pakfire_digests digest_type = 0;
+       enum pakfire_digest_types digest_type = 0;
 
        // Retrieve package digest
        const unsigned char* digest = pakfire_package_get_digest(pkg, &digest_type);
index 49fbe2fec15311c55cf5ca663704d16a7b267322..a6ed6226fada12a490637836a4e1b862e91879db 100644 (file)
@@ -472,7 +472,7 @@ int pakfire_rmtree(const char* path, int flags) {
 
 // Digests
 
-size_t pakfire_digest_length(enum pakfire_digests digest) {
+size_t pakfire_digest_length(enum pakfire_digest_types digest) {
        switch (digest) {
                case PAKFIRE_DIGEST_SHA512:
                        return 64;