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

set more error strings

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18877 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-10-24 19:58:16 +00:00
parent 77e4ca555d
commit 1186389444
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/hx509/ks_p12.c
View File

@@ -346,12 +346,16 @@ p12_init(hx509_context context,
if (der_heim_oid_cmp(&pfx.authSafe.contentType, oid_id_pkcs7_data()) != 0) { if (der_heim_oid_cmp(&pfx.authSafe.contentType, oid_id_pkcs7_data()) != 0) {
free_PKCS12_PFX(&pfx); free_PKCS12_PFX(&pfx);
ret = EINVAL; ret = EINVAL;
hx509_set_error_string(context, 0, ret,
"PKCS PFX isn't a pkcs7-data container");
goto out; goto out;
} }
if (pfx.authSafe.content == NULL) { if (pfx.authSafe.content == NULL) {
free_PKCS12_PFX(&pfx); free_PKCS12_PFX(&pfx);
ret = EINVAL; ret = EINVAL;
hx509_set_error_string(context, 0, ret,
"PKCS PFX missing data");
goto out; goto out;
} }
@@ -363,15 +367,19 @@ p12_init(hx509_context context,
&asdata, &asdata,
NULL); NULL);
free_PKCS12_PFX(&pfx); free_PKCS12_PFX(&pfx);
if (ret) if (ret) {
hx509_clear_error_string(context);
goto out; goto out;
}
ret = decode_PKCS12_AuthenticatedSafe(asdata.data, ret = decode_PKCS12_AuthenticatedSafe(asdata.data,
asdata.length, asdata.length,
&as, &as,
NULL); NULL);
der_free_octet_string(&asdata); der_free_octet_string(&asdata);
if (ret) if (ret) {
hx509_clear_error_string(context);
goto out; goto out;
}
} }
for (i = 0; i < as.len; i++) for (i = 0; i < as.len; i++)