Adapt to new signature of hx509_cms_unenvelope.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18065 ec53bebd-3082-4978-b11e-865c3cabbd6b
2006-09-11 06:38:36 +00:00
parent 15a66286ab
commit b226d0acf5
3 changed files with 15 additions and 7 deletions
--- a/lib/hx509/ks_p12.c
+++ b/lib/hx509/ks_p12.c
@@ -258,11 +258,16 @@ envelopedData_parser(hx509_context context,

    ret = hx509_cms_unenvelope(context,
 			       _hx509_lock_unlock_certs(lock),
+			       0,
 			       data, length,
+			       NULL,
 			       &contentType,
 			       &content);
-    if (ret)
+    if (ret) {
+	hx509_set_error_string(context, HX509_ERROR_APPEND, ret, 
+			       "PKCS12 failed to unenvelope");
 	return ret;
+    }

    if (heim_oid_cmp(&contentType, oid_id_pkcs7_data()) == 0)
 	ret = parse_safe_content(context, c, content.data, content.length);