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

18
lib/hx509/cms.c
View File

@@ -569,7 +569,7 @@ hx509_cms_envelope_1(hx509_context context,
memset(content, 0, sizeof(*content)); memset(content, 0, sizeof(*content));
if (encryption_type == NULL) if (encryption_type == NULL)
encryption_type = oid_id_aes_256_cbc(); encryption_type = &asn1_oid_id_aes_256_cbc;
if ((flags & HX509_CMS_EV_NO_KU_CHECK) == 0) { if ((flags & HX509_CMS_EV_NO_KU_CHECK) == 0) {
ret = _hx509_check_key_usage(context, cert, 1 << 2, TRUE); ret = _hx509_check_key_usage(context, cert, 1 << 2, TRUE);
@@ -889,7 +889,7 @@ hx509_cms_verify_signed(hx509_context context,
sa.len = signer_info->signedAttrs->len; sa.len = signer_info->signedAttrs->len;
/* verify that sigature exists */ /* verify that sigature exists */
attr = find_attribute(&sa, oid_id_pkcs9_messageDigest()); attr = find_attribute(&sa, &asn1_oid_id_pkcs9_messageDigest);
if (attr == NULL) { if (attr == NULL) {
ret = HX509_CRYPTO_SIGNATURE_MISSING; ret = HX509_CRYPTO_SIGNATURE_MISSING;
hx509_set_error_string(context, 0, ret, hx509_set_error_string(context, 0, ret,
@@ -933,9 +933,9 @@ hx509_cms_verify_signed(hx509_context context,
* Fetch content oid inside signedAttrs or set it to * Fetch content oid inside signedAttrs or set it to
* id-pkcs7-data. * id-pkcs7-data.
*/ */
attr = find_attribute(&sa, oid_id_pkcs9_contentType()); attr = find_attribute(&sa, &asn1_oid_id_pkcs9_contentType);
if (attr == NULL) { if (attr == NULL) {
match_oid = oid_id_pkcs7_data(); match_oid = &asn1_oid_id_pkcs7_data;
} else { } else {
if (attr->value.len != 1) { if (attr->value.len != 1) {
ret = HX509_CMS_DATA_OID_MISMATCH; ret = HX509_CMS_DATA_OID_MISMATCH;
@@ -974,7 +974,7 @@ hx509_cms_verify_signed(hx509_context context,
} else { } else {
signed_data.data = content->data; signed_data.data = content->data;
signed_data.length = content->length; signed_data.length = content->length;
match_oid = oid_id_pkcs7_data(); match_oid = &asn1_oid_id_pkcs7_data;
} }
/** /**
@@ -1246,7 +1246,7 @@ sig_process(hx509_context context, void *ctx, hx509_cert cert)
* If it isn't pkcs7-data send signedAttributes * If it isn't pkcs7-data send signedAttributes
*/ */
if (der_heim_oid_cmp(sigctx->eContentType, oid_id_pkcs7_data()) != 0) { if (der_heim_oid_cmp(sigctx->eContentType, &asn1_oid_id_pkcs7_data) != 0) {
CMSAttributes sa; CMSAttributes sa;
heim_octet_string sig; heim_octet_string sig;
@@ -1281,7 +1281,7 @@ sig_process(hx509_context context, void *ctx, hx509_cert cert)
ret = add_one_attribute(&signer_info->signedAttrs->val, ret = add_one_attribute(&signer_info->signedAttrs->val,
&signer_info->signedAttrs->len, &signer_info->signedAttrs->len,
oid_id_pkcs9_messageDigest(), &asn1_oid_id_pkcs9_messageDigest,
&buf); &buf);
if (ret) { if (ret) {
free(buf.data); free(buf.data);
@@ -1303,7 +1303,7 @@ sig_process(hx509_context context, void *ctx, hx509_cert cert)
ret = add_one_attribute(&signer_info->signedAttrs->val, ret = add_one_attribute(&signer_info->signedAttrs->val,
&signer_info->signedAttrs->len, &signer_info->signedAttrs->len,
oid_id_pkcs9_contentType(), &asn1_oid_id_pkcs9_contentType,
&buf); &buf);
if (ret) { if (ret) {
free(buf.data); free(buf.data);
@@ -1437,7 +1437,7 @@ hx509_cms_create_signed(hx509_context context,
memset(&name, 0, sizeof(name)); memset(&name, 0, sizeof(name));
if (eContentType == NULL) if (eContentType == NULL)
eContentType = oid_id_pkcs7_data(); eContentType = &asn1_oid_id_pkcs7_data;
sigctx.digest_alg = digest_alg; sigctx.digest_alg = digest_alg;
sigctx.content.data = rk_UNCONST(data); sigctx.content.data = rk_UNCONST(data);