SSL_add_dir_cert_subjects_to_stack now exists for WIN32

diff --git a/ssl/ssl.h b/ssl/ssl.h
index f8e400d2ef0eed49984e5e60730f2c9458063c67..fe6ad6593e73ff86a5df9fb8f5a8d2841a12ed9a 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1227,14 +1227,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 1f122559ba1428f15a86638bb09eb9ececd04aa5..da90078a378b68269d9839cfb4d1cc643785e1cb 100644 (file)
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -781,7 +781,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 fdea47205ddd6670409ef9f0c5fc063b09d6a228..46e38a131f9938bd5980a6696398446484b33ee7 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_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