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@25239 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-05-28 01:18:32 +00:00
parent 8a5799199b
commit 7df0a533ab
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/hx509/hxtool.c
View File

@@ -235,7 +235,7 @@ cms_verify_sd(struct cms_verify_sd_options *opt, int argc, char **argv)
if (ret) if (ret)
errx(1, "hx509_cms_unwrap_ContentInfo: %d", ret); errx(1, "hx509_cms_unwrap_ContentInfo: %d", ret);
if (der_heim_oid_cmp(&oid, oid_id_pkcs7_signedData()) != 0) if (der_heim_oid_cmp(&oid, &asn1_oid_id_pkcs7_signedData) != 0)
errx(1, "Content is not SignedData"); errx(1, "Content is not SignedData");
der_free_oid(&oid); der_free_oid(&oid);
@@ -387,7 +387,7 @@ cms_create_sd(struct cms_create_sd_options *opt, int argc, char **argv)
if (opt->peer_alg_strings.num_strings) if (opt->peer_alg_strings.num_strings)
peer_strings(context, &peer, &opt->peer_alg_strings); peer_strings(context, &peer, &opt->peer_alg_strings);
parse_oid(opt->content_type_string, oid_id_pkcs7_data(), &contentType); parse_oid(opt->content_type_string, &asn1_oid_id_pkcs7_data, &contentType);
ret = hx509_cms_create_signed(context, ret = hx509_cms_create_signed(context,
flags, flags,
@@ -414,7 +414,7 @@ cms_create_sd(struct cms_create_sd_options *opt, int argc, char **argv)
if (opt->content_info_flag) { if (opt->content_info_flag) {
heim_octet_string wo; heim_octet_string wo;
ret = hx509_cms_wrap_ContentInfo(oid_id_pkcs7_signedData(), &o, &wo); ret = hx509_cms_wrap_ContentInfo(&asn1_oid_id_pkcs7_signedData, &o, &wo);
if (ret) if (ret)
errx(1, "hx509_cms_wrap_ContentInfo: %d", ret); errx(1, "hx509_cms_wrap_ContentInfo: %d", ret);
@@ -486,7 +486,7 @@ cms_unenvelope(struct cms_unenvelope_options *opt, int argc, char **argv)
if (ret) if (ret)
errx(1, "hx509_cms_unwrap_ContentInfo: %d", ret); errx(1, "hx509_cms_unwrap_ContentInfo: %d", ret);
if (der_heim_oid_cmp(&oid, oid_id_pkcs7_envelopedData()) != 0) if (der_heim_oid_cmp(&oid, &asn1_oid_id_pkcs7_envelopedData) != 0)
errx(1, "Content is not SignedData"); errx(1, "Content is not SignedData");
der_free_oid(&oid); der_free_oid(&oid);
@@ -573,7 +573,7 @@ cms_create_enveloped(struct cms_envelope_options *opt, int argc, char **argv)
if (ret) if (ret)
errx(1, "hx509_certs_find: %d", ret); errx(1, "hx509_certs_find: %d", ret);
parse_oid(opt->content_type_string, oid_id_pkcs7_data(), &contentType); parse_oid(opt->content_type_string, &asn1_oid_id_pkcs7_data, &contentType);
ret = hx509_cms_envelope_1(context, flags, cert, p, sz, enctype, ret = hx509_cms_envelope_1(context, flags, cert, p, sz, enctype,
&contentType, &o); &contentType, &o);
@@ -588,7 +588,7 @@ cms_create_enveloped(struct cms_envelope_options *opt, int argc, char **argv)
if (opt->content_info_flag) { if (opt->content_info_flag) {
heim_octet_string wo; heim_octet_string wo;
ret = hx509_cms_wrap_ContentInfo(oid_id_pkcs7_envelopedData(), &o, &wo); ret = hx509_cms_wrap_ContentInfo(&asn1_oid_id_pkcs7_envelopedData, &o, &wo);
if (ret) if (ret)
errx(1, "hx509_cms_wrap_ContentInfo: %d", ret); errx(1, "hx509_cms_wrap_ContentInfo: %d", ret);
@@ -1522,26 +1522,26 @@ struct cert_type_opt {
static int static int
https_server(hx509_context context, hx509_ca_tbs tbs, struct cert_type_opt *opt) https_server(hx509_context context, hx509_ca_tbs tbs, struct cert_type_opt *opt)
{ {
return hx509_ca_tbs_add_eku(context, tbs, oid_id_pkix_kp_serverAuth()); return hx509_ca_tbs_add_eku(context, tbs, &asn1_oid_id_pkix_kp_serverAuth);
} }
static int static int
https_client(hx509_context context, hx509_ca_tbs tbs, struct cert_type_opt *opt) https_client(hx509_context context, hx509_ca_tbs tbs, struct cert_type_opt *opt)
{ {
return hx509_ca_tbs_add_eku(context, tbs, oid_id_pkix_kp_clientAuth()); return hx509_ca_tbs_add_eku(context, tbs, &asn1_oid_id_pkix_kp_clientAuth);
} }
static int static int
peap_server(hx509_context context, hx509_ca_tbs tbs, struct cert_type_opt *opt) peap_server(hx509_context context, hx509_ca_tbs tbs, struct cert_type_opt *opt)
{ {
return hx509_ca_tbs_add_eku(context, tbs, oid_id_pkix_kp_serverAuth()); return hx509_ca_tbs_add_eku(context, tbs, &asn1_oid_id_pkix_kp_serverAuth);
} }
static int static int
pkinit_kdc(hx509_context context, hx509_ca_tbs tbs, struct cert_type_opt *opt) pkinit_kdc(hx509_context context, hx509_ca_tbs tbs, struct cert_type_opt *opt)
{ {
opt->pkinit++; opt->pkinit++;
return hx509_ca_tbs_add_eku(context, tbs, oid_id_pkkdcekuoid()); return hx509_ca_tbs_add_eku(context, tbs, &asn1_oid_id_pkkdcekuoid);
} }
static int static int
@@ -1551,21 +1551,21 @@ pkinit_client(hx509_context context, hx509_ca_tbs tbs, struct cert_type_opt *opt
opt->pkinit++; opt->pkinit++;
ret = hx509_ca_tbs_add_eku(context, tbs, oid_id_pkekuoid()); ret = hx509_ca_tbs_add_eku(context, tbs, &asn1_oid_id_pkekuoid);
if (ret) if (ret)
return ret; return ret;
ret = hx509_ca_tbs_add_eku(context, tbs, oid_id_ms_client_authentication()); ret = hx509_ca_tbs_add_eku(context, tbs, &asn1_oid_id_ms_client_authentication);
if (ret) if (ret)
return ret; return ret;
return hx509_ca_tbs_add_eku(context, tbs, oid_id_pkinit_ms_eku()); return hx509_ca_tbs_add_eku(context, tbs, &asn1_oid_id_pkinit_ms_eku);
} }
static int static int
email_client(hx509_context context, hx509_ca_tbs tbs, struct cert_type_opt *opt) email_client(hx509_context context, hx509_ca_tbs tbs, struct cert_type_opt *opt)
{ {
return hx509_ca_tbs_add_eku(context, tbs, oid_id_pkix_kp_emailProtection()); return hx509_ca_tbs_add_eku(context, tbs, &asn1_oid_id_pkix_kp_emailProtection);
} }
struct { struct {
@@ -1691,7 +1691,7 @@ eval_types(hx509_context context,
hx509_err(context, 1, ret, "hx509_ca_tbs_add_san_hostname"); hx509_err(context, 1, ret, "hx509_ca_tbs_add_san_hostname");
ret = hx509_ca_tbs_add_eku(context, tbs, ret = hx509_ca_tbs_add_eku(context, tbs,
oid_id_pkix_kp_emailProtection()); &asn1_oid_id_pkix_kp_emailProtection);
if (ret) if (ret)
hx509_err(context, 1, ret, "hx509_ca_tbs_add_eku"); hx509_err(context, 1, ret, "hx509_ca_tbs_add_eku");
} }
@@ -1803,7 +1803,7 @@ hxtool_ca(struct certificate_sign_options *opt, int argc, char **argv)
struct hx509_generate_private_context *keyctx; struct hx509_generate_private_context *keyctx;
ret = _hx509_generate_private_key_init(context, ret = _hx509_generate_private_key_init(context,
oid_id_pkcs1_rsaEncryption(), &asn1_oid_id_pkcs1_rsaEncryption,
&keyctx); &keyctx);
if (ret) if (ret)
hx509_err(context, 1, ret, "generate private key"); hx509_err(context, 1, ret, "generate private key");