From fdc1215ebe5182b5e2cd7afb01377a6d2e5d5781 Mon Sep 17 00:00:00 2001
From: jkim <jkim@FreeBSD.org>
Date: Thu, 3 Dec 2015 21:18:48 +0000
Subject: Merge OpenSSL 1.0.1q.

---
 crypto/openssl/apps/apps.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'crypto/openssl/apps/apps.c')

diff --git a/crypto/openssl/apps/apps.c b/crypto/openssl/apps/apps.c
index 6801238..8ab4833 100644
--- a/crypto/openssl/apps/apps.c
+++ b/crypto/openssl/apps/apps.c
@@ -119,9 +119,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if !defined(OPENSSL_SYSNAME_WIN32) && !defined(NETWARE_CLIB)
-# include <strings.h>
-#endif
 #include <sys/types.h>
 #include <ctype.h>
 #include <errno.h>
@@ -1247,7 +1244,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)
-- 
cgit v1.1