[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

Dr. Stephen Henson steve at openssl.org
Fri Sep 11 19:56:56 UTC 2015

The branch OpenSSL_1_0_2-stable has been updated
       via  ce5ae63ab2f3a85795462cf91e8be3f1be013992 (commit)
      from  4dcdde120bac79979d1ce63cc652e7b53fab4f49 (commit)

- Log -----------------------------------------------------------------
commit ce5ae63ab2f3a85795462cf91e8be3f1be013992
Author: Dr. Stephen Henson <steve at 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.
    Reviewed-by: Tim Hudson <tjh at 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 7478fc3..68287b1 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1352,7 +1352,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 a1326ed..26f71c8 100644
--- a/doc/apps/x509.pod
+++ b/doc/apps/x509.pod
@@ -539,7 +539,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>

More information about the openssl-commits mailing list