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

dirmngr: Load --hkp-cacert values into the certificate cache.

Browse source 
* dirmngr/dirmngr.c (hkp_cacert_filenames): New var.
(parse_rereadable_options): Store filenames from --hkp-cacert in the
new var.
(main, dirmngr_sighup_action): Pass that var to cert_cache_init.
* dirmngr/certcache.c (cert_cache_init): Add arg 'hkp_cacert' and load
those certs.
(load_certs_from_file): Use autodetect so that PEM and DER encodings
are possible.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-02-21 13:57:24 +01:00
parent 9741aa24d9
commit d1625a9a82
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
3 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dirmngr/certcache.c
View file

@ -471,7 +471,8 @@ load_certs_from_file (const char *fname, unsigned int trustclasses,
}
err = gnupg_ksba_create_reader (&ioctx,
(GNUPG_KSBA_IO_PEM | GNUPG_KSBA_IO_MULTIPEM),
(GNUPG_KSBA_IO_AUTODETECT
| GNUPG_KSBA_IO_MULTIPEM),
fp, &reader);
if (err)
{
@ -686,9 +687,10 @@ load_certs_from_system (void)
/* Initialize the certificate cache if not yet done. */
void
cert_cache_init (void)
cert_cache_init (strlist_t hkp_cacerts)
{
char *fname;
strlist_t sl;
if (initialization_done)
return;
@ -707,6 +709,10 @@ cert_cache_init (void)
load_certs_from_dir (fname, 0);
xfree (fname);
for (sl = hkp_cacerts; sl; sl = sl->next)
load_certs_from_file (sl->d, CERTTRUST_CLASS_HKP, 0);
fname = make_filename_try (gnupg_datadir (),
"sks-keyservers.netCA.pem", NULL);
if (fname)