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

Revert "Read also unsigned index-meta"

Browse Source 
This reverts commit 61ef5c3f8aab5da3c64631f283a26abd2ac7b4b7.
This commit is contained in:
Juan RP 2020-01-06 14:50:32 +01:00
parent 8b2c62adfc
commit e04cb2fa24
No known key found for this signature in database
GPG Key ID: AF19F6CB482F9368
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/repo.c
View File

@ -78,11 +78,11 @@ repo_get_dict(struct xbps_repo *repo)
return NULL; return NULL;
} }
dict = xbps_archive_get_dictionary(repo->ar, entry, &bytes); dict = xbps_archive_get_dictionary(repo->ar, entry, &bytes);
if (verified != NULL && idxmeta = (repo->idxmeta != NULL) ? repo->idxmeta : dict;
bytes != NULL && if (verified != NULL && bytes != NULL) {
(digest = xbps_buffer_hash_raw(bytes, strlen(bytes))) != NULL && digest = xbps_buffer_hash_raw(bytes, strlen(bytes));
repo_verify_index(repo, digest)) *verified = repo_verify_index(repo, idxmeta, digest);
*verified = true; }
free(digest); free(digest);
free(bytes); free(bytes);
return dict; return dict;
@ -179,7 +179,6 @@ repo_open_local(struct xbps_repo *repo, const char *repofile)
repo->is_signed = true; repo->is_signed = true;
xbps_dictionary_make_immutable(repo->idxmeta); xbps_dictionary_make_immutable(repo->idxmeta);
} }
repo->idxmeta = idxmeta;
return true; return true;
} }