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

Read in and use default trust anchors if they exists.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20915 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-06-05 03:58:56 +00:00
parent 31ac88517f
commit 8a865fee2e
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/hx509/cert.c
View File

@@ -119,6 +119,11 @@ hx509_context_init(hx509_context *context)
initialize_hx_error_table_r(&(*context)->et_list); initialize_hx_error_table_r(&(*context)->et_list);
initialize_asn1_error_table_r(&(*context)->et_list); initialize_asn1_error_table_r(&(*context)->et_list);
#ifdef HX509_DEFAULT_ANCHORS
(void)hx509_certs_init(*context, HX509_DEFAULT_ANCHORS, 0,
NULL, &(*context)->default_trust_anchors);
#endif
return 0; return 0;
} }
@@ -1466,6 +1471,7 @@ hx509_verify_path(hx509_context context,
int ret, i, proxy_cert_depth; int ret, i, proxy_cert_depth;
enum certtype type; enum certtype type;
Name proxy_issuer; Name proxy_issuer;
hx509_certs anchors = NULL;
memset(&proxy_issuer, 0, sizeof(proxy_issuer)); memset(&proxy_issuer, 0, sizeof(proxy_issuer));
@@ -1479,12 +1485,25 @@ hx509_verify_path(hx509_context context,
if ((ctx->flags & HX509_VERIFY_CTX_F_TIME_SET) == 0) if ((ctx->flags & HX509_VERIFY_CTX_F_TIME_SET) == 0)
ctx->time_now = time(NULL); ctx->time_now = time(NULL);
/*
*
*/
ret = hx509_certs_init(context, "MEMORY:trust-anchors", 0, NULL, &anchors);
if (ret)
goto out;
ret = hx509_certs_merge(context, anchors, ctx->trust_anchors);
if (ret)
goto out;
ret = hx509_certs_merge(context, anchors, context->default_trust_anchors);
if (ret)
goto out;
/* /*
* Calculate the path from the certificate user presented to the * Calculate the path from the certificate user presented to the
* to an anchor. * to an anchor.
*/ */
ret = _hx509_calculate_path(context, 0, ctx->time_now, ret = _hx509_calculate_path(context, 0, ctx->time_now,
ctx->trust_anchors, ctx->max_depth, anchors, ctx->max_depth,
cert, pool, &path); cert, pool, &path);
if (ret) if (ret)
goto out; goto out;
@@ -1806,6 +1825,7 @@ hx509_verify_path(hx509_context context,
} }
out: out:
hx509_certs_free(&anchors);
free_Name(&proxy_issuer); free_Name(&proxy_issuer);
free_name_constraints(&nc); free_name_constraints(&nc);
_hx509_path_free(&path); _hx509_path_free(&path);