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

(hx509_cms_create_signed_1): calculate path and add it to the

Browse Source 
SignedData structure.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17166 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-22 11:37:17 +00:00
parent 2742f6e454
commit 0cf7710dea
1 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/hx509/cms.c
View File

@@ -753,14 +753,14 @@ add_one_attribute(Attribute **attr,
return 0; return 0;
} }
int int
hx509_cms_create_signed_1(hx509_context context, hx509_cms_create_signed_1(hx509_context context,
const heim_oid *eContentType, const heim_oid *eContentType,
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_certs trust_anchors,
hx509_certs pool,
heim_octet_string *signed_data) heim_octet_string *signed_data)
{ {
hx509_name name; hx509_name name;
@@ -769,9 +769,11 @@ hx509_cms_create_signed_1(hx509_context context,
SignedData sd; SignedData sd;
int ret; int ret;
size_t size; size_t size;
hx509_path path;
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));
if (_hx509_cert_private_key(cert) == NULL) if (_hx509_cert_private_key(cert) == NULL)
return HX509_PRIVATE_KEY_MISSING; return HX509_PRIVATE_KEY_MISSING;
@@ -921,25 +923,47 @@ hx509_cms_create_signed_1(hx509_context context,
goto out; goto out;
} }
if (trust_anchors) {
ret = _hx509_calculate_path(context,
trust_anchors,
0,
cert,
pool,
&path);
if (ret) {
_hx509_path_free(&path);
ret = _hx509_path_append(&path, cert);
}
} else
ret = _hx509_path_append(&path, cert);
if (ret)
goto out;
if (path.len) {
int i;
ALLOC(sd.certificates, 1); ALLOC(sd.certificates, 1);
if (sd.certificates == NULL) { if (sd.certificates == NULL) {
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
ALLOC_SEQ(sd.certificates, 1); ALLOC_SEQ(sd.certificates, path.len);
if (sd.certificates->val == NULL) { if (sd.certificates->val == NULL) {
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
for (i = 0; i < path.len; i++) {
ASN1_MALLOC_ENCODE(Certificate, ASN1_MALLOC_ENCODE(Certificate,
sd.certificates->val[0].data, sd.certificates->val[i].data,
sd.certificates->val[0].length, sd.certificates->val[i].length,
_hx509_get_cert(cert), _hx509_get_cert(path.val[i]),
&size, ret); &size, ret);
if (ret) if (ret)
goto out; goto out;
}
}
ASN1_MALLOC_ENCODE(SignedData, ASN1_MALLOC_ENCODE(SignedData,
signed_data->data, signed_data->length, signed_data->data, signed_data->length,
@@ -950,6 +974,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:
_hx509_path_free(&path);
free_SignedData(&sd); free_SignedData(&sd);
return ret; return ret;