mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-17 00:39:50 +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>
54 lines
2.4 KiB
C
54 lines
2.4 KiB
C
/* keyserver-internal.h - Keyserver internals
|
|
* Copyright (C) 2001, 2002, 2004, 2005, 2006 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 _KEYSERVER_INTERNAL_H_
|
|
#define _KEYSERVER_INTERNAL_H_
|
|
|
|
#include <time.h>
|
|
#include "../common/keyserver.h"
|
|
#include "../common/iobuf.h"
|
|
#include "types.h"
|
|
|
|
int parse_keyserver_options(char *options);
|
|
void free_keyserver_spec(struct keyserver_spec *keyserver);
|
|
struct keyserver_spec *keyserver_match(struct keyserver_spec *spec);
|
|
struct keyserver_spec *parse_keyserver_uri (const char *string,
|
|
int require_scheme);
|
|
struct keyserver_spec *parse_preferred_keyserver(PKT_signature *sig);
|
|
int keyserver_export (ctrl_t ctrl, strlist_t users);
|
|
int keyserver_import (ctrl_t ctrl, strlist_t users);
|
|
int keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
|
|
struct keyserver_spec *keyserver);
|
|
int keyserver_import_keyid (ctrl_t ctrl, u32 *keyid,
|
|
struct keyserver_spec *keyserver);
|
|
gpg_error_t keyserver_refresh (ctrl_t ctrl, strlist_t users);
|
|
gpg_error_t keyserver_search (ctrl_t ctrl, strlist_t tokens);
|
|
int keyserver_fetch (ctrl_t ctrl, strlist_t urilist);
|
|
int keyserver_import_cert (ctrl_t ctrl, const char *name,
|
|
unsigned char **fpr,size_t *fpr_len);
|
|
gpg_error_t keyserver_import_pka (ctrl_t ctrl, const char *name,
|
|
unsigned char **fpr,size_t *fpr_len);
|
|
int keyserver_import_name (ctrl_t ctrl,
|
|
const char *name,unsigned char **fpr,size_t *fpr_len,
|
|
struct keyserver_spec *keyserver);
|
|
int keyserver_import_ldap (ctrl_t ctrl, const char *name,
|
|
unsigned char **fpr,size_t *fpr_len);
|
|
|
|
#endif /* !_KEYSERVER_INTERNAL_H_ */
|