From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 13 Jul 2021 13:24:15 +0000 (+0000)
Subject: util: Move read_hexdigest to pakfire_unhexlify
X-Git-Tag: 0.9.28~1030
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bfcf741b5376fff3cdfd56399b36068d67b97a6;p=pakfire.git

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 cc9ed0c2c..21e496e9c 100644
--- 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 26ec35b66..b14aa13f4 100644
--- 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 088c6809a..9fb604fc4 100644
--- 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;