From: Richard Levitte <levitte@openssl.org>
Date: Thu, 31 May 2018 04:51:25 +0000 (+0200)
Subject: apps: when the 'compat' nameopt has been set, leave it be
X-Git-Tag: OpenSSL_1_1_0i~96
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7e2e10aaec5461915a074aff42285916bd7da3cf;p=oweals%2Fopenssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6382)

(cherry picked from commit 3190d1dca43ecfd748c06aa06752de06af3768b9)
---

diff --git a/apps/apps.c b/apps/apps.c
index 8703d0cc31..4409dcb719 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1012,7 +1012,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;
 }