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

20
lib/hx509/ks_p12.c
View File

@@ -76,7 +76,7 @@ keyBag_parser(hx509_context context,
const heim_octet_string *os = NULL; const heim_octet_string *os = NULL;
int ret; int ret;
attr = find_attribute(attrs, oid_id_pkcs_9_at_localKeyId()); attr = find_attribute(attrs, &asn1_oid_id_pkcs_9_at_localKeyId);
if (attr) if (attr)
os = &attr->attrValues; os = &attr->attrValues;
@@ -139,7 +139,7 @@ certBag_parser(hx509_context context,
if (ret) if (ret)
return ret; return ret;
if (der_heim_oid_cmp(oid_id_pkcs_9_at_certTypes_x509(), &cb.certType)) { if (der_heim_oid_cmp(&asn1_oid_id_pkcs_9_at_certTypes_x509, &cb.certType)) {
free_PKCS12_CertBag(&cb); free_PKCS12_CertBag(&cb);
return 0; return 0;
} }
@@ -165,13 +165,13 @@ certBag_parser(hx509_context context,
{ {
const PKCS12_Attribute *attr; const PKCS12_Attribute *attr;
const heim_oid * (*oids[])(void) = { const heim_oid *oids[] = {
oid_id_pkcs_9_at_localKeyId, oid_id_pkcs_9_at_friendlyName &asn1_oid_id_pkcs_9_at_localKeyId, &asn1_oid_id_pkcs_9_at_friendlyName
}; };
int i; int i;
for (i = 0; i < sizeof(oids)/sizeof(oids[0]); i++) { for (i = 0; i < sizeof(oids)/sizeof(oids[0]); i++) {
const heim_oid *oid = (*(oids[i]))(); const heim_oid *oid = oids[i];
attr = find_attribute(attrs, oid); attr = find_attribute(attrs, oid);
if (attr) if (attr)
_hx509_set_cert_attribute(context, cert, oid, _hx509_set_cert_attribute(context, cert, oid,
@@ -375,7 +375,7 @@ p12_init(hx509_context context,
goto out; goto out;
} }
if (der_heim_oid_cmp(&pfx.authSafe.contentType, oid_id_pkcs7_data()) != 0) { if (der_heim_oid_cmp(&pfx.authSafe.contentType, &asn1_oid_id_pkcs7_data) != 0) {
free_PKCS12_PFX(&pfx); free_PKCS12_PFX(&pfx);
ret = EINVAL; ret = EINVAL;
hx509_set_error_string(context, 0, ret, hx509_set_error_string(context, 0, ret,
@@ -505,7 +505,7 @@ store_func(hx509_context context, void *ctx, hx509_cert c)
free(os.data); free(os.data);
if (ret) if (ret)
goto out; goto out;
ret = der_copy_oid(oid_id_pkcs_9_at_certTypes_x509(), &cb.certType); ret = der_copy_oid(&asn1_oid_id_pkcs_9_at_certTypes_x509, &cb.certType);
if (ret) { if (ret) {
free_PKCS12_CertBag(&cb); free_PKCS12_CertBag(&cb);
goto out; goto out;
@@ -516,7 +516,7 @@ store_func(hx509_context context, void *ctx, hx509_cert c)
if (ret) if (ret)
goto out; goto out;
ret = addBag(context, as, oid_id_pkcs12_certBag(), os.data, os.length); ret = addBag(context, as, &asn1_oid_id_pkcs12_certBag, os.data, os.length);
if (_hx509_cert_private_key_exportable(c)) { if (_hx509_cert_private_key_exportable(c)) {
hx509_private_key key = _hx509_cert_private_key(c); hx509_private_key key = _hx509_cert_private_key(c);
@@ -548,7 +548,7 @@ store_func(hx509_context context, void *ctx, hx509_cert c)
if (ret) if (ret)
return ret; return ret;
ret = addBag(context, as, oid_id_pkcs12_keyBag(), os.data, os.length); ret = addBag(context, as, &asn1_oid_id_pkcs12_keyBag, os.data, os.length);
if (ret) if (ret)
return ret; return ret;
} }
@@ -597,7 +597,7 @@ p12_store(hx509_context context,
if (ret) if (ret)
goto out; goto out;
ret = der_copy_oid(oid_id_pkcs7_data(), &pfx.authSafe.contentType); ret = der_copy_oid(&asn1_oid_id_pkcs7_data, &pfx.authSafe.contentType);
if (ret) if (ret)
goto out; goto out;