[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  3190d1dca43ecfd748c06aa06752de06af3768b9 (commit)
      from  a133883752af41ae20bcee8153bc52e8a4b522c8 (commit)


- Log -----------------------------------------------------------------
commit 3190d1dca43ecfd748c06aa06752de06af3768b9
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu May 31 06:51:25 2018 +0200

    apps: when the 'compat' nameopt has been set, leave it be
    
    XN_FLAG_COMPAT has a unique property, its zero for value.  This means
    it needs special treatment; if it has been set (which can only be
    determined indirectly) and set alone (*), no other flags should be
    set.
    
    (*) if any other nameopt flag has been set by the user, compatibility
    mode is blown away.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6382)

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/apps.c b/apps/apps.c
index d5a6aea..2740275 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1050,7 +1050,8 @@ int set_name_ex(unsigned long *flags, const char *arg)
     };
     if (set_multi_opts(flags, arg, ex_tbl) == 0)
         return 0;
-    if ((*flags & XN_FLAG_SEP_MASK) == 0)
+    if (*flags != XN_FLAG_COMPAT
+        && (*flags & XN_FLAG_SEP_MASK) == 0)
         *flags |= XN_FLAG_SEP_CPLUS_SPC;
     return 1;
 }