oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Implement DIR: caches useing FILE: caches.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17531 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-05-11 11:22:02 +00:00
parent 22a9431c92
commit 941e1779cb
1 changed files with 68 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
lib/hx509/ks_dir.c
View File

@@ -35,31 +35,11 @@
RCSID("$Id$"); RCSID("$Id$");
#include <dirent.h> #include <dirent.h>
static int struct dircursor {
file_to_cert(hx509_context context, const char *p, hx509_cert *cert) DIR *dir;
{ hx509_certs certs;
Certificate t; void *iter;
size_t length; };
void *data;
size_t size;
int ret;
*cert = NULL;
ret = _hx509_map_file(p, &data, &length, NULL);
if (ret)
return ret;
ret = decode_Certificate(data, length, &t, &size);
_hx509_unmap_file(data, length);
if (ret)
return ret;
ret = hx509_cert_init(context, &t, cert);
free_Certificate(&t);
return ret;
}
/* /*
* *
@@ -104,13 +84,21 @@ static int
dir_iter_start(hx509_context context, dir_iter_start(hx509_context context,
hx509_certs certs, void *data, void **cursor) hx509_certs certs, void *data, void **cursor)
{ {
DIR *d; struct dircursor *d;
d = opendir(data); *cursor = NULL;
if (d == NULL) {
*cursor = 0; d = calloc(1, sizeof(*d));
return 0; if (d == NULL)
return ENOMEM;
d->dir = opendir(data);
if (d->dir == NULL) {
free(d);
return errno;
} }
d->certs = NULL;
d->iter = NULL;
*cursor = d; *cursor = d;
return 0; return 0;
@@ -120,8 +108,8 @@ static int
dir_iter(hx509_context context, dir_iter(hx509_context context,
hx509_certs certs, void *data, void *iter, hx509_cert *cert) hx509_certs certs, void *data, void *iter, hx509_cert *cert)
{ {
DIR *d = iter; struct dircursor *d = iter;
int ret; int ret = 0;
*cert = NULL; *cert = NULL;
@@ -129,16 +117,49 @@ dir_iter(hx509_context context,
struct dirent *dir; struct dirent *dir;
char *fn; char *fn;
dir = readdir(d); if (d->certs) {
if (dir == NULL) ret = hx509_certs_next_cert(context, d->certs, d->iter, cert);
return 0; if (ret) {
hx509_certs_end_seq(context, d->certs, d->iter);
d->iter = NULL;
hx509_certs_free(&d->certs);
return ret;
}
if (*cert) {
ret = 0;
break;
}
hx509_certs_end_seq(context, d->certs, d->iter);
d->iter = NULL;
hx509_certs_free(&d->certs);
}
dir = readdir(d->dir);
if (dir == NULL) {
ret = 0;
break;
}
if (strcmp(dir->d_name, ".") == 0 || strcmp(dir->d_name, "..") == 0)
continue;
if (asprintf(&fn, "%s/%s", (char *)data, dir->d_name) == -1) if (asprintf(&fn, "FILE:%s/%s", (char *)data, dir->d_name) == -1)
return ENOMEM; return ENOMEM;
ret = file_to_cert(context, fn, cert); ret = hx509_certs_init(context, fn, 0, NULL, &d->certs);
if (ret == 0) {
ret = hx509_certs_start_seq(context, d->certs, &d->iter);
if (ret)
hx509_certs_free(&d->certs);
}
/* ignore errors */
if (ret) {
d->certs = NULL;
ret = 0;
}
free(fn); free(fn);
} while(ret != 0); } while(ret == 0);
return ret; return ret;
} }
@@ -150,8 +171,15 @@ dir_iter_end(hx509_context context,
void *data, void *data,
void *cursor) void *cursor)
{ {
DIR *d = cursor; struct dircursor *d = cursor;
closedir(d);
if (d->certs) {
hx509_certs_end_seq(context, d->certs, d->iter);
d->iter = NULL;
hx509_certs_free(&d->certs);
}
closedir(d->dir);
free(d);
return 0; return 0;
} }