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

When verifying certificates, store subject basename for later consumption.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17284 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-26 18:33:55 +00:00
parent 4035c1117d
commit c7b6f93485
1 changed files with 56 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
lib/hx509/cert.c
View File

@@ -58,6 +58,7 @@ struct hx509_cert_data {
Certificate *data;
hx509_private_key private_key;
struct _hx509_cert_attrs attrs;
hx509_name basename;
};
typedef struct hx509_name_constraints {
@@ -190,6 +191,7 @@ hx509_cert_init(hx509_context context, const Certificate *c, hx509_cert *cert)
(*cert)->attrs.len = 0;
(*cert)->attrs.val = NULL;
(*cert)->private_key = NULL;
(*cert)->basename = NULL;
(*cert)->data = malloc(sizeof(*(*cert)->data));
if ((*cert)->data == NULL) {
@@ -242,6 +244,8 @@ hx509_cert_free(hx509_cert cert)
}
free(cert->attrs.val);
free(cert->friendlyname);
if (cert->basename)
hx509_name_free(&cert->basename);
memset(cert, 0, sizeof(cert));
free(cert);
}
@@ -715,6 +719,41 @@ find_parent(hx509_context context,
return NULL;
}
/*
*
*/
static int
is_proxy_cert(const Certificate *cert, ProxyCertInfo *rinfo)
{
ProxyCertInfo info;
const Extension *e;
size_t size;
int ret, i = 0;
if (rinfo)
memset(rinfo, 0, sizeof(*rinfo));
e = find_extension(cert, oid_id_pe_proxyCertInfo(), &i);
if (e == NULL)
return HX509_EXTENSION_NOT_FOUND;
ret = decode_ProxyCertInfo(e->extnValue.data,
e->extnValue.length,
&info,
&size);
if (ret)
return ret;
if (size != e->extnValue.length) {
free_ProxyCertInfo(&info);
return HX509_EXTRA_DATA_AFTER_STRUCTURE;
}
if (rinfo)
*rinfo = info;
return 0;
}
/*
* Path operations are like MEMORY based keyset, but with exposed
* internal so we can do easy searches.
@@ -854,6 +893,16 @@ hx509_cert_get_subject(hx509_cert p, hx509_name *name)
return _hx509_name_from_Name(&p->data->tbsCertificate.subject, name);
}
int
hx509_cert_get_base_subject(hx509_context context, hx509_cert c, hx509_name *name)
{
if (c->basename)
return hx509_name_copy(context, c->basename, name);
if (is_proxy_cert(c->data, NULL))
return EINVAL; /* XXX */
return _hx509_name_from_Name(&c->data->tbsCertificate.subject, name);
}
int
hx509_cert_get_serialnumber(hx509_cert p, heim_integer *i)
{
@@ -876,7 +925,7 @@ _hx509_cert_private_decrypt(const heim_octet_string *ciphertext,
cleartext->length = 0;
if (p->private_key == NULL)
return EINVAL;
return EINVAL; /* XXX */
return _hx509_private_key_private_decrypt(ciphertext,
encryption_oid,
@@ -1197,32 +1246,6 @@ free_name_constraints(hx509_name_constraints *nc)
free(nc->val);
}
static int
is_proxy_cert(const Certificate *cert, ProxyCertInfo *info)
{
const Extension *e;
size_t size;
int ret, i = 0;
memset(info, 0, sizeof(*info));
e = find_extension(cert, oid_id_pe_proxyCertInfo(), &i);
if (e == NULL)
return HX509_EXTENSION_NOT_FOUND;
ret = decode_ProxyCertInfo(e->extnValue.data,
e->extnValue.length, info,
&size);
if (ret)
return ret;
if (size != e->extnValue.length) {
free_ProxyCertInfo(info);
return HX509_EXTRA_DATA_AFTER_STRUCTURE;
}
return 0;
}
int
hx509_verify_path(hx509_context context,
hx509_verify_ctx ctx,
@@ -1379,6 +1402,12 @@ hx509_verify_path(hx509_context context,
ret = HX509_PROXY_CERT_NAME_WRONG;
goto out;
}
if (cert->basename)
hx509_name_free(&cert->basename);
ret = _hx509_name_from_Name(&proxy_issuer, &cert->basename);
if (ret)
goto out;
}
}
type = EE_CERT;