emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Don't assume repodata is signed when has index-meta.plist"

Browse Source 
This reverts commit 4e3d4d2287.
This commit is contained in:
Juan RP
2020-01-06 14:45:57 +01:00
parent 68113a8fc0
commit 2884fc3ab7
3 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/repo.c
View File

@ -619,7 +619,6 @@ xbps_repo_key_import(struct xbps_repo *repo)
char *hexfp = NULL;
char *p, *dbkeyd, *rkeyfile = NULL;
int import, rv = 0;
bool has_signedby, has_pubkey_size, has_pubkey;
assert(repo);
/*
@ -640,18 +639,8 @@ xbps_repo_key_import(struct xbps_repo *repo)
xbps_dictionary_get_uint16(repo->idxmeta, "public-key-size", &pubkey_size);
pubkey = xbps_dictionary_get(repo->idxmeta, "public-key");
has_signedby = (signedby != NULL);
has_pubkey_size = (pubkey_size > 0);
has_pubkey = (xbps_object_type(pubkey) == XBPS_TYPE_DATA);
if (!has_signedby && !has_pubkey_size && !has_pubkey)
{
xbps_dbg_printf(repo->xhp,
"[repo] `%s' unsigned repository with meta!\n", repo->uri);
return 0;
}
else if (!has_signedby || !has_pubkey_size || !has_pubkey)
{
if (signedby == NULL || pubkey_size == 0 ||
xbps_object_type(pubkey) != XBPS_TYPE_DATA) {
xbps_dbg_printf(repo->xhp,
"[repo] `%s': incomplete signed repository "
"(missing objs)\n", repo->uri);