mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
da1990bac7
* g10/options.h (KEYSERVER_HTTP_PROXY): New. (KEYSERVER_USE_TEMP_FILES, KEYSERVER_KEEP_TEMP_FILES): Remove. (KEYSERVER_TIMEOUT): New. * common/keyserver.h (KEYSERVER_TIMEOUT): Remove. * g10/keyserver.c (keyserver_opts): Remove obsolete "use-temp-files" and "keep-temp-files". Add "http-proxy" and "timeout". (parse_keyserver_options): Remove 1.2 compatibility option "honor-http_proxy". Remove "use-temp-files" and "keep-temp-files" code. -- Note that many of these options where implicitly used by passing any unknown option down to the former keyserver helpers. The don't exist anymore thus we need to make them explicit. Another patch will convey them to dirmngr. Temp files are not anymore used thus they can be removed and will be ignored when used. Signed-off-by: Werner Koch <wk@gnupg.org>
64 lines
2.2 KiB
C
64 lines
2.2 KiB
C
/* keyserver.h - Public definitions for gpg keyserver helpers.
|
|
* Copyright (C) 2001, 2002, 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_COMMON_KEYSERVER_H
|
|
#define GNUPG_COMMON_KEYSERVER_H
|
|
|
|
#define KEYSERVER_PROTO_VERSION 1
|
|
|
|
/* These are usable for return codes for the gpgkeys_ process, and
|
|
also KEY FAILED codes. */
|
|
#define KEYSERVER_OK 0 /* not an error */
|
|
#define KEYSERVER_INTERNAL_ERROR 1 /* gpgkeys_ internal error */
|
|
#define KEYSERVER_NOT_SUPPORTED 2 /* operation not supported */
|
|
#define KEYSERVER_VERSION_ERROR 3 /* VERSION mismatch */
|
|
#define KEYSERVER_GENERAL_ERROR 4 /* keyserver internal error */
|
|
#define KEYSERVER_NO_MEMORY 5 /* out of memory */
|
|
#define KEYSERVER_KEY_NOT_FOUND 6 /* key not found */
|
|
#define KEYSERVER_KEY_EXISTS 7 /* key already exists */
|
|
#define KEYSERVER_KEY_INCOMPLETE 8 /* key incomplete (EOF) */
|
|
#define KEYSERVER_UNREACHABLE 9 /* unable to contact keyserver */
|
|
|
|
/* Must be 127 due to shell internal magic. */
|
|
#define KEYSERVER_SCHEME_NOT_FOUND 127
|
|
|
|
/* Object to hold information pertaining to a keyserver; it further
|
|
allows to build a list of keyservers. Note that g10/options.h has
|
|
a typedef for this. FIXME: We should make use of the
|
|
parse_uri_t. */
|
|
struct keyserver_spec
|
|
{
|
|
struct keyserver_spec *next;
|
|
char *uri;
|
|
char *scheme;
|
|
char *auth;
|
|
char *host;
|
|
char *port;
|
|
char *path;
|
|
char *opaque;
|
|
strlist_t options;
|
|
struct
|
|
{
|
|
unsigned int direct_uri:1;
|
|
} flags;
|
|
};
|
|
|
|
|
|
#endif /*GNUPG_COMMON_KEYSERVER_H*/
|