security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

gpg: Obsolete some keyserver helper options.

Browse source 
* g10/options.h (opt): Remove keyserver_options.other.
* g10/gpg.c (main): Obsolete option --honor-http-proxt.
* g10/keyserver.c (add_canonical_option): Replace by ...
(warn_kshelper_option): New.
(parse_keyserver_uri): Obsolete "x-broken-http".
--

Some of these options are deprecated for 10 years and they do not make
any sense without the keyserver helpers.  For one we print a hint on
how to replace it:

  gpg: keyserver option 'ca-cert-file' is obsolete; \
  please use 'hkp-cacert' in dirmngr.conf

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2014-12-08 15:14:35 +01:00
parent cdc404fe52
commit 5bf93f4ea7
3 changed files with 22 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

42
g10/keyserver.c
View file

@ -124,26 +124,23 @@ static gpg_error_t keyserver_put (ctrl_t ctrl, strlist_t keyspecs,
static size_t max_cert_size=DEFAULT_MAX_CERT_SIZE;
static void
add_canonical_option(char *option,strlist_t *list)
warn_kshelper_option(char *option)
{
char *arg=argsplit(option);
char *p;
if(arg)
{
char *joined;
if ((p=strchr (option, '=')))
*p = 0;
joined=xmalloc(strlen(option)+1+strlen(arg)+1);
/* Make a canonical name=value form with no spaces */
strcpy(joined,option);
strcat(joined,"=");
strcat(joined,arg);
append_to_strlist(list,joined);
xfree(joined);
}
else
append_to_strlist(list,option);
if (!strcmp (option, "ca-cert-file"))
log_info ("keyserver option '%s' is obsolete; please use "
"'%s' in dirmngr.conf\n",
"ca-cert-file", "hkp-cacert");
else if (!strcmp (option, "check-cert")
|| !strcmp (option, "broken-http-proxy"))
log_info ("keyserver option '%s' is obsolete\n", option);
}
int
parse_keyserver_options(char *options)
{
@ -190,9 +187,9 @@ parse_keyserver_options(char *options)
&& !parse_export_options(tok,
&opt.keyserver_options.export_options,0))
{
/* All of the standard options have failed, so the option is
destined for a keyserver plugin. */
add_canonical_option(tok,&opt.keyserver_options.other);
/* All of the standard options have failed, so the option was
destined for a keyserver plugin as used by GnuPG < 2.1 */
warn_kshelper_option (tok);
}
}
@ -285,7 +282,7 @@ parse_keyserver_uri (const char *string,int require_scheme,
options++;
while((tok=optsep(&options)))
add_canonical_option(tok,&keyserver->options);
warn_kshelper_option (tok);
}
/* Get the scheme */
@ -344,11 +341,8 @@ parse_keyserver_uri (const char *string,int require_scheme,
if(ascii_strcasecmp(keyserver->scheme,"x-broken-hkp")==0)
{
deprecated_warning(configname,configlineno,"x-broken-hkp",
"--keyserver-options ","broken-http-proxy");
xfree(keyserver->scheme);
keyserver->scheme=xstrdup("hkp");
append_to_strlist(&opt.keyserver_options.other,"broken-http-proxy");
log_info ("keyserver option '%s' is obsolete\n",
"x-broken-hkp");
}
else if(ascii_strcasecmp(keyserver->scheme,"x-hkp")==0)
{