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

(hx509_cms_create_signed_1): pass in a full AlgorithmIdentifier

Browse Source 
instead of heim_oid for digest_alg


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15799 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-07-27 21:02:13 +00:00
parent 4fa74ad527
commit 2524a63c87
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/hx509/cms.c
View File

@@ -685,7 +685,7 @@ add_one_attribute(Attribute **attr,
int int
hx509_cms_create_signed_1(const heim_oid *eContentType, hx509_cms_create_signed_1(const heim_oid *eContentType,
const void *data, size_t length, const void *data, size_t length,
const heim_oid *signature_type, const AlgorithmIdentifier *digest_alg,
hx509_cert cert, hx509_cert cert,
heim_octet_string *signed_data) heim_octet_string *signed_data)
{ {
@@ -703,9 +703,8 @@ hx509_cms_create_signed_1(const heim_oid *eContentType,
return HX509_PRIVATE_KEY_MISSING; return HX509_PRIVATE_KEY_MISSING;
/* XXX */ /* XXX */
if (signature_type == NULL) if (digest_alg == NULL)
signature_type = oid_id_secsig_sha_1(); digest_alg = hx509_signature_sha1();
sd.version = 3; sd.version = 3;
@@ -738,12 +737,6 @@ hx509_cms_create_signed_1(const heim_oid *eContentType,
if (ret) if (ret)
goto out; goto out;
ret = _hx509_set_digest_alg(&signer_info->digestAlgorithm,
signature_type, "\x05\x00", 2);
if (ret) {
goto out;
}
signer_info->signedAttrs = NULL; signer_info->signedAttrs = NULL;
signer_info->unsignedAttrs = NULL; signer_info->unsignedAttrs = NULL;
@@ -756,8 +749,13 @@ hx509_cms_create_signed_1(const heim_oid *eContentType,
{ {
heim_octet_string digest; heim_octet_string digest;
ret = copy_AlgorithmIdentifier(digest_alg,
&signer_info->digestAlgorithm);
if (ret)
goto out;
ret = _hx509_create_signature(NULL, ret = _hx509_create_signature(NULL,
hx509_signature_sha1(), digest_alg,
sd.encapContentInfo.eContent, sd.encapContentInfo.eContent,
NULL, NULL,
&digest); &digest);
@@ -844,8 +842,8 @@ hx509_cms_create_signed_1(const heim_oid *eContentType,
goto out; goto out;
} }
ret = _hx509_set_digest_alg(&sd.digestAlgorithms.val[0], ret = copy_AlgorithmIdentifier(digest_alg,
signature_type, "\x05\x00", 2); &sd.digestAlgorithms.val[0]);
if (ret) { if (ret) {
goto out; goto out;
} }