util: Move read_hexdigest to pakfire_unhexlify

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

diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c
index cc9ed0c2c74efa81df7da223f396ad51e061fcf7..21e496e9cdab2e0e7614b7e20ab995c08c029be6 100644 (file)
--- a/src/libpakfire/archive.c
+++ b/src/libpakfire/archive.c
@@ -330,20 +330,6 @@ ERROR:
 
 // Checksum Stuff
 
-static int read_hexdigest(unsigned char* dst, size_t l, const char* src) {
-       const char* p = src;
-
-       for (unsigned int i = 0; i < l && *p; i++) {
-               int r = sscanf(p, "%02X", (unsigned int*)&dst[i]);
-               if (r != 1)
-                       return 1;
-
-               p += 2;
-       }
-
-       return 0;
-}
-
 static int pakfire_archive_add_chksum(struct pakfire_archive* archive, const char* path,
                const unsigned char* digest_sha512, const unsigned char* digest_sha256) {
        int r = 1;

diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h
index 26ec35b668a4d9fd90e675d31b5cf981f5855d09..b14aa13f47a71b098fbc79fc5d5fbc8577765ead 100644 (file)
--- a/src/libpakfire/include/pakfire/util.h
+++ b/src/libpakfire/include/pakfire/util.h
@@ -62,6 +62,7 @@ char* pakfire_remove_trailing_newline(char* str);
 int pakfire_read_file_into_buffer(FILE* f, char** buffer, size_t* len);
 
 char* pakfire_hexlify(const char* digest, const size_t length);
+int pakfire_unhexlify(unsigned char* dst, size_t l, const char* src);
 
 #define pakfire_path_join(dest, first, second) \
        __pakfire_path_join(dest, sizeof(dest) - 1, first, second)

diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index 088c6809afe51de129f598fe6e501cf72fafef51..9fb604fc49679b7978ea45f8951fd4635809075d 100644 (file)
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -639,6 +639,20 @@ char* pakfire_hexlify(const char* digest, const size_t length) {
        return s;
 }
 
+int pakfire_unhexlify(unsigned char* dst, size_t l, const char* src) {
+       const char* p = src;
+
+       for (unsigned int i = 0; i < l && *p; i++) {
+               int r = sscanf(p, "%02X", (unsigned int*)&dst[i]);
+               if (r != 1)
+                       return 1;
+
+               p += 2;
+       }
+
+       return 0;
+}
+
 int pakfire_mkparentdir(const char* path, mode_t mode) {
        int r;