diff options
| -rw-r--r-- | crypto/bio/bss_log.c | 3 | ||||
| -rw-r--r-- | crypto/des/read_pwd.c | 6 | ||||
| -rw-r--r-- | e_os.h | 9 | ||||
| -rwxr-xr-x | util/libeay.num | 1 | ||||
| -rwxr-xr-x | util/mkdef.pl | 2 | ||||
| -rwxr-xr-x | util/ssleay.num | 3 |
6 files changed, 16 insertions, 8 deletions
diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index 4ec76fa742..ce6401efb3 100644 --- a/crypto/bio/bss_log.c +++ b/crypto/bio/bss_log.c @@ -62,7 +62,6 @@ */ -#if !defined(WIN32) || defined(WINNT) #include <stdio.h> #include <errno.h> @@ -74,6 +73,8 @@ #include "cryptlib.h" #include "buffer.h" #include "err.h" +#ifndef NO_SYSLOG + #ifndef NOPROTO static int MS_CALLBACK slg_write(BIO *h,char *buf,int num); diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c index edfa456a43..1dffe083ac 100644 --- a/crypto/des/read_pwd.c +++ b/crypto/des/read_pwd.c @@ -63,13 +63,9 @@ #include <graph.h> #endif -#if defined(WIN32) && !defined(WINNT) -#define WIN_CONSOLE_BUG -#endif - - /* 06-Apr-92 Luke Brennan Support for VMS */ #include "des_locl.h" +#include "cryptlib.h" #include <signal.h> #include <string.h> #include <setjmp.h> @@ -102,6 +102,9 @@ extern "C" { #ifdef WIN32 #define get_last_sys_error() GetLastError() #define clear_sys_error() SetLastError(0) +#if !defined(WINNT) +#define WIN_CONSOLE_BUG +#endif #else #define get_last_sys_error() errno #define clear_sys_error() errno=0 @@ -143,6 +146,12 @@ extern "C" { #ifndef S_IFMT #define S_IFMT _S_IFMT + +#if !defined(WINNT) +#define NO_SYSLOG +#define NO_DIRENT +#endif + #endif #define strncasecmp(a,b,c) strnicmp((a),(b),(c)) diff --git a/util/libeay.num b/util/libeay.num index 808ba3e28a..aa235405c0 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -1218,3 +1218,4 @@ BIO_s_log 1243 BIO_f_reliable 1244 PKCS7_dataFinal 1245 PKCS7_dataDecode 1246 +X509V3_EXT_CRL_add_conf 1247 diff --git a/util/mkdef.pl b/util/mkdef.pl index eec80df99e..77b4763015 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -235,7 +235,7 @@ sub do_line { return(undef); } elsif ($W32 && /BIO_new_fp_internal/) { return(undef); } - elsif (/SSL_add_cert_dir_to_stack/) + elsif (/SSL_add_dir_cert_subjects_to_stack/) { return(undef); } elsif (!$NT && /BIO_s_log/) { return(undef); } diff --git a/util/ssleay.num b/util/ssleay.num index 2396e070e3..e45ca28979 100755 --- a/util/ssleay.num +++ b/util/ssleay.num @@ -164,6 +164,7 @@ SSL_CTX_set_cert_store 181 SSL_want 182 SSL_library_init 183 SSL_COMP_add_compression_method 184 -SSL_add_cert_file_to_stack 185 +SSL_add_file_cert_subjects_to_stack 185 SSL_set_tmp_rsa_callback 186 SSL_set_tmp_dh_callback 187 +SSL_add_dir_cert_subjects_to_stack 188 |