Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 7439bee
checksums: improve test suite
Baptiste Daroussin committed 4 years ago
commit 7439bee7dc9dc95c037d34d420b5edb0625651fb
parent 6a60d45
2 files changed +60 -3
modified libpkg/pkg_checksum.c
@@ -139,7 +139,7 @@ static const struct _pkg_cksum_type {
		pkg_checksum_encode_base32

	},

	[PKG_HASH_TYPE_BLAKE2S_RAW] = {
- 
		"blake2_raw",
+ 
		"blake2s_raw",

		BLAKE2S_OUTBYTES,

		pkg_checksum_hash_blake2s,

		pkg_checksum_hash_blake2s_bulk,
modified tests/lib/checksum.c
@@ -1,6 +1,5 @@
/*-
- 
 * Copyright (c) 2015 Baptiste Daroussin <bapt@FreeBSD.org>
- 
 * All rights reserved.
+ 
 * Copyright (c) 2015-2022 Baptiste Daroussin <bapt@FreeBSD.org>

 *~

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -32,12 +31,58 @@


ATF_TC(check_symlinks);

ATF_TC(check_pkg);
+ 
ATF_TC(check_types);
+ 
ATF_TC(check_validity);



ATF_TC_HEAD(check_symlinks, tc)

{

	atf_tc_set_md_var(tc, "descr", "testing checksums on symlinks");

}

ATF_TC_HEAD(check_pkg, tc) {}
+ 
ATF_TC_HEAD(check_types, tc) {}
+ 
ATF_TC_HEAD(check_validity, tc) {}
+
+ 
ATF_TC_BODY(check_validity, tc)
+ 
{
+ 
	ATF_REQUIRE_EQ(pkg_checksum_is_valid("mehe", 2), false);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_is_valid("mehe", 4), false);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_is_valid("m$he", 4), false);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_is_valid("2$166004b891d84ee8d263e4fe1ddc3be09a11a053bf8f6c3804bad6ca3248c332d", 66), false);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_is_valid("2$42$66004b891d84ee8d263e4fe1ddc3be09a11a053bf8f6c3804bad6ca3248c332d", 66), false);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_is_valid("2$1$66004b891d84ee8d263e4fe1ddc3be09a11a053bf8f6c3804bad6ca3248c332d", 66), true);
+ 
}
+
+ 
ATF_TC_BODY(check_types, tc)
+ 
{
+ 
	ATF_REQUIRE_EQ(pkg_checksum_type_from_string("sha256_base32"), PKG_HASH_TYPE_SHA256_BASE32);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_type_from_string("sha256_hex"), PKG_HASH_TYPE_SHA256_HEX);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_type_from_string("blake2_base32"), PKG_HASH_TYPE_BLAKE2_BASE32);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_type_from_string("sha256_raw"), PKG_HASH_TYPE_SHA256_RAW);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_type_from_string("blake2_raw"), PKG_HASH_TYPE_BLAKE2_RAW);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_type_from_string("blake2s_base32"), PKG_HASH_TYPE_BLAKE2S_BASE32);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_type_from_string("blake2s_raw"), PKG_HASH_TYPE_BLAKE2S_RAW);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_type_from_string("plop"), PKG_HASH_TYPE_UNKNOWN);
+
+ 
	ATF_REQUIRE_EQ(pkg_checksum_get_type("0$0$", 0), PKG_HASH_TYPE_SHA256_BASE32);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_get_type("0$1$", 0), PKG_HASH_TYPE_SHA256_HEX);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_get_type("0$2$", 0), PKG_HASH_TYPE_BLAKE2_BASE32);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_get_type("0$3$", 0), PKG_HASH_TYPE_SHA256_RAW);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_get_type("0$4$", 0), PKG_HASH_TYPE_BLAKE2_RAW);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_get_type("0$5$", 0), PKG_HASH_TYPE_BLAKE2S_BASE32);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_get_type("0$6$", 0), PKG_HASH_TYPE_BLAKE2S_RAW);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_get_type("0$42$", 0), PKG_HASH_TYPE_UNKNOWN);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_get_type("", 0), PKG_HASH_TYPE_UNKNOWN);
+
+ 
	ATF_REQUIRE_EQ(pkg_checksum_file_get_type("0$", 0), PKG_HASH_TYPE_SHA256_BASE32);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_file_get_type("1$", 0), PKG_HASH_TYPE_SHA256_HEX);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_file_get_type("2$", 0), PKG_HASH_TYPE_BLAKE2_BASE32);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_file_get_type("3$", 0), PKG_HASH_TYPE_SHA256_RAW);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_file_get_type("4$", 0), PKG_HASH_TYPE_BLAKE2_RAW);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_file_get_type("5$", 0), PKG_HASH_TYPE_BLAKE2S_BASE32);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_file_get_type("6$", 0), PKG_HASH_TYPE_BLAKE2S_RAW);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_file_get_type("42$", 0), PKG_HASH_TYPE_UNKNOWN);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_file_get_type("", 0), PKG_HASH_TYPE_UNKNOWN);
+ 
}



ATF_TC_BODY(check_symlinks, tc)

{
@@ -97,6 +142,13 @@ ATF_TC_BODY(check_files, tc)
	ATF_CHECK(pkg_checksum_validate_fileat(AT_FDCWD, "foo", "7d865e959b2466918c9863afca942d0fb89d7c9ac0c99bafc3749504ded97730") == 0);

	free(sum);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_generate_fileat(AT_FDCWD, "nonexistent", PKG_HASH_TYPE_BLAKE2_BASE32), NULL);
+
+ 
	ATF_REQUIRE_EQ(pkg_checksum_symlinkat(AT_FDCWD, "nonexistent", PKG_HASH_TYPE_BLAKE2_BASE32), NULL);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_file("nonexistent", 42), NULL);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_data("a", 1, 42), NULL);
+ 
	ATF_REQUIRE_STREQ(pkg_checksum_data("a", 0, PKG_HASH_TYPE_BLAKE2_BASE32), "u3xsc8fhkf9ntjikcz3hcsg1h5n59yqmz8s483emc8gessm4qnpk7ikhgqcmmz98ci391sdx565bazeffh1djkzkep7j1qqgeawsc6y");
+ 


	sum = pkg_checksum_file("foo", PKG_HASH_TYPE_BLAKE2_BASE32);

	ATF_REQUIRE_STREQ(sum, "gf8mcrnmm6p6hg6wa9xkfb98zo8g6nxu8z4q7s93boz8hzf5ogrsr4qgpsb7utd6speio3op18ocyrsa9ms8jj15byttiq7ofbih8gn");

	free(sum);
@@ -116,6 +168,9 @@ ATF_TC_BODY(check_pkg, tc)
	pkg_set(p, PKG_ARCH, "*");

	char *sum = xcalloc(pkg_checksum_type_size(PKG_HASH_TYPE_SHA256_HEX) * 2, sizeof(char));
+ 
	ATF_REQUIRE_EQ(pkg_checksum_generate(NULL, sum, pkg_checksum_type_size(PKG_HASH_TYPE_SHA256_HEX) * 2, PKG_HASH_TYPE_SHA256_HEX, false, false, false), EPKG_FATAL);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_generate(p, sum, pkg_checksum_type_size(PKG_HASH_TYPE_SHA256_HEX) * 2, 42, false, false, false), EPKG_FATAL);
+ 
	ATF_REQUIRE_EQ(pkg_checksum_generate(p, sum, 2, PKG_HASH_TYPE_SHA256_HEX, false, false, false), EPKG_FATAL);

	ATF_CHECK(pkg_checksum_generate(p, sum, pkg_checksum_type_size(PKG_HASH_TYPE_SHA256_HEX) * 2, PKG_HASH_TYPE_SHA256_HEX, false, false, false) == EPKG_OK);

	ATF_REQUIRE_STREQ(sum, "2$1$22c6baf7d22b7035be18ffe04f43717f907f4848b3d5d72bfc44bb8435053ea4");

	ATF_REQUIRE_EQ(pkg_checksum_get_type(sum, -1), PKG_HASH_TYPE_SHA256_HEX);
@@ -139,6 +194,8 @@ ATF_TP_ADD_TCS(tp)
	ATF_TP_ADD_TC(tp, check_symlinks);

	ATF_TP_ADD_TC(tp, check_files);

	ATF_TP_ADD_TC(tp, check_pkg);
+ 
	ATF_TP_ADD_TC(tp, check_types);
+ 
	ATF_TP_ADD_TC(tp, check_validity);



	return (atf_no_error());

}