diff options
| author | jkim <jkim@FreeBSD.org> | 2015-12-03 21:18:48 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-12-03 21:18:48 +0000 |
| commit | fdc1215ebe5182b5e2cd7afb01377a6d2e5d5781 (patch) | |
| tree | 96586bfb12cf0a48212a27e95bfcefd19843fef0 /crypto/openssl/apps/apps.c | |
| parent | 68a4f44cfaf14b23814241e38f291d7c61c65198 (diff) | |
| download | FreeBSD-src-fdc1215ebe5182b5e2cd7afb01377a6d2e5d5781.zip FreeBSD-src-fdc1215ebe5182b5e2cd7afb01377a6d2e5d5781.tar.gz | |
Merge OpenSSL 1.0.1q.
Diffstat (limited to 'crypto/openssl/apps/apps.c')
| -rw-r--r-- | crypto/openssl/apps/apps.c | 9 |
1 files changed, 5 insertions, 4 deletions
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) |
