mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-09 23:39:51 +02:00
ae471fa978
* g10/keyserver.c (keyserver_refresh): Change return type to gpg_error_t. Use gpg_dirmngr_ks_list to print the name of the keyserver to use. (keyserver_search): Do not print the "no keyserver" error message. The same error is anyway returned from dirmngr. * g10/call-dirmngr.c (ks_status_parm_s): Add field "keyword". (ks_status_cb): Handle other status keywords. (gpg_dirmngr_ks_list): New. * tools/gpgconf-comp.c (gc_options_gpg): Deprecate "keyserver". (gc_options_dirmngr): Add "Keyserver" group and "keyserver". -- Along with the corresponding dirmngr change this option allows to configure the keyserver only in dirmngr.conf. Existing configurations will continue to work. However, GUIs using gpgconf now the keyserver option under the dirmngr (aka Key Acquirer) tab unless they are in export mode in which the keyserver option is also show for gpg. Signed-off-by: Werner Koch <wk@gnupg.org>
46 lines
2.1 KiB
C
46 lines
2.1 KiB
C
/* call-dirmngr.h - GPG operations to the Dirmngr
|
|
* Copyright (C) 2011 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef GNUPG_G10_CALL_DIRMNGR_H
|
|
#define GNUPG_G10_CALL_DIRMNGR_H
|
|
|
|
void gpg_dirmngr_deinit_session_data (ctrl_t ctrl);
|
|
|
|
gpg_error_t gpg_dirmngr_ks_list (ctrl_t ctrl, char **r_keyserver);
|
|
gpg_error_t gpg_dirmngr_ks_search (ctrl_t ctrl, const char *searchstr,
|
|
gpg_error_t (*cb)(void*, int, char *),
|
|
void *cb_value);
|
|
gpg_error_t gpg_dirmngr_ks_get (ctrl_t ctrl, char *pattern[],
|
|
keyserver_spec_t override_keyserver,
|
|
estream_t *r_fp, char **r_source);
|
|
gpg_error_t gpg_dirmngr_ks_fetch (ctrl_t ctrl,
|
|
const char *url, estream_t *r_fp);
|
|
gpg_error_t gpg_dirmngr_ks_put (ctrl_t ctrl, void *data, size_t datalen,
|
|
kbnode_t keyblock);
|
|
gpg_error_t gpg_dirmngr_dns_cert (ctrl_t ctrl,
|
|
const char *name, const char *certtype,
|
|
estream_t *r_key,
|
|
unsigned char **r_fpr, size_t *r_fprlen,
|
|
char **r_url);
|
|
gpg_error_t gpg_dirmngr_get_pka (ctrl_t ctrl, const char *userid,
|
|
unsigned char **r_fpr, size_t *r_fprlen,
|
|
char **r_url);
|
|
|
|
|
|
#endif /*GNUPG_G10_CALL_DIRMNGR_H*/
|