From: Bodo Möller <bodo@openssl.org>
Date: Wed, 5 Feb 2003 16:40:29 +0000 (+0000)
Subject: SSL_add_dir_cert_subjects_to_stack now exists for WIN32
X-Git-Tag: BEN_FIPS_TEST_1~38^2~335
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0e9035ac98383d5758a4376ddde4aafdb3162b85;p=oweals%2Fopenssl.git

SSL_add_dir_cert_subjects_to_stack now exists for WIN32
---

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 5177a8a126..466b8a7122 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1241,14 +1241,12 @@ int	SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file); /* PEM t
 STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
 int	SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
 					    const char *file);
-#ifndef OPENSSL_SYS_WIN32
 #ifndef OPENSSL_SYS_VMS
 #ifndef OPENSSL_SYS_MACINTOSH_CLASSIC /* XXXXX: Better scheme needed! [was: #ifndef MAC_OS_pre_X] */
 int	SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
 					   const char *dir);
 #endif
 #endif
-#endif
 
 #endif
 
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index b0e20ed941..144b90dd17 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -810,7 +810,7 @@ err:
 #endif
 #endif
 
-#else
+#else /* OPENSSL_SYS_WIN32 */
 
 int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
 				       const char *dir)
diff --git a/util/ssleay.num b/util/ssleay.num
index d027a1c45a..7c15d0f05a 100755
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -169,7 +169,7 @@ SSL_add_file_cert_subjects_to_stack     185	EXIST:!VMS:FUNCTION:STDIO
 SSL_add_file_cert_subjs_to_stk          185	EXIST:VMS:FUNCTION:STDIO
 SSL_set_tmp_rsa_callback                186	EXIST::FUNCTION:RSA
 SSL_set_tmp_dh_callback                 187	EXIST::FUNCTION:DH
-SSL_add_dir_cert_subjects_to_stack      188	EXIST:!VMS,!WIN32:FUNCTION:STDIO
+SSL_add_dir_cert_subjects_to_stack      188	EXIST:!VMS:FUNCTION:STDIO
 SSL_add_dir_cert_subjs_to_stk           188	NOEXIST::FUNCTION:
 SSL_set_session_id_context              189	EXIST::FUNCTION:
 SSL_CTX_use_certificate_chain_file      222	EXIST:!VMS:FUNCTION:STDIO