Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Add blacke2_hex checksums
Baptiste Daroussin committed 9 years ago
commit 0fb246e402b12f1a016e12688bf4df4a45e21d96
parent 1173234
3 files changed +17 -0
modified libpkg/pkg_checksum.c
@@ -123,6 +123,14 @@ static const struct _pkg_cksum_type {
		pkg_checksum_hash_blake2_file,
		NULL
	},
+
	[PKG_HASH_TYPE_BLAKE2_HEX] = {
+
		"blake2_hex",
+
		PKG_CHECKSUM_BLAKE2_LEN,
+
		pkg_checksum_hash_blake2,
+
		pkg_checksum_hash_blake2_bulk,
+
		pkg_checksum_hash_blake2_file,
+
		pkg_checksum_encode_hex
+
	},
	[PKG_HASH_TYPE_UNKNOWN] = {
		NULL,
		-1,
modified libpkg/private/pkg.h
@@ -401,6 +401,7 @@ typedef enum pkg_checksum_type_e {
	PKG_HASH_TYPE_BLAKE2_BASE32,
	PKG_HASH_TYPE_SHA256_RAW,
	PKG_HASH_TYPE_BLAKE2_RAW,
+
	PKG_HASH_TYPE_BLAKE2_HEX,
	PKG_HASH_TYPE_UNKNOWN
} pkg_checksum_type_t;

modified tests/lib/checksum.c
@@ -53,10 +53,18 @@ ATF_TC_BODY(check_symlinks, tc)
	ATF_REQUIRE_STREQ(sum, "1$2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae");
	free(sum);

+
	sum = pkg_checksum_generate_file("bar", PKG_HASH_TYPE_SHA256_BASE32);
+
	ATF_REQUIRE_STREQ(sum, "0$ctje5ibp9zt9ahxufnx4barew3rrwsyqr5y9mog9kwzoet3c8zmb");
+
	free(sum);
+

	sum = pkg_checksum_generate_file("bar", PKG_HASH_TYPE_BLAKE2_BASE32);
	ATF_REQUIRE_STREQ(sum, "2$kgygnaah7wxsgn1wkuic4j78zq8dicmx53picmma99ogmkbd7k5nhuxr5xxemz6yzjab15oor3tjt7nupj8mh764y7kddbne7qw9agn");
	free(sum);

+
	sum = pkg_checksum_generate_file("bar", PKG_HASH_TYPE_BLAKE2_HEX);
+
	ATF_REQUIRE_STREQ(sum, "5$kgygnaah7wxsgn1wkuic4j78zq8dicmx53picmma99ogmkbd7k5nhuxr5xxemz6yzjab15oor3tjt7nupj8mh764y7kddbne7qw9agn");
+
	free(sum);
+

	ATF_CHECK(pkg_checksum_validate_file("bar", "2$kgygnaah7wxsgn1wkuic4j78zq8dicmx53picmma99ogmkbd7k5nhuxr5xxemz6yzjab15oor3tjt7nupj8mh764y7kddbne7qw9agn") == 0);
	ATF_CHECK(pkg_checksum_validate_file("bar", "1$2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae") == 0);
}