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

add allow weak crypto flag

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24960 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-03-26 23:12:35 +00:00
parent 7c796daa23
commit f7a8d0bc32
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/hx509/hxtool.c
View File

@@ -466,6 +466,7 @@ cms_unenvelope(struct cms_unenvelope_options *opt, int argc, char **argv)
void *p; void *p;
int ret; int ret;
hx509_lock lock; hx509_lock lock;
int flags = 0;
hx509_lock_init(context, &lock); hx509_lock_init(context, &lock);
lock_strings(lock, &opt->pass_strings); lock_strings(lock, &opt->pass_strings);
@@ -498,7 +499,10 @@ cms_unenvelope(struct cms_unenvelope_options *opt, int argc, char **argv)
certs_strings(context, "store", certs, lock, &opt->certificate_strings); certs_strings(context, "store", certs, lock, &opt->certificate_strings);
ret = hx509_cms_unenvelope(context, certs, 0, co.data, co.length, if (opt->allow_weak_crypto_flag)
flags |= HX509_CMS_UE_ALLOW_WEAK;
ret = hx509_cms_unenvelope(context, certs, flags, co.data, co.length,
NULL, 0, &contentType, &o); NULL, 0, &contentType, &o);
if (co.data != p) if (co.data != p)
der_free_octet_string(&co); der_free_octet_string(&co);
@@ -532,6 +536,7 @@ cms_create_enveloped(struct cms_envelope_options *opt, int argc, char **argv)
size_t sz; size_t sz;
void *p; void *p;
hx509_lock lock; hx509_lock lock;
int flags = 0;
memset(&contentType, 0, sizeof(contentType)); memset(&contentType, 0, sizeof(contentType));
@@ -547,6 +552,9 @@ cms_create_enveloped(struct cms_envelope_options *opt, int argc, char **argv)
certs_strings(context, "store", certs, lock, &opt->certificate_strings); certs_strings(context, "store", certs, lock, &opt->certificate_strings);
if (opt->allow_weak_crypto_flag)
flags |= HX509_CMS_EV_ALLOW_WEAK;
if (opt->encryption_type_string) { if (opt->encryption_type_string) {
enctype = hx509_crypto_enctype_by_name(opt->encryption_type_string); enctype = hx509_crypto_enctype_by_name(opt->encryption_type_string);
if (enctype == NULL) if (enctype == NULL)