diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-09-11 16:13:52 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-09-11 20:54:00 +0100 |
| commit | 01d8ae61f236d24a5a04992866d94ec10f7d69a2 (patch) | |
| tree | b0a0ac3187613df3d7c8d627629ad07c89e2f0de | |
| parent | 6ee4fc4853bda4b9163e18dadc797a870daa4519 (diff) | |
Use default field separator.
If the field separator isn't specified through -nameopt then use
XN_FLAG_SEP_CPLUS_SPC instead of printing nothing and returing an error.
PR#2397
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 03706afa30aeb4407287171a9d6f9a765395d0a2)
| -rw-r--r-- | apps/apps.c | 6 | ||||
| -rw-r--r-- | doc/apps/x509.pod | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/apps/apps.c b/apps/apps.c index 5b32c65ee6..9d20710969 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -1236,7 +1236,11 @@ int set_name_ex(unsigned long *flags, const char *arg) {"ca_default", XN_FLAG_MULTILINE, 0xffffffffL}, {NULL, 0, 0} }; - return set_multi_opts(flags, arg, ex_tbl); + if (set_multi_opts(flags, arg, ex_tbl) == 0) + return 0; + if ((*flags & XN_FLAG_SEP_MASK) == 0) + *flags |= XN_FLAG_SEP_CPLUS_SPC; + return 1; } int set_ext_copy(int *copy_type, const char *arg) diff --git a/doc/apps/x509.pod b/doc/apps/x509.pod index a24b466323..844da61f42 100644 --- a/doc/apps/x509.pod +++ b/doc/apps/x509.pod @@ -524,7 +524,8 @@ very rare and their use is discouraged). The options ending in "space" additionally place a space after the separator to make it more readable. The B<sep_multiline> uses a linefeed character for the RDN separator and a spaced B<+> for the AVA separator. It also -indents the fields by four characters. +indents the fields by four characters. If no field separator is specified +then B<sep_comma_plus_space> is used by default. =item B<dn_rev> |