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

Allow hxtool to process multiple --pk-init-principal args.

Browse Source
This commit is contained in:
Roland C. Dowdeswell
2012-04-05 20:20:19 +01:00
parent eee3333b76
commit 67d9094665
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hx509/hxtool-commands.in
View File

@@ -646,7 +646,7 @@ command = {
} }
option = { option = {
long = "pk-init-principal" long = "pk-init-principal"
type = "string" type = "strings"
help = "PK-INIT principal (for SAN)" help = "PK-INIT principal (for SAN)"
} }
option = { option = {

7
lib/hx509/hxtool.c
View File

@@ -1692,12 +1692,13 @@ eval_types(hx509_context contextp,
} }
} }
if (opt->pk_init_principal_string) { for (i = 0; i < opt->pk_init_principal_strings.num_strings; i++) {
const char *pk_init_princ = opt->pk_init_principal_strings.strings[i];
if (!ctopt.pkinit) if (!ctopt.pkinit)
errx(1, "pk-init principal given but no pk-init oid"); errx(1, "pk-init principal given but no pk-init oid");
ret = hx509_ca_tbs_add_san_pkinit(contextp, tbs, ret = hx509_ca_tbs_add_san_pkinit(contextp, tbs, pk_init_princ);
opt->pk_init_principal_string);
if (ret) if (ret)
hx509_err(contextp, 1, ret, "hx509_ca_tbs_add_san_pkinit"); hx509_err(contextp, 1, ret, "hx509_ca_tbs_add_san_pkinit");
} }