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

Declare variables at the beginning of a block.

Browse Source 
Looks like this fixes the Appveyor build.
This commit is contained in:
Roland C. Dowdeswell
2019-11-19 13:10:52 +00:00
committed by Viktor Dukhovni
parent 01126367d3
commit cd297eb462
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/hx509/hxtool.c
View File

@@ -2504,9 +2504,9 @@ acert1_sans(struct acert_options *opt,
} }
} else if (gn->element == choice_GeneralName_registeredID) { } else if (gn->element == choice_GeneralName_registeredID) {
for (k = 0; k < opt->has_registeredID_san_strings.num_strings; k++) { for (k = 0; k < opt->has_registeredID_san_strings.num_strings; k++) {
s = opt->has_registeredID_san_strings.strings[k];
heim_oid oid; heim_oid oid;
s = opt->has_registeredID_san_strings.strings[k];
memset(&oid, 0, sizeof(oid)); memset(&oid, 0, sizeof(oid));
if ((ret = der_parse_heim_oid(s, NULL, &oid))) if ((ret = der_parse_heim_oid(s, NULL, &oid)))
break; break;
@@ -2854,6 +2854,7 @@ int
acert(struct acert_options *opt, int argc, char **argv) acert(struct acert_options *opt, int argc, char **argv)
{ {
hx509_cursor cursor = NULL; hx509_cursor cursor = NULL;
hx509_query *q = NULL;
hx509_certs certs = NULL; hx509_certs certs = NULL;
hx509_cert cert = NULL; hx509_cert cert = NULL;
size_t n = 0; size_t n = 0;
@@ -2871,7 +2872,6 @@ acert(struct acert_options *opt, int argc, char **argv)
hx509_err(context, 1, ret, "Could not load certificates from %s", hx509_err(context, 1, ret, "Could not load certificates from %s",
argv[0]); argv[0]);
hx509_query *q = NULL;
if (opt->expr_string) { if (opt->expr_string) {
if ((ret = hx509_query_alloc(context, &q)) || if ((ret = hx509_query_alloc(context, &q)) ||
(ret = hx509_query_match_expr(context, q, opt->expr_string))) (ret = hx509_query_match_expr(context, q, opt->expr_string)))