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

sprinkle more _krb5_pk_copy_error

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19297 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-12-08 02:48:09 +00:00
parent c2633ac58b
commit 90832c9d52
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/krb5/pkinit.c
View File

@@ -152,16 +152,22 @@ _krb5_pk_create_sign(krb5_context context,
int ret; int ret;
ret = hx509_query_alloc(id->hx509ctx, &q); ret = hx509_query_alloc(id->hx509ctx, &q);
if (ret) if (ret) {
_krb5_pk_copy_error(context, id->hx509ctx, ret,
"Allocate query to find signing certificate");
return ret; return ret;
}
hx509_query_match_option(q, HX509_QUERY_OPTION_PRIVATE_KEY); hx509_query_match_option(q, HX509_QUERY_OPTION_PRIVATE_KEY);
hx509_query_match_option(q, HX509_QUERY_OPTION_KU_DIGITALSIGNATURE); hx509_query_match_option(q, HX509_QUERY_OPTION_KU_DIGITALSIGNATURE);
ret = hx509_certs_find(id->hx509ctx, id->certs, q, &cert); ret = hx509_certs_find(id->hx509ctx, id->certs, q, &cert);
hx509_query_free(id->hx509ctx, q); hx509_query_free(id->hx509ctx, q);
if (ret) if (ret) {
_krb5_pk_copy_error(context, id->hx509ctx, ret,
"Find certificate to signed CMS data");
return ret; return ret;
}
ret = hx509_cms_create_signed_1(id->hx509ctx, ret = hx509_cms_create_signed_1(id->hx509ctx,
eContentType, eContentType,
@@ -173,6 +179,8 @@ _krb5_pk_create_sign(krb5_context context,
NULL, NULL,
id->certs, id->certs,
sd_data); sd_data);
if (ret)
_krb5_pk_copy_error(context, id->hx509ctx, ret, "create CMS signedData");
hx509_cert_free(cert); hx509_cert_free(cert);
return ret; return ret;
@@ -716,7 +724,8 @@ _krb5_pk_verify_sign(krb5_context context,
ret = hx509_get_one_cert(id->hx509ctx, signer_certs, &(*signer)->cert); ret = hx509_get_one_cert(id->hx509ctx, signer_certs, &(*signer)->cert);
if (ret) { if (ret) {
krb5_clear_error_string(context); _krb5_pk_copy_error(context, id->hx509ctx, ret,
"Failed to get on of the signer certs");
goto out; goto out;
} }
@@ -956,8 +965,11 @@ pk_rd_pa_reply_enckey(krb5_context context,
NULL, NULL,
&contentType, &contentType,
&content); &content);
if (ret) if (ret) {
_krb5_pk_copy_error(context, ctx->id->hx509ctx, ret,
"Failed to unenvelope CMS data in PK-INIT reply");
return ret; return ret;
}
p = content.data; p = content.data;
length = content.length; length = content.length;