digests: Move pakfire_digest_length() from util

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/libpakfire/digest.c b/src/libpakfire/digest.c
index 02cee06e93c284f0f8390fce21d49ef0578252ac..2eb12818f9f0fc42f5cc68fb400a88438a4a4969 100644 (file)
--- a/src/libpakfire/digest.c
+++ b/src/libpakfire/digest.c
@@ -29,6 +29,36 @@
 #include <pakfire/pakfire.h>
 #include <pakfire/private.h>
 
+size_t pakfire_digest_length(const enum pakfire_digest_types digest) {
+       switch (digest) {
+               case PAKFIRE_DIGEST_SHA512:
+                       return 64;
+
+               case PAKFIRE_DIGEST_SHA256:
+                       return 32;
+
+               case PAKFIRE_DIGEST_UNDEFINED:
+                       return 0;
+       }
+
+       return 0;
+}
+
+static int pakfire_digests_check_length(struct pakfire* pakfire,
+               const enum pakfire_digest_types type, const size_t length) {
+       const size_t l = pakfire_digest_length(type);
+
+       // Return if length matches
+       if (length == l)
+               return 0;
+
+       // Otherwise set an error
+       ERROR(pakfire, "Digest is of an unexpected length\n");
+       errno = ENOMSG;
+
+       return 1;
+}
+
 static EVP_MD_CTX* __pakfire_digest_setup(struct pakfire* pakfire, const EVP_MD* md) {
        EVP_MD_CTX* ctx = NULL;
        int r;

diff --git a/src/libpakfire/include/pakfire/digest.h b/src/libpakfire/include/pakfire/digest.h
index df6a3b44652eba0b1a036682d5e765012ca86cba..1baee3be63de3150c2eee65a6b355bcb9766838d 100644 (file)
--- a/src/libpakfire/include/pakfire/digest.h
+++ b/src/libpakfire/include/pakfire/digest.h
@@ -45,6 +45,8 @@ struct pakfire_digests {
        unsigned char sha256[SHA256_DIGEST_LENGTH];
 };
 
+size_t pakfire_digest_length(const enum pakfire_digest_types digest);
+
 int pakfire_digests_compute_from_file(struct pakfire* pakfire,
        struct pakfire_digests* digests, int flags, FILE* f);
 

diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h
index e7080dbb77fccf739d68de8e49570539fc903f8e..97d514ed2b335897c6ca341e53d30f1f207f4896 100644 (file)
--- a/src/libpakfire/include/pakfire/util.h
+++ b/src/libpakfire/include/pakfire/util.h
@@ -73,10 +73,6 @@ char* pakfire_generate_uuid(void);
 
 int pakfire_tty_is_noninteractive(void);
 
-// Digests
-
-size_t pakfire_digest_length(enum pakfire_digest_types digest);
-
 // Archive Stuff
 
 int pakfire_archive_copy_data(struct pakfire* pakfire,

diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index 569de67cc7050168661fe0dcb17fb9c3a0180efd..640e027258832c7422fda247e58fb532cae03c08 100644 (file)
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -470,23 +470,6 @@ int pakfire_rmtree(const char* path, int flags) {
        return r;
 }
 
-// Digests
-
-size_t pakfire_digest_length(enum pakfire_digest_types digest) {
-       switch (digest) {
-               case PAKFIRE_DIGEST_SHA512:
-                       return 64;
-
-               case PAKFIRE_DIGEST_SHA256:
-                       return 32;
-
-               case PAKFIRE_DIGEST_UNDEFINED:
-                       return 0;
-       }
-
-       return 0;
-}
-
 // Archive Stuff
 
 int pakfire_archive_copy_data(struct pakfire* pakfire,