summaryrefslogtreecommitdiffstats
path: root/dirmngr/certcache.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2010-07-16 15:19:45 +0200
committerWerner Koch <wk@gnupg.org>2010-07-16 15:19:45 +0200
commit8b8925a2bdbb12dd537dde20a27cdb1416c2f1ae (patch)
tree366acb6bb52e61242bb39682ddddb76615c3ba34 /dirmngr/certcache.c
parentMake it build on W32 again. (diff)
downloadgnupg2-8b8925a2bdbb12dd537dde20a27cdb1416c2f1ae.tar.xz
gnupg2-8b8925a2bdbb12dd537dde20a27cdb1416c2f1ae.zip
Some work on porting dirmngr (unfinished)
Ported gpgtar to W32.
Diffstat (limited to 'dirmngr/certcache.c')
-rw-r--r--dirmngr/certcache.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/dirmngr/certcache.c b/dirmngr/certcache.c
index c40bb17d0..46d2ac365 100644
--- a/dirmngr/certcache.c
+++ b/dirmngr/certcache.c
@@ -328,7 +328,7 @@ load_certs_from_dir (const char *dirname, int are_trusted)
struct dirent *ep;
char *p;
size_t n;
- FILE *fp;
+ estream_t fp;
ksba_reader_t reader;
ksba_cert_t cert;
char *fname = NULL;
@@ -353,7 +353,7 @@ load_certs_from_dir (const char *dirname, int are_trusted)
xfree (fname);
fname = make_filename (dirname, p, NULL);
- fp = fopen (fname, "rb");
+ fp = es_fopen (fname, "rb");
if (!fp)
{
log_error (_("can't open `%s': %s\n"),
@@ -367,7 +367,7 @@ load_certs_from_dir (const char *dirname, int are_trusted)
{
log_error (_("can't setup KSBA reader: %s\n"), gpg_strerror (err));
ksba_reader_release (reader);
- fclose (fp);
+ es_fclose (fp);
continue;
}
@@ -375,7 +375,7 @@ load_certs_from_dir (const char *dirname, int are_trusted)
if (!err)
err = ksba_cert_read_der (cert, reader);
ksba_reader_release (reader);
- fclose (fp);
+ es_fclose (fp);
if (err)
{
log_error (_("can't parse certificate `%s': %s\n"),