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

Allow selection of a better digest using hx509_peer_info.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19117 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-11-26 15:48:26 +00:00
parent 84293fbe7c
commit a8539398d9
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/hx509/cms.c
View File

@@ -940,10 +940,12 @@ hx509_cms_create_signed_1(hx509_context context,
const void *data, size_t length, const void *data, size_t length,
const AlgorithmIdentifier *digest_alg, const AlgorithmIdentifier *digest_alg,
hx509_cert cert, hx509_cert cert,
hx509_peer_info peer,
hx509_certs anchors, hx509_certs anchors,
hx509_certs pool, hx509_certs pool,
heim_octet_string *signed_data) heim_octet_string *signed_data)
{ {
AlgorithmIdentifier digest;
hx509_name name; hx509_name name;
SignerInfo *signer_info; SignerInfo *signer_info;
heim_octet_string buf; heim_octet_string buf;
@@ -955,6 +957,7 @@ hx509_cms_create_signed_1(hx509_context context,
memset(&sd, 0, sizeof(sd)); memset(&sd, 0, sizeof(sd));
memset(&name, 0, sizeof(name)); memset(&name, 0, sizeof(name));
memset(&path, 0, sizeof(path)); memset(&path, 0, sizeof(path));
memset(&digest, 0, sizeof(digest));
if (_hx509_cert_private_key(cert) == NULL) { if (_hx509_cert_private_key(cert) == NULL) {
hx509_set_error_string(context, 0, HX509_PRIVATE_KEY_MISSING, hx509_set_error_string(context, 0, HX509_PRIVATE_KEY_MISSING,
@@ -962,9 +965,16 @@ hx509_cms_create_signed_1(hx509_context context,
return HX509_PRIVATE_KEY_MISSING; return HX509_PRIVATE_KEY_MISSING;
} }
/* XXX */ if (digest_alg == NULL) {
if (digest_alg == NULL) ret = hx509_select(context, HX509_SELECT_DIGEST,
digest_alg = hx509_signature_sha1(); _hx509_cert_private_key(cert), peer, &digest);
} else {
ret = copy_AlgorithmIdentifier(digest_alg, &digest);
if (ret)
hx509_clear_error_string(context);
}
if (ret)
goto out;
sd.version = CMSVersion_v3; sd.version = CMSVersion_v3;
@@ -1012,10 +1022,9 @@ hx509_cms_create_signed_1(hx509_context context,
} }
{ {
heim_octet_string digest; heim_octet_string data;
ret = copy_AlgorithmIdentifier(digest_alg, ret = copy_AlgorithmIdentifier(&digest, &signer_info->digestAlgorithm);
&signer_info->digestAlgorithm);
if (ret) { if (ret) {
hx509_clear_error_string(context); hx509_clear_error_string(context);
goto out; goto out;
@@ -1023,10 +1032,10 @@ hx509_cms_create_signed_1(hx509_context context,
ret = _hx509_create_signature(context, ret = _hx509_create_signature(context,
NULL, NULL,
digest_alg, &digest,
sd.encapContentInfo.eContent, sd.encapContentInfo.eContent,
NULL, NULL,
&digest); &data);
if (ret) { if (ret) {
hx509_clear_error_string(context); hx509_clear_error_string(context);
goto out; goto out;
@@ -1035,10 +1044,10 @@ hx509_cms_create_signed_1(hx509_context context,
ASN1_MALLOC_ENCODE(MessageDigest, ASN1_MALLOC_ENCODE(MessageDigest,
buf.data, buf.data,
buf.length, buf.length,
&digest, &data,
&size, &size,
ret); ret);
der_free_octet_string(&digest); der_free_octet_string(&data);
if (ret) { if (ret) {
hx509_clear_error_string(context); hx509_clear_error_string(context);
goto out; goto out;
@@ -1122,8 +1131,7 @@ hx509_cms_create_signed_1(hx509_context context,
goto out; goto out;
} }
ret = copy_AlgorithmIdentifier(digest_alg, ret = copy_AlgorithmIdentifier(&digest, &sd.digestAlgorithms.val[0]);
&sd.digestAlgorithms.val[0]);
if (ret) { if (ret) {
hx509_clear_error_string(context); hx509_clear_error_string(context);
goto out; goto out;
@@ -1183,6 +1191,7 @@ hx509_cms_create_signed_1(hx509_context context,
_hx509_abort("internal ASN.1 encoder error"); _hx509_abort("internal ASN.1 encoder error");
out: out:
free_AlgorithmIdentifier(&digest);
_hx509_path_free(&path); _hx509_path_free(&path);
free_SignedData(&sd); free_SignedData(&sd);