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

lib: remove xhp argument from xbps_pubkey2fp

Browse Source
This commit is contained in:
Duncan Overbruck
2022-12-24 14:07:10 +01:00
parent 9efba6749f
commit d962eaaf3c
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pubkey2fp.c
View File

@@ -63,7 +63,7 @@ fp2str(unsigned const char *fp, unsigned int len)
}
char *
xbps_pubkey2fp(struct xbps_handle *xhp, xbps_data_t pubkey)
xbps_pubkey2fp(xbps_data_t pubkey)
{
EVP_MD_CTX *mdctx = NULL;
EVP_PKEY *pPubKey = NULL;

6
lib/repo.c
View File

@@ -655,7 +655,11 @@ xbps_repo_key_import(struct xbps_repo *repo)
rv = EINVAL;
goto out;
}
hexfp = xbps_pubkey2fp(repo->xhp, pubkey);
hexfp = xbps_pubkey2fp(pubkey);
if (hexfp == NULL) {
rv = EINVAL;
goto out;
}
/*
* Check if the public key is alredy stored.
*/

3
lib/verifysig.c
View File

@@ -87,8 +87,7 @@ xbps_verify_signature(struct xbps_repo *repo, const char *sigfile,
xbps_dbg_printf("%s: unsigned repository\n", repo->uri);
return false;
}
hexfp = xbps_pubkey2fp(repo->xhp,
xbps_dictionary_get(repo->idxmeta, "public-key"));
hexfp = xbps_pubkey2fp(xbps_dictionary_get(repo->idxmeta, "public-key"));
if (hexfp == NULL) {
xbps_dbg_printf("%s: incomplete signed repo, missing hexfp obj\n", repo->uri);
return false;