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

hx509: do not crash on missing FILE: name

Browse Source
This commit is contained in:
Nicolas Williams
2019-07-03 20:09:13 -05:00
parent cc8a5c59a8
commit 63116100a8
4 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/hx509/ks_dir.c
View File

@@ -59,6 +59,12 @@ dir_init(hx509_context context,
{ {
*data = NULL; *data = NULL;
if (residue == NULL || residue[0] == '\0') {
hx509_set_error_string(context, 0, EINVAL,
"DIR file name not specified");
return EINVAL;
}
{ {
struct stat sb; struct stat sb;
int ret; int ret;

6
lib/hx509/ks_file.c
View File

@@ -384,6 +384,12 @@ file_init_common(hx509_context context,
pem_ctx.flags = flags; pem_ctx.flags = flags;
pem_ctx.c = NULL; pem_ctx.c = NULL;
if (residue == NULL || residue[0] == '\0') {
hx509_set_error_string(context, 0, EINVAL,
"PEM file name not specified");
return EINVAL;
}
*data = NULL; *data = NULL;
if (lock == NULL) if (lock == NULL)

5
lib/hx509/ks_p11.c
View File

@@ -820,6 +820,11 @@ p11_init(hx509_context context,
*data = NULL; *data = NULL;
if (residue == NULL || residue[0] == '\0') {
hx509_set_error_string(context, 0, EINVAL,
"PKCS#11 store not specified");
return EINVAL;
}
list = strdup(residue); list = strdup(residue);
if (list == NULL) if (list == NULL)
return ENOMEM; return ENOMEM;

6
lib/hx509/ks_p12.c
View File

@@ -338,6 +338,12 @@ p12_init(hx509_context context,
*data = NULL; *data = NULL;
if (residue == NULL || residue[0] == '\0') {
hx509_set_error_string(context, 0, EINVAL,
"PKCS#12 file not specified");
return EINVAL;
}
if (lock == NULL) if (lock == NULL)
lock = _hx509_empty_lock; lock = _hx509_empty_lock;