The branch OpenSSL_1_0_1-stable has been updated via 8b5ac90e5eb3343ddf768f64a2cf975a14d21387 (commit) from 4cb23e12a300b64dd997ca00cee75cde8925df05 (commit)
- Log ----------------------------------------------------------------- commit 8b5ac90e5eb3343ddf768f64a2cf975a14d21387 Author: Dr. Stephen Henson <st...@openssl.org> Date: Fri Sep 11 16:13:52 2015 +0100 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 <t...@openssl.org> (cherry picked from commit 03706afa30aeb4407287171a9d6f9a765395d0a2) ----------------------------------------------------------------------- Summary of changes: apps/apps.c | 6 +++++- doc/apps/x509.pod | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/apps.c b/apps/apps.c index 6801238..1e48307 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -1247,7 +1247,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 6109389..1bb0550 100644 --- a/doc/apps/x509.pod +++ b/doc/apps/x509.pod @@ -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 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> _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits