Commit 0e9035ac authored by Bodo Möller's avatar Bodo Möller
Browse files

SSL_add_dir_cert_subjects_to_stack now exists for WIN32

parent 4e5d3a7f

ssl/ssl.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -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);

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,

int	SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,

					    const char *file);

					    const char *file);

#ifndef OPENSSL_SYS_WIN32

#ifndef OPENSSL_SYS_VMS

#ifndef OPENSSL_SYS_VMS

#ifndef OPENSSL_SYS_MACINTOSH_CLASSIC /* XXXXX: Better scheme needed! [was: #ifndef MAC_OS_pre_X] */

#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,

int	SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,

					   const char *dir);

					   const char *dir);

#endif

#endif

#endif

#endif

#endif





#endif

#endif

ssl/ssl_cert.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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,

int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,

				       const char *dir)

				       const char *dir)

util/ssleay.num

+1 −1
Original line number Original line Diff line number Diff line
@@ -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_add_file_cert_subjs_to_stk          185	EXIST:VMS:FUNCTION:STDIO

SSL_set_tmp_rsa_callback                186	EXIST::FUNCTION:RSA

SSL_set_tmp_rsa_callback                186	EXIST::FUNCTION:RSA

SSL_set_tmp_dh_callback                 187	EXIST::FUNCTION:DH

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_add_dir_cert_subjs_to_stk           188	NOEXIST::FUNCTION:

SSL_set_session_id_context              189	EXIST::FUNCTION:

SSL_set_session_id_context              189	EXIST::FUNCTION:

SSL_CTX_use_certificate_chain_file      222	EXIST:!VMS:FUNCTION:STDIO

SSL_CTX_use_certificate_chain_file      222	EXIST:!VMS:FUNCTION:STDIO