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

Add hx509_ca_tbs_add_san_ms_upn and refactor code.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20720 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-05-31 02:43:58 +00:00
parent 1a6adc6188
commit db080434b8
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/hx509/ca.c
View File

@@ -468,12 +468,17 @@ out:
return ret; return ret;
} }
int /*
hx509_ca_tbs_add_san_jid(hx509_context context, *
hx509_ca_tbs tbs, */
const char *jid)
static int
add_utf8_san(hx509_context context,
hx509_ca_tbs tbs,
const heim_oid *oid,
const char *string)
{ {
const PKIXXmppAddr ujid = (const PKIXXmppAddr)jid; const PKIXXmppAddr ustring = (const PKIXXmppAddr)string;
heim_octet_string os; heim_octet_string os;
size_t size; size_t size;
int ret; int ret;
@@ -481,7 +486,7 @@ hx509_ca_tbs_add_san_jid(hx509_context context,
os.length = 0; os.length = 0;
os.data = NULL; os.data = NULL;
ASN1_MALLOC_ENCODE(PKIXXmppAddr, os.data, os.length, &ujid, &size, ret); ASN1_MALLOC_ENCODE(PKIXXmppAddr, os.data, os.length, &ustring, &size, ret);
if (ret) { if (ret) {
hx509_set_error_string(context, 0, ret, "Out of memory"); hx509_set_error_string(context, 0, ret, "Out of memory");
goto out; goto out;
@@ -491,13 +496,29 @@ hx509_ca_tbs_add_san_jid(hx509_context context,
ret = hx509_ca_tbs_add_san_otherName(context, ret = hx509_ca_tbs_add_san_otherName(context,
tbs, tbs,
oid_id_pkix_on_xmppAddr(), oid,
&os); &os);
free(os.data); free(os.data);
out: out:
return ret; return ret;
} }
int
hx509_ca_tbs_add_san_ms_upn(hx509_context context,
hx509_ca_tbs tbs,
const char *principal)
{
return add_utf8_san(context, tbs, oid_id_pkinit_ms_san(), principal);
}
int
hx509_ca_tbs_add_san_jid(hx509_context context,
hx509_ca_tbs tbs,
const char *jid)
{
return add_utf8_san(context, tbs, oid_id_pkix_on_xmppAddr(), jid);
}
int int
hx509_ca_tbs_add_san_hostname(hx509_context context, hx509_ca_tbs_add_san_hostname(hx509_context context,