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
No known key found for this signature in database
GPG Key ID: 335C1D17EC3D6E35
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/xbps-query/list.c
View File

@ -197,7 +197,7 @@ repo_list_uri(struct xbps_repo *repo)
xbps_dictionary_get_uint16(repo->idxmeta, "public-key-size", &pubkeysize); xbps_dictionary_get_uint16(repo->idxmeta, "public-key-size", &pubkeysize);
pubkey = xbps_dictionary_get(repo->idxmeta, "public-key"); pubkey = xbps_dictionary_get(repo->idxmeta, "public-key");
if (pubkey) if (pubkey)
hexfp = xbps_pubkey2fp(repo->xhp, pubkey); hexfp = xbps_pubkey2fp(pubkey);
if (signedby) if (signedby)
printf(" Signed-by: %s\n", signedby); printf(" Signed-by: %s\n", signedby);
if (pubkeysize && hexfp) if (pubkeysize && hexfp)

3
include/xbps.h.in
View File

@ -2245,13 +2245,12 @@ int xbps_cmpver(const char *pkg1, const char *pkg2);
/** /**
* Converts a RSA public key in PEM format to a hex fingerprint. * Converts a RSA public key in PEM format to a hex fingerprint.
* *
* @param[in] xhp The pointer to an xbps_handle struct.
* @param[in] pubkey The public-key in PEM format as xbps_data_t. * @param[in] pubkey The public-key in PEM format as xbps_data_t.
* *
* @return The OpenSSH fingerprint in hexadecimal. * @return The OpenSSH fingerprint in hexadecimal.
* The returned buffer must be free(3)d when necessary. * The returned buffer must be free(3)d when necessary.
*/ */
char *xbps_pubkey2fp(struct xbps_handle *xhp, xbps_data_t pubkey); char *xbps_pubkey2fp(xbps_data_t pubkey);
/** /**
* Returns a buffer with a sanitized path from \a src. * Returns a buffer with a sanitized path from \a src.

2
lib/pubkey2fp.c
View File

@ -63,7 +63,7 @@ fp2str(unsigned const char *fp, unsigned int len)
} }
char * char *
xbps_pubkey2fp(struct xbps_handle *xhp, xbps_data_t pubkey) xbps_pubkey2fp(xbps_data_t pubkey)
{ {
EVP_MD_CTX *mdctx = NULL; EVP_MD_CTX *mdctx = NULL;
EVP_PKEY *pPubKey = 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; rv = EINVAL;
goto out; 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. * 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); xbps_dbg_printf("%s: unsigned repository\n", repo->uri);
return false; return false;
} }
hexfp = xbps_pubkey2fp(repo->xhp, hexfp = xbps_pubkey2fp(xbps_dictionary_get(repo->idxmeta, "public-key"));
xbps_dictionary_get(repo->idxmeta, "public-key"));
if (hexfp == NULL) { if (hexfp == NULL) {
xbps_dbg_printf("%s: incomplete signed repo, missing hexfp obj\n", repo->uri); xbps_dbg_printf("%s: incomplete signed repo, missing hexfp obj\n", repo->uri);
return false; return false;