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

Use OID variable instead of function.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@25242 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-05-28 01:19:03 +00:00
parent 7a23a190a1
commit becda09568
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/hx509/ca.c
View File

@@ -671,7 +671,7 @@ hx509_ca_tbs_add_san_pkinit(hx509_context context,
ret = hx509_ca_tbs_add_san_otherName(context, ret = hx509_ca_tbs_add_san_otherName(context,
tbs, tbs,
oid_id_pkinit_san(), &asn1_oid_id_pkinit_san,
&os); &os);
free(os.data); free(os.data);
out: out:
@@ -735,7 +735,7 @@ hx509_ca_tbs_add_san_ms_upn(hx509_context context,
hx509_ca_tbs tbs, hx509_ca_tbs tbs,
const char *principal) const char *principal)
{ {
return add_utf8_san(context, tbs, oid_id_pkinit_ms_san(), principal); return add_utf8_san(context, tbs, &asn1_oid_id_pkinit_ms_san, principal);
} }
/** /**
@@ -756,7 +756,7 @@ hx509_ca_tbs_add_san_jid(hx509_context context,
hx509_ca_tbs tbs, hx509_ca_tbs tbs,
const char *jid) const char *jid)
{ {
return add_utf8_san(context, tbs, oid_id_pkix_on_xmppAddr(), jid); return add_utf8_san(context, tbs, &asn1_oid_id_pkix_on_xmppAddr, jid);
} }
@@ -925,7 +925,7 @@ build_proxy_prefix(hx509_context context, const Name *issuer, Name *subject)
return ENOMEM; return ENOMEM;
} }
/* prefix with CN=<ts>,...*/ /* prefix with CN=<ts>,...*/
ret = _hx509_name_modify(context, subject, 1, oid_id_at_commonName(), tstr); ret = _hx509_name_modify(context, subject, 1, &asn1_oid_id_at_commonName, tstr);
free(tstr); free(tstr);
if (ret) if (ret)
free_Name(subject); free_Name(subject);
@@ -1109,7 +1109,7 @@ ca_sign(hx509_context context,
data.length = 34; data.length = 34;
ret = add_extension(context, tbsc, 0, ret = add_extension(context, tbsc, 0,
oid_id_ms_cert_enroll_domaincontroller(), &asn1_oid_id_ms_cert_enroll_domaincontroller,
&data); &data);
if (ret) if (ret)
goto out; goto out;
@@ -1128,7 +1128,7 @@ ca_sign(hx509_context context,
if (size != data.length) if (size != data.length)
_hx509_abort("internal ASN.1 encoder error"); _hx509_abort("internal ASN.1 encoder error");
ret = add_extension(context, tbsc, 1, ret = add_extension(context, tbsc, 1,
oid_id_x509_ce_keyUsage(), &data); &asn1_oid_id_x509_ce_keyUsage, &data);
free(data.data); free(data.data);
if (ret) if (ret)
goto out; goto out;
@@ -1145,7 +1145,7 @@ ca_sign(hx509_context context,
if (size != data.length) if (size != data.length)
_hx509_abort("internal ASN.1 encoder error"); _hx509_abort("internal ASN.1 encoder error");
ret = add_extension(context, tbsc, 0, ret = add_extension(context, tbsc, 0,
oid_id_x509_ce_extKeyUsage(), &data); &asn1_oid_id_x509_ce_extKeyUsage, &data);
free(data.data); free(data.data);
if (ret) if (ret)
goto out; goto out;
@@ -1162,7 +1162,7 @@ ca_sign(hx509_context context,
if (size != data.length) if (size != data.length)
_hx509_abort("internal ASN.1 encoder error"); _hx509_abort("internal ASN.1 encoder error");
ret = add_extension(context, tbsc, 0, ret = add_extension(context, tbsc, 0,
oid_id_x509_ce_subjectAltName(), &asn1_oid_id_x509_ce_subjectAltName,
&data); &data);
free(data.data); free(data.data);
if (ret) if (ret)
@@ -1180,7 +1180,7 @@ ca_sign(hx509_context context,
if (size != data.length) if (size != data.length)
_hx509_abort("internal ASN.1 encoder error"); _hx509_abort("internal ASN.1 encoder error");
ret = add_extension(context, tbsc, 0, ret = add_extension(context, tbsc, 0,
oid_id_x509_ce_authorityKeyIdentifier(), &asn1_oid_id_x509_ce_authorityKeyIdentifier,
&data); &data);
free(data.data); free(data.data);
if (ret) if (ret)
@@ -1213,7 +1213,7 @@ ca_sign(hx509_context context,
if (size != data.length) if (size != data.length)
_hx509_abort("internal ASN.1 encoder error"); _hx509_abort("internal ASN.1 encoder error");
ret = add_extension(context, tbsc, 0, ret = add_extension(context, tbsc, 0,
oid_id_x509_ce_subjectKeyIdentifier(), &asn1_oid_id_x509_ce_subjectKeyIdentifier,
&data); &data);
free(data.data); free(data.data);
if (ret) if (ret)
@@ -1246,7 +1246,7 @@ ca_sign(hx509_context context,
_hx509_abort("internal ASN.1 encoder error"); _hx509_abort("internal ASN.1 encoder error");
/* Critical if this is a CA */ /* Critical if this is a CA */
ret = add_extension(context, tbsc, tbs->flags.ca, ret = add_extension(context, tbsc, tbs->flags.ca,
oid_id_x509_ce_basicConstraints(), &asn1_oid_id_x509_ce_basicConstraints,
&data); &data);
free(data.data); free(data.data);
if (ret) if (ret)
@@ -1270,7 +1270,7 @@ ca_sign(hx509_context context,
*info.pCPathLenConstraint = tbs->pathLenConstraint; *info.pCPathLenConstraint = tbs->pathLenConstraint;
} }
ret = der_copy_oid(oid_id_pkix_ppl_inheritAll(), ret = der_copy_oid(&asn1_oid_id_pkix_ppl_inheritAll,
&info.proxyPolicy.policyLanguage); &info.proxyPolicy.policyLanguage);
if (ret) { if (ret) {
free_ProxyCertInfo(&info); free_ProxyCertInfo(&info);
@@ -1288,7 +1288,7 @@ ca_sign(hx509_context context,
if (size != data.length) if (size != data.length)
_hx509_abort("internal ASN.1 encoder error"); _hx509_abort("internal ASN.1 encoder error");
ret = add_extension(context, tbsc, 0, ret = add_extension(context, tbsc, 0,
oid_id_pkix_pe_proxyCertInfo(), &asn1_oid_id_pkix_pe_proxyCertInfo,
&data); &data);
free(data.data); free(data.data);
if (ret) if (ret)
@@ -1306,7 +1306,7 @@ ca_sign(hx509_context context,
if (size != data.length) if (size != data.length)
_hx509_abort("internal ASN.1 encoder error"); _hx509_abort("internal ASN.1 encoder error");
ret = add_extension(context, tbsc, FALSE, ret = add_extension(context, tbsc, FALSE,
oid_id_x509_ce_cRLDistributionPoints(), &asn1_oid_id_x509_ce_cRLDistributionPoints,
&data); &data);
free(data.data); free(data.data);
if (ret) if (ret)