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

Factor out certificate parsing code.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16424 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-01-02 13:01:29 +00:00
parent 1159d1e392
commit 13b7a732d1
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/hx509/ks_file.c
View File

@@ -102,6 +102,25 @@ parse_certificate(const char *fn, int use_pem, Certificate *t)
return ret; return ret;
} }
int
_hx509_file_to_cert(const char *certfn, hx509_cert *cert)
{
Certificate t;
int ret;
ret = parse_certificate(certfn, 1, &t);
if (ret) {
ret = parse_certificate(certfn, 0, &t);
if (ret)
return ret;
}
ret = hx509_cert_init(&t, cert);
free_Certificate(&t);
return ret;
}
static int static int
file_init(hx509_certs certs, void **data, int flags, file_init(hx509_certs certs, void **data, int flags,
@@ -109,6 +128,7 @@ file_init(hx509_certs certs, void **data, int flags,
{ {
char *certfn, *keyfn, *friendlyname = NULL; char *certfn, *keyfn, *friendlyname = NULL;
hx509_cert cert; hx509_cert cert;
int ret;
*data = NULL; *data = NULL;
@@ -123,24 +143,10 @@ file_init(hx509_certs certs, void **data, int flags,
*friendlyname++ = '\0'; *friendlyname++ = '\0';
} }
{ ret = _hx509_file_to_cert(certfn, &cert);
Certificate t; if (ret) {
int ret; free(certfn);
return ret;
ret = parse_certificate(certfn, 1, &t);
if (ret)
ret = parse_certificate(certfn, 0, &t);
if (ret) {
free(certfn);
return ret;
}
ret = hx509_cert_init(&t, &cert);
free_Certificate(&t);
if (ret) {
free(certfn);
return ret;
}
} }
if (keyfn) { if (keyfn) {