cd3a0a0 Add pubkey definition in meta. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Add pubkey definition in meta.

Vsevolod Stakhov committed 12 years ago

commit cd3a0a05408703eb144a7cc43112b4d413ad7fa6
parent df83f86

2 files changed +10 -0

modified libpkg/pkg_repo_meta.c

@@ -44,6 +44,8 @@ pkg_repo_meta_set_default(struct pkg_repo_meta *meta)

 	meta->digests = strdup("digests");
 	/* Not using fulldb */
 	meta->fulldb = NULL;
 	meta->pubkey_format = strdup("rsa");
 }
 void

@@ -82,6 +84,8 @@ pkg_repo_meta_open_schema_v1()

 			"source_identifier = {type = string};\n"
 			"revision = {type = integer};\n"
 			"eol = {type = integer};\n"
 			"pubkey = {type = string};\n"
 			"pubkey_type = {enum = [rsa]};\n"
 			"}\n"
 			"required = [version]\n"
 			"}";

@@ -136,6 +140,9 @@ pkg_repo_meta_parse(ucl_object_t *top, struct pkg_repo_meta **target, int versio

 	META_EXTRACT_STRING(manifests);
 	META_EXTRACT_STRING(fulldb);
 	META_EXTRACT_STRING(pubkey);
 	META_EXTRACT_STRING(pubkey_format);
 	META_EXTRACT_STRING(source_identifier);
 	obj = ucl_object_find_key(top, "eol");

modified libpkg/private/pkg.h

@@ -282,6 +282,9 @@ struct pkg_repo_meta {

 	char *source_identifier;
 	int64_t revision;
 	char *pubkey;
 	char *pubkey_format; /* TODO: should be enumeration */
 	time_t eol;
 };