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 /apps | |
parent | 014267f68ce98cfe61df4574552043fbbd144a1f (diff) |
Remove Netware and OS/2
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/apps.c | 24 | ||||
-rw-r--r-- | apps/apps.h | 4 | ||||
-rw-r--r-- | apps/ca.c | 2 | ||||
-rw-r--r-- | apps/opt.c | 7 | ||||
-rw-r--r-- | apps/s_apps.h | 4 | ||||
-rw-r--r-- | apps/s_client.c | 19 | ||||
-rw-r--r-- | apps/s_server.c | 19 | ||||
-rw-r--r-- | apps/speed.c | 6 |
8 files changed, 12 insertions, 73 deletions
diff --git a/apps/apps.c b/apps/apps.c index c76e3e345d..694d090158 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -2203,30 +2203,6 @@ double app_tminterval(int stop, int usertime) return (ret); } -#elif defined(OPENSSL_SYS_NETWARE) -# include <time.h> - -double app_tminterval(int stop, int usertime) -{ - static clock_t tmstart; - static int warning = 1; - double ret = 0; - - if (usertime && warning) { - BIO_printf(bio_err, "To get meaningful results, run " - "this program on idle system.\n"); - warning = 0; - } - - if (stop == TM_START) - tmstart = clock(); - else - ret = (clock() - tmstart) / (double)CLOCKS_PER_SEC; - - return (ret); -} - - #elif defined(OPENSSL_SYSTEM_VXWORKS) # include <time.h> diff --git a/apps/apps.h b/apps/apps.h index 3d146b10d8..e7ea46181c 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -128,9 +128,7 @@ # include <openssl/ocsp.h> # endif # include <openssl/ossl_typ.h> -# ifndef OPENSSL_SYS_NETWARE -# include <signal.h> -# endif +# include <signal.h> # if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE) # define openssl_fdset(a,b) FD_SET((unsigned int)a, b) @@ -81,7 +81,7 @@ # else # include <unixlib.h> # endif -# elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_NETWARE) +# elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS) # include <sys/file.h> # endif #endif diff --git a/apps/opt.c b/apps/opt.c index 3525b969c6..f4eba2dca0 100644 --- a/apps/opt.c +++ b/apps/opt.c @@ -78,7 +78,7 @@ static char prog[40]; /* * Return the simple name of the program; removing various platform gunk. */ -#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_NETWARE) +#if defined(OPENSSL_SYS_WIN32) char *opt_progname(const char *argv0) { size_t i, n; @@ -97,11 +97,6 @@ char *opt_progname(const char *argv0) if (n > 4 && (strcmp(&p[n - 4], ".exe") == 0 || strcmp(&p[n - 4], ".EXE") == 0)) n -= 4; -#if defined(OPENSSL_SYS_NETWARE) - if (n > 4 && - (strcmp(&p[n - 4], ".nlm") == 0 || strcmp(&p[n - 4], ".NLM") == 0)) - n -= 4; -#endif /* Copy over the name, in lowercase. */ if (n > sizeof prog - 1) diff --git a/apps/s_apps.h b/apps/s_apps.h index c000aa13d2..b029635912 100644 --- a/apps/s_apps.h +++ b/apps/s_apps.h @@ -107,10 +107,6 @@ * Hudson (tjh@cryptsoft.com). * */ -/* conflicts with winsock2 stuff on netware */ -#if !defined(OPENSSL_SYS_NETWARE) -# include <sys/types.h> -#endif #include <openssl/opensslconf.h> #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) diff --git a/apps/s_client.c b/apps/s_client.c index 20ede4b188..9f8a3c9181 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -906,7 +906,7 @@ int s_client_main(int argc, char **argv) ENGINE *ssl_client_engine = NULL; #endif ENGINE *e = NULL; -#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) +#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) struct timeval tv; #endif char *servername = NULL; @@ -2210,7 +2210,7 @@ int s_client_main(int argc, char **argv) ssl_pending = read_ssl && SSL_has_pending(con); if (!ssl_pending) { -#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE) +#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) if (tty_on) { if (read_tty) openssl_fdset(fileno(stdin), &readfds); @@ -2268,17 +2268,6 @@ int s_client_main(int argc, char **argv) i = select(width, (void *)&readfds, (void *)&writefds, NULL, timeoutp); } -#elif defined(OPENSSL_SYS_NETWARE) - if (!write_tty) { - if (read_tty) { - tv.tv_sec = 1; - tv.tv_usec = 0; - i = select(width, (void *)&readfds, (void *)&writefds, - NULL, &tv); - } else - i = select(width, (void *)&readfds, (void *)&writefds, - NULL, timeoutp); - } #else i = select(width, (void *)&readfds, (void *)&writefds, NULL, timeoutp); @@ -2360,7 +2349,7 @@ int s_client_main(int argc, char **argv) goto shut; } } -#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) +#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) /* Assume Windows/DOS/BeOS can always write */ else if (!ssl_pending && write_tty) #else @@ -2455,8 +2444,6 @@ int s_client_main(int argc, char **argv) || (WAIT_OBJECT_0 == WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0))) # endif -#elif defined (OPENSSL_SYS_NETWARE) - else if (_kbhit()) #else else if (FD_ISSET(fileno(stdin), &readfds)) #endif diff --git a/apps/s_server.c b/apps/s_server.c index e77f2f4fa7..e660eecaa1 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -147,11 +147,6 @@ #include <openssl/e_os2.h> -/* conflicts with winsock2 stuff on netware */ -#if !defined(OPENSSL_SYS_NETWARE) -# include <sys/types.h> -#endif - /* * With IPv6, it looks like Digital has mixed up the proper order of * recursive header file inclusion, resulting in the compiler complaining @@ -2112,7 +2107,7 @@ static int sv_body(int s, int stype, unsigned char *context) SSL *con = NULL; BIO *sbio; struct timeval timeout; -#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) +#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) struct timeval tv; #else struct timeval *timeoutp; @@ -2228,7 +2223,7 @@ static int sv_body(int s, int stype, unsigned char *context) if (!read_from_sslcon) { FD_ZERO(&readfds); -#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE) +#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) openssl_fdset(fileno(stdin), &readfds); #endif openssl_fdset(s, &readfds); @@ -2239,7 +2234,7 @@ static int sv_body(int s, int stype, unsigned char *context) * if you do have a cast then you can either go for (int *) or * (void *). */ -#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) +#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) /* * Under DOS (non-djgpp) and Windows we can't select on stdin: * only on sockets. As a workaround we timeout the select every @@ -2793,9 +2788,7 @@ static int www_body(int s, int stype, unsigned char *context) continue; } #endif -#if defined(OPENSSL_SYS_NETWARE) - delay(1000); -#elif !defined(OPENSSL_SYS_MSDOS) +#if !defined(OPENSSL_SYS_MSDOS) sleep(1); #endif continue; @@ -3186,9 +3179,7 @@ static int rev_body(int s, int stype, unsigned char *context) continue; } #endif -#if defined(OPENSSL_SYS_NETWARE) - delay(1000); -#elif !defined(OPENSSL_SYS_MSDOS) +#if !defined(OPENSSL_SYS_MSDOS) sleep(1); #endif continue; diff --git a/apps/speed.c b/apps/speed.c index b6843ec38e..230ed62e04 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -91,10 +91,6 @@ # include OPENSSL_UNISTD #endif -#ifndef OPENSSL_SYS_NETWARE -# include <signal.h> -#endif - #if defined(_WIN32) # include <windows.h> #endif @@ -165,7 +161,7 @@ #include <openssl/modes.h> #ifndef HAVE_FORK -# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE) +# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) # define HAVE_FORK 0 # else # define HAVE_FORK 1 |