diff --git a/lib/hx509/cms.c b/lib/hx509/cms.c
index bd5a1c10e..c39eaee6f 100644
--- a/lib/hx509/cms.c
+++ b/lib/hx509/cms.c
@@ -473,6 +473,9 @@ hx509_cms_unenvelope(hx509_context context,
 	if (ret)
 	    goto out;
 	
+	if (flags & HX509_CMS_UE_ALLOW_WEAK)
+	    hx509_crypto_allow_weak(crypto);
+
 	if (params) {
 	    ret = hx509_crypto_set_params(context, crypto, params, &ivec);
 	    if (ret) {
@@ -576,6 +579,9 @@ hx509_cms_envelope_1(hx509_context context,
     if (ret)
 	goto out;
 
+    if (flags & HX509_CMS_EV_ALLOW_WEAK)
+	hx509_crypto_allow_weak(crypto);
+
     ret = hx509_crypto_set_random_key(crypto, &key);
     if (ret) {
 	hx509_set_error_string(context, 0, ret,