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

(cms_create_enveloped): Add support for choosing the encryption type

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17162 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-22 07:37:46 +00:00
parent d459cbb457
commit ee70aac58c
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/hx509/hxtool.c
View File

@@ -320,6 +320,7 @@ cms_create_enveloped(struct cms_envelope_options *opt, int argc, char **argv)
{
heim_octet_string o;
heim_oid contentType = { 0, NULL };
const heim_oid *enctype = NULL;
hx509_query q;
hx509_certs certs;
hx509_cert cert;
@@ -345,15 +346,22 @@ cms_create_enveloped(struct cms_envelope_options *opt, int argc, char **argv)
opt->certificate_strings.strings[i], ret);
}
if (opt->encryption_type_string) {
enctype = hx509_crypto_enctype_by_name(opt->encryption_type_string);
if (enctype == NULL)
errx(1, "encryption type: %s no found",
opt->encryption_type_string);
}
_hx509_query_clear(&q);
q.match |= HX509_QUERY_KU_ENCIPHERMENT;
ret = hx509_certs_find(context, certs, &q, &cert);
if (ret)
errx(1, "hx509_certs_find: %d", ret);
ret = hx509_cms_envelope_1(context, cert, p, sz, NULL, &contentType, &o);
ret = hx509_cms_envelope_1(context, cert, p, sz, enctype, &contentType, &o);
if (ret)
errx(1, "hx509_cms_unenvelope: %d", ret);
errx(1, "hx509_cms_envelope_1: %d", ret);
_hx509_unmap_file(p, sz);