SSL_add_dir_cert_subjects_to_stack now exists for WIN32

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 5177a8a126309e1c6d33f25e71dc1059cff13fcb..466b8a712281f9fd0d28c9d38e84d012fadc3bd6 100644 (file)
--- 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);
 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
 #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
 
 
 #endif
 

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index b0e20ed9417c4de22c5185da1bdcd286d7c86ccd..144b90dd17bd3d7da8cee444888d17b042f6ced4 100644 (file)
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -810,7 +810,7 @@ err:
 #endif
 #endif
 
 #endif
 #endif
 

-#else
+#else /* OPENSSL_SYS_WIN32 */

 
 int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
                                       const char *dir)
 
 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 d027a1c45a5f93133ed6d3c5b5c2ccccd4413678..7c15d0f05a3c339356235d128a335460e3a712b2 100755 (executable)
--- 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_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
 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