Print <ABSENT> if a STACK is NULL.

[openssl.git] / apps / s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index d9a427897bf49d5b2e8ef913dc425980e2dbb291..2051459c3b34e2e17a87d0e2a8e11fcb4905ddda 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -90,11 +90,6 @@ typedef unsigned int u_int;
 #include <openssl/ebcdic.h>
 #endif
 
-#ifdef OPENSSL_SYS_VMS
-# include "vms_term_sock.h"
-#endif
-
-
 static int not_resumable_sess_cb(SSL *s, int is_forward_secure);
 static int sv_body(int s, int stype, unsigned char *context);
 static int www_body(int s, int stype, unsigned char *context);
@@ -937,7 +932,10 @@ int s_server_main(int argc, char *argv[])
     const char *s_cert_file = TEST_CERT, *s_key_file = NULL, *s_chain_file = NULL;
     const char *s_cert_file2 = TEST_CERT2, *s_key_file2 = NULL;
     char *s_dcert_file = NULL, *s_dkey_file = NULL, *s_dchain_file = NULL;
-    int s_tlsextstatus = 0, no_resume_ephemeral = 0;
+#ifndef OPENSSL_NO_OCSP
+    int s_tlsextstatus = 0;
+#endif
+    int no_resume_ephemeral = 0;
     unsigned int split_send_fragment = 0, max_pipelines = 0;
     const char *s_serverinfo_file = NULL;
 
@@ -1211,14 +1209,20 @@ int s_server_main(int argc, char *argv[])
             s_tlsextdebug = 1;
             break;
         case OPT_STATUS:
+#ifndef OPENSSL_NO_OCSP
             s_tlsextstatus = 1;
+#endif
             break;
         case OPT_STATUS_VERBOSE:
+#ifndef OPENSSL_NO_OCSP
             s_tlsextstatus = tlscstatp.verbose = 1;
+#endif
             break;
         case OPT_STATUS_TIMEOUT:
+#ifndef OPENSSL_NO_OCSP
             s_tlsextstatus = 1;
             tlscstatp.timeout = atoi(opt_arg());
+#endif
             break;
         case OPT_STATUS_URL:
 #ifndef OPENSSL_NO_OCSP
@@ -2012,10 +2016,6 @@ static int sv_body(int s, int stype, unsigned char *context)
 #else
     struct timeval *timeoutp;
 #endif
-#if defined(OPENSSL_SYS_VMS)            
-        int stdin_sock;
-        TerminalSocket (TERM_SOCK_CREATE, &stdin_sock);
-#endif
 
     buf = app_malloc(bufsize, "server buffer");
     if (s_nbio) {
@@ -2116,15 +2116,10 @@ static int sv_body(int s, int stype, unsigned char *context)
         SSL_set_tlsext_debug_arg(con, bio_s_out);
     }
 
-
-#if defined(OPENSSL_SYS_VMS)   
-        if (stdin_sock > s)    
-            width = stdin_sock + 1;             
-    else                       
-        width=s+1;             
-#else                 
-    width=s+1;                 
-#endif
+    if (fileno_stdin() > s)
+        width = fileno_stdin() + 1;
+    else
+        width = s + 1;
     for (;;) {
         int read_from_terminal;
         int read_from_sslcon;
@@ -2136,11 +2131,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)
-    #  if defined(OPENSSL_SYS_VMS)              
-                        openssl_fdset(stdin_sock,&readfds);             
-    #  else                    
-                        openssl_fdset(stdin),&readfds);
-    #endif
+            openssl_fdset(fileno_stdin(), &readfds);
 #endif
             openssl_fdset(s, &readfds);
             /*
@@ -2180,11 +2171,7 @@ static int sv_body(int s, int stype, unsigned char *context)
 
             if (i <= 0)
                 continue;
-#if defined(OPENSSL_SYS_VMS)            
-                        if (FD_ISSET(stdin_sock,&readfds))              
-#else
-                       if (FD_ISSET(fileno(stdin),&readfds))
-#endif
+            if (FD_ISSET(fileno_stdin(), &readfds))
                 read_from_terminal = 1;
 #endif
             if (FD_ISSET(s, &readfds))
@@ -2194,12 +2181,8 @@ static int sv_body(int s, int stype, unsigned char *context)
             if (s_crlf) {
                 int j, lf_num;
 
-       #if defined(OPENSSL_SYS_VMS)             
-                i=recv(stdin_sock, buf, bufsize/2, 0);
-       #else
-               i = raw_read_stdin(buf, bufsize / 2)
-       #endif 
-               lf_num = 0;
+                i = raw_read_stdin(buf, bufsize / 2);
+                lf_num = 0;
                 /* both loops are skipped when i <= 0 */
                 for (j = 0; j < i; j++)
                     if (buf[j] == '\n')
@@ -2214,11 +2197,8 @@ static int sv_body(int s, int stype, unsigned char *context)
                 }
                 assert(lf_num == 0);
             } else
-#if defined(OPENSSL_SYS_VMS)            
-                                i=recv(stdin_sock,buf,bufsize, 0);
-#else
-                               i = raw_read_stdin(buf, bufsize);
-#endif 
+                i = raw_read_stdin(buf, bufsize);
+
             if (!s_quiet && !s_brief) {
                 if ((i <= 0) || (buf[0] == 'Q')) {
                     BIO_printf(bio_s_out, "DONE\n");
@@ -2299,7 +2279,7 @@ static int sv_body(int s, int stype, unsigned char *context)
                     srp_callback_parm.user =
                         SRP_VBASE_get1_by_user(srp_callback_parm.vb,
                                                srp_callback_parm.login);
-                     if (srp_callback_parm.user)
+                    if (srp_callback_parm.user)
                         BIO_printf(bio_s_out, "LOOKUP done %s\n",
                                    srp_callback_parm.user->info);
                     else
@@ -2432,9 +2412,6 @@ static int sv_body(int s, int stype, unsigned char *context)
     OPENSSL_clear_free(buf, bufsize);
     if (ret >= 0)
         BIO_printf(bio_s_out, "ACCEPT\n");
-#if defined(OPENSSL_SYS_VMS)            
-        TerminalSocket (TERM_SOCK_DELETE, &stdin_sock);                 
-#endif
     (void)BIO_flush(bio_s_out);
     return (ret);
 }