Adapt to new signature of hx509_cms_unenvelope.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18065 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -325,12 +325,12 @@ cms_unenvelope(struct cms_unenvelope_options *opt, int argc, char **argv)
|
||||
opt->certificate_strings.strings[i], ret);
|
||||
}
|
||||
|
||||
ret = hx509_cms_unenvelope(context, certs, co.data, co.length,
|
||||
&contentType, &o);
|
||||
ret = hx509_cms_unenvelope(context, certs, 0, co.data, co.length,
|
||||
NULL, &contentType, &o);
|
||||
if (co.data != p)
|
||||
free_octet_string(&co);
|
||||
if (ret)
|
||||
errx(1, "hx509_cms_unenvelope: %d", ret);
|
||||
hx509_err(context, 1, ret, "hx509_cms_unenvelope");
|
||||
|
||||
_hx509_unmap_file(p, sz);
|
||||
hx509_lock_free(lock);
|
||||
@@ -371,8 +371,8 @@ cms_create_enveloped(struct cms_envelope_options *opt, int argc, char **argv)
|
||||
ret = hx509_certs_append(context, certs, lock,
|
||||
opt->certificate_strings.strings[i]);
|
||||
if (ret)
|
||||
errx(1, "hx509_certs_append: certs: %s: %d",
|
||||
opt->certificate_strings.strings[i], ret);
|
||||
hx509_err(context, 1, ret, "hx509_certs_append: certs: %s: %d",
|
||||
opt->certificate_strings.strings[i], ret);
|
||||
}
|
||||
|
||||
if (opt->encryption_type_string) {
|
||||
@@ -614,7 +614,8 @@ pcert_verify(struct verify_options *opt, int argc, char **argv)
|
||||
|
||||
ret = hx509_certs_append(context, certs, NULL, s);
|
||||
if (ret)
|
||||
errx(1, "hx509_certs_append: certs: %s: %d", s, ret);
|
||||
hx509_err(context, 1, ret, "hx509_certs_append: certs: %s: %d",
|
||||
s, ret);
|
||||
|
||||
} else if (strncmp(s, "crl:", 4) == 0) {
|
||||
s += 4;
|
||||
|
@@ -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);
|
||||
|
@@ -926,8 +926,10 @@ pk_rd_pa_reply_enckey(krb5_context context,
|
||||
|
||||
ret = hx509_cms_unenvelope(ctx->id->hx509ctx,
|
||||
ctx->id->certs,
|
||||
HX509_CMS_UE_DONT_REQUIRE_KU_ENCIPHERMENT,
|
||||
rep->content->data,
|
||||
rep->content->length,
|
||||
NULL,
|
||||
&contentType,
|
||||
&content);
|
||||
if (ret)
|
||||
|
Reference in New Issue
Block a user