diff options
| -rw-r--r-- | crypto/bio/bss_file.c | 2 | ||||
| -rw-r--r-- | crypto/des/enc_read.c | 4 | ||||
| -rw-r--r-- | crypto/des/enc_writ.c | 4 | ||||
| -rw-r--r-- | crypto/ocsp/ocsp_ht.c | 3 | ||||
| -rw-r--r-- | crypto/rand/randfile.c | 7 | ||||
| -rw-r--r-- | crypto/ui/ui_openssl.c | 2 | ||||
| -rw-r--r-- | crypto/x509/by_dir.c | 4 | ||||
| -rw-r--r-- | e_os.h | 28 | ||||
| -rw-r--r-- | engines/e_aep.c | 8 |
9 files changed, 56 insertions, 6 deletions
diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c index 4df9927c43..9ad46fa081 100644 --- a/crypto/bio/bss_file.c +++ b/crypto/bio/bss_file.c @@ -279,7 +279,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) #endif { #if defined(OPENSSL_SYS_WINDOWS) - int fd = fileno((FILE*)ptr); + int fd = _fileno((FILE*)ptr); if (num & BIO_FP_TEXT) _setmode(fd,_O_TEXT); else diff --git a/crypto/des/enc_read.c b/crypto/des/enc_read.c index c70fb686b8..e7da2ec66b 100644 --- a/crypto/des/enc_read.c +++ b/crypto/des/enc_read.c @@ -147,7 +147,11 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, /* first - get the length */ while (net_num < HDRSIZE) { +#ifndef _WIN32 i=read(fd,(void *)&(net[net_num]),HDRSIZE-net_num); +#else + i=_read(fd,(void *)&(net[net_num]),HDRSIZE-net_num); +#endif #ifdef EINTR if ((i == -1) && (errno == EINTR)) continue; #endif diff --git a/crypto/des/enc_writ.c b/crypto/des/enc_writ.c index af5b8c2349..c2f032c9a6 100644 --- a/crypto/des/enc_writ.c +++ b/crypto/des/enc_writ.c @@ -153,7 +153,11 @@ int DES_enc_write(int fd, const void *_buf, int len, { /* eay 26/08/92 I was not doing writing from where we * got up to. */ +#ifndef _WIN32 i=write(fd,(void *)&(outbuf[j]),outnum-j); +#else + i=_write(fd,(void *)&(outbuf[j]),outnum-j); +#endif if (i == -1) { #ifdef EINTR diff --git a/crypto/ocsp/ocsp_ht.c b/crypto/ocsp/ocsp_ht.c index 4a04ad9aa6..6abb30b2c0 100644 --- a/crypto/ocsp/ocsp_ht.c +++ b/crypto/ocsp/ocsp_ht.c @@ -56,11 +56,12 @@ * */ -#include <openssl/asn1.h> #include <stdio.h> #include <stdlib.h> #include <ctype.h> #include <string.h> +#include "e_os.h" +#include <openssl/asn1.h> #include <openssl/ocsp.h> #include <openssl/err.h> #include <openssl/buffer.h> diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c index 61fb3e9809..d108353bbc 100644 --- a/crypto/rand/randfile.c +++ b/crypto/rand/randfile.c @@ -81,6 +81,13 @@ # include <sys/stat.h> #endif +#ifdef _WIN32 +#define stat _stat +#define chmod _chmod +#define open _open +#define fdopen _fdopen +#endif + #undef BUFSIZE #define BUFSIZE 1024 #define RAND_DATA 1024 diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 1f23a45a33..ef930bf247 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -677,6 +677,8 @@ static int noecho_fgets(char *buf, int size, FILE *tty) size--; #ifdef WIN16TTY i=_inchar(); +#elif defined(_WIN32) + i=_getch(); #else i=getch(); #endif diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c index 37f9a48206..341e0ba6a4 100644 --- a/crypto/x509/by_dir.c +++ b/crypto/x509/by_dir.c @@ -74,6 +74,10 @@ #include <openssl/lhash.h> #include <openssl/x509.h> +#ifdef _WIN32 +#define stat _stat +#endif + typedef struct lookup_dir_st { BUF_MEM *buffer; @@ -269,6 +269,7 @@ extern "C" { # define _WIN32_WINNT 0x0400 # endif # include <windows.h> +# include <stdio.h> # include <stddef.h> # include <errno.h> # include <string.h> @@ -284,13 +285,38 @@ static unsigned int _strlen31(const char *str) # endif # include <malloc.h> # if defined(_MSC_VER) && _MSC_VER<=1200 && defined(_MT) && defined(isspace) - /* compensate for bug is VC6 ctype.h */ + /* compensate for bug in VC6 ctype.h */ # undef isspace # undef isdigit # undef isalnum # undef isupper # undef isxdigit # endif +# if defined(_MSC_VER) && !defined(_DLL) && defined(stdin) +# if _MSC_VER>=1300 +# undef stdin +# undef stdout +# undef stderr + FILE *__iob_func(); +# define stdin (&__iob_func()[0]) +# define stdout (&__iob_func()[1]) +# define stderr (&__iob_func()[2]) +# elif defined(I_CAN_LIVE_WITH_LNK4049) +# undef stdin +# undef stdout +# undef stderr + /* pre-1300 has __p__iob(), but it's available only in msvcrt.lib, + * or in other words with /MD. Declaring implicit import, i.e. + * with _imp_ prefix, works correctly with all compiler options, + * but without /MD results in LINK warning LNK4049: + * 'locally defined symbol "__iob" imported'. + */ + extern FILE *_imp___iob; +# define stdin (&_imp___iob[0]) +# define stdout (&_imp___iob[1]) +# define stderr (&_imp___iob[2]) +# endif +# endif # endif # include <io.h> # include <fcntl.h> diff --git a/engines/e_aep.c b/engines/e_aep.c index ffdc354cdc..e24e4b424e 100644 --- a/engines/e_aep.c +++ b/engines/e_aep.c @@ -867,10 +867,12 @@ static AEP_RV aep_get_connection(AEP_CONNECTION_HNDL_PTR phConnection) CRYPTO_w_lock(CRYPTO_LOCK_ENGINE); -#ifndef NETWARE_CLIB - curr_pid = getpid(); -#else +#ifdef NETWARE_CLIB curr_pid = GetThreadID(); +#elif defined(_WIN32) + curr_pid = _getpid(); +#else + curr_pid = getpid(); #endif /*Check if this is the first time this is being called from the current |