security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

dirmngr: Do tilde expansion for --hkp-cacert.

Browse Source 
* dirmngr/dirmngr.c (parse_rereadable_options): Do tilde expansion and
check for cert file existance in option --hkp-cacert.
--

GnuPG-bug-id: 2120
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-10-06 13:10:26 +02:00
parent 625e292108
commit 9db6547a00
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dirmngr/dirmngr.c
View File

@ -580,7 +580,20 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
case oMaxReplies: opt.max_replies = pargs->r.ret_int; break; case oMaxReplies: opt.max_replies = pargs->r.ret_int; break;
case oHkpCaCert: case oHkpCaCert:
http_register_tls_ca (pargs->r.ret_str); {
char *tmpname;
/* Do tilde expansion and print a warning if the file can't be
accessed. */
tmpname = make_absfilename_try (pargs->r.ret_str, NULL);
if (!tmpname || access (tmpname, F_OK))
log_info (_("can't access '%s': %s\n"),
tmpname? tmpname : pargs->r.ret_str,
gpg_strerror (gpg_error_from_syserror()));
else
http_register_tls_ca (tmpname);
xfree (tmpname);
}
break; break;
case oIgnoreCertExtension: case oIgnoreCertExtension:

2
doc/dirmngr.texi
View File

@ -433,7 +433,7 @@ Use the root certificates in @var{file} for verification of the TLS
certificates used with @code{hkps} (keyserver access over TLS). If certificates used with @code{hkps} (keyserver access over TLS). If
the file is in PEM format a suffix of @code{.pem} is expected for the file is in PEM format a suffix of @code{.pem} is expected for
@var{file}. This option may be given multiple times to add more @var{file}. This option may be given multiple times to add more
root certificates. root certificates. Tilde expansion is supported.
@end table @end table

2
g10/dirmngr-conf.skel
View File

@ -56,6 +56,6 @@ keyserver hkp://keys.gnupg.net
# used for the connection. Enter the full name of a file with the # used for the connection. Enter the full name of a file with the
# root certificates here. If that file is in PEM format a ".pem" # root certificates here. If that file is in PEM format a ".pem"
# suffix is expected. This option may be given multiple times to add # suffix is expected. This option may be given multiple times to add
# more root certificates. # more root certificates. Tilde expansion is supported.
#hkp-cacert /path/to/CA/sks-keyservers.netCA.pem #hkp-cacert /path/to/CA/sks-keyservers.netCA.pem