diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-03-17 12:53:11 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-17 17:06:57 -0400 |
| commit | 1fbab1dc6fcb14f512a40c5755708a8bcbf84f40 (patch) | |
| tree | a54f0b0b24b2a5af56e3f3e533e0a5c7063266bd /crypto/bio | |
| parent | 014267f68ce98cfe61df4574552043fbbd144a1f (diff) | |
| download | openssl-1fbab1dc6fcb14f512a40c5755708a8bcbf84f40.tar.gz | |
Remove Netware and OS/2
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/b_sock.c | 24 | ||||
| -rw-r--r-- | crypto/bio/bss_file.c | 21 | ||||
| -rw-r--r-- | crypto/bio/bss_sock.c | 2 |
3 files changed, 4 insertions, 43 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index 50bd27dabd..046de99190 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -72,7 +72,7 @@ NETDB_DEFINE_CONTEXT # else # define MAX_LISTEN 32 # endif -# if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)) +# if defined(OPENSSL_SYS_WINDOWS) static int wsa_init_done = 0; # endif @@ -202,23 +202,6 @@ int BIO_sock_init(void) return (-1); # endif -# if defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK) - WORD wVerReq; - WSADATA wsaData; - int err; - - if (!wsa_init_done) { - wsa_init_done = 1; - wVerReq = MAKEWORD(2, 0); - err = WSAStartup(wVerReq, &wsaData); - if (err != 0) { - SYSerr(SYS_F_WSASTARTUP, err); - BIOerr(BIO_F_BIO_SOCK_INIT, BIO_R_WSASTARTUP); - return (-1); - } - } -# endif - return (1); } @@ -229,11 +212,6 @@ void BIO_sock_cleanup(void) wsa_init_done = 0; WSACleanup(); } -# elif defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK) - if (wsa_init_done) { - wsa_init_done = 0; - WSACleanup(); - } # endif } diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c index 2689a283b8..d53d52bd14 100644 --- a/crypto/bio/bss_file.c +++ b/crypto/bio/bss_file.c @@ -87,10 +87,6 @@ # include "bio_lcl.h" # include <openssl/err.h> -# if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB) -# include <nwfileio.h> -# endif - # if !defined(OPENSSL_NO_STDIO) static int file_write(BIO *h, const char *buf, int num); @@ -331,13 +327,6 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr) _setmode(fd, _O_TEXT); else _setmode(fd, _O_BINARY); -# elif defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB) - int fd = fileno((FILE *)ptr); - /* Under CLib there are differences in file modes */ - if (num & BIO_FP_TEXT) - setmode(fd, O_TEXT); - else - setmode(fd, O_BINARY); # elif defined(OPENSSL_SYS_MSDOS) int fd = fileno((FILE *)ptr); /* Set correct text/binary mode */ @@ -351,7 +340,7 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr) } else _setmode(fd, _O_BINARY); } -# elif defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_WIN32_CYGWIN) +# elif defined(OPENSSL_SYS_WIN32_CYGWIN) int fd = fileno((FILE *)ptr); if (num & BIO_FP_TEXT) setmode(fd, O_TEXT); @@ -379,13 +368,7 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr) ret = 0; break; } -# if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_WIN32_CYGWIN) - if (!(num & BIO_FP_TEXT)) - strcat(p, "b"); - else - strcat(p, "t"); -# endif -# if defined(OPENSSL_SYS_NETWARE) +# if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32_CYGWIN) if (!(num & BIO_FP_TEXT)) strcat(p, "b"); else diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c index 428c514e31..8d87c8c338 100644 --- a/crypto/bio/bss_sock.c +++ b/crypto/bio/bss_sock.c @@ -222,7 +222,7 @@ int BIO_sock_should_retry(int i) int BIO_sock_non_fatal_error(int err) { switch (err) { -# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_NETWARE) +# if defined(OPENSSL_SYS_WINDOWS) # if defined(WSAEWOULDBLOCK) case WSAEWOULDBLOCK: # endif |