From 45b6d36cf7f228190dc3d20952d1e001c91bd12d Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Mon, 29 Oct 2012 20:51:04 +1000 Subject: Make key_in_keychain available in library In preparation for checking key presence and downloading needed keys before conflict checking. Signed-off-by: Allan McRae --- lib/libalpm/signing.c | 7 ++++--- lib/libalpm/signing.h | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index ec9aa99b..883d62d0 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -185,7 +185,7 @@ error: * @param fpr the fingerprint key ID to look up * @return 1 if key is known, 0 if key is unknown, -1 on error */ -static int key_in_keychain(alpm_handle_t *handle, const char *fpr) +int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr) { gpgme_error_t err; gpgme_ctx_t ctx; @@ -633,10 +633,11 @@ error: } #else /* HAVE_LIBGPGME */ -static int key_in_keychain(alpm_handle_t UNUSED *handle, const char UNUSED *fpr) +int _alpm_key_in_keychain(alpm_handle_t UNUSED *handle, const char UNUSED *fpr) { return -1; } + int _alpm_gpgme_checksig(alpm_handle_t UNUSED *handle, const char UNUSED *path, const char UNUSED *base64_sig, alpm_siglist_t UNUSED *siglist) { @@ -812,7 +813,7 @@ int _alpm_process_siglist(alpm_handle_t *handle, const char *identifier, case ALPM_SIGSTATUS_KEY_UNKNOWN: /* ensure this key is still actually unknown; we may have imported it * on an earlier call to this function. */ - if(key_in_keychain(handle, result->key.fingerprint) == 1) { + if(_alpm_key_in_keychain(handle, result->key.fingerprint) == 1) { break; } _alpm_log(handle, ALPM_LOG_ERROR, diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index da3e01bd..a07eca6e 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -31,6 +31,8 @@ int _alpm_check_pgp_helper(alpm_handle_t *handle, const char *path, int _alpm_process_siglist(alpm_handle_t *handle, const char *identifier, alpm_siglist_t *siglist, int optional, int marginal, int unknown); +int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr); + #endif /* _ALPM_SIGNING_H */ /* vim: set ts=2 sw=2 noet: */ -- cgit v1.2.3-70-g09d2