wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use default field separator.

Browse source 
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 03706afa30)
This commit is contained in:
Dr. Stephen Henson 2015-09-11 16:13:52 +01:00
parent 4cb23e12a3
commit 8b5ac90e5e
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/apps.c
View file

@ -1247,7 +1247,11 @@ int set_name_ex(unsigned long *flags, const char *arg)
{"ca_default", XN_FLAG_MULTILINE, 0xffffffffL}, {"ca_default", XN_FLAG_MULTILINE, 0xffffffffL},
{NULL, 0, 0} {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) int set_ext_copy(int *copy_type, const char *arg)

3
doc/apps/x509.pod
View file

@ -529,7 +529,8 @@ very rare and their use is discouraged). The options ending in
"space" additionally place a space after the separator to make it "space" additionally place a space after the separator to make it
more readable. The B<sep_multiline> uses a linefeed character for more readable. The B<sep_multiline> uses a linefeed character for
the RDN separator and a spaced B<+> for the AVA separator. It also 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> =item B<dn_rev>