Remove redundant OPENSSL_NO_DEPRECATED suppression

[openssl.git] / apps / s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 504d3d9f0729bd8607d84c08f58e5cd4f3588683..1e407696e7f4edc3e48d4da56c362be72e4cdbd7 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -140,11 +140,6 @@
  * OTHERWISE.
  */
 
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
 
 #include <assert.h>
 #include <ctype.h>
@@ -197,10 +192,6 @@ typedef unsigned int u_int;
 #undef FIONBIO
 #endif
 
-#if defined(OPENSSL_SYS_BEOS_R5)
-#include <fcntl.h>
-#endif
-
 #ifndef OPENSSL_NO_RSA
 static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength);
 #endif
@@ -2214,7 +2205,7 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)
        KSSL_CTX *kctx;
 #endif
        struct timeval timeout;
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS_R5)
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE)
        struct timeval tv;
 #else
        struct timeval *timeoutp;
@@ -2368,7 +2359,7 @@ static int sv_body(char *hostname, 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) && !defined(OPENSSL_SYS_BEOS_R5)
+#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE)
                        openssl_fdset(fileno(stdin),&readfds);
 #endif
                        openssl_fdset(s,&readfds);
@@ -2390,17 +2381,6 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)
                        if((i < 0) || (!i && !_kbhit() ) )continue;
                        if(_kbhit())
                                read_from_terminal = 1;
-#elif defined(OPENSSL_SYS_BEOS_R5)
-                       /* Under BeOS-R5 the situation is similar to DOS */
-                       tv.tv_sec = 1;
-                       tv.tv_usec = 0;
-                       (void)fcntl(fileno(stdin), F_SETFL, O_NONBLOCK);
-                       i=select(width,(void *)&readfds,NULL,NULL,&tv);
-                       if ((i < 0) || (!i && read(fileno(stdin), buf, 0) < 0))
-                               continue;
-                       if (read(fileno(stdin), buf, 0) >= 0)
-                               read_from_terminal = 1;
-                       (void)fcntl(fileno(stdin), F_SETFL, 0);
 #else
                        if ((SSL_version(con) == DTLS1_VERSION) &&
                                DTLSv1_get_timeout(con, &timeout))