New options to the -verify program which can be used for chain verification.
[openssl.git] / apps / s_client.c
index 1fa1575..60a8728 100644 (file)
  * [including the GNU Public Licence.]
  */
 
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef NO_STDIO
+#define APPS_WIN16
+#endif
+
 /* With IPv6, it looks like Digital has mixed up the proper order of
    recursive header file inclusion, resulting in the compiler complaining
    that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
    is needed to have fileno() declared correctly...  So let's define u_int */
-#if defined(__DECC) && !defined(__U_INT)
+#if defined(VMS) && defined(__DECC) && !defined(__U_INT)
 #define __U_INT
 typedef unsigned int u_int;
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #define USE_SOCKETS
-#ifdef NO_STDIO
-#define APPS_WIN16
-#endif
 #include "apps.h"
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
@@ -79,6 +81,11 @@ typedef unsigned int u_int;
 #include <openssl/pem.h>
 #include "s_apps.h"
 
+#ifdef WINDOWS
+#include <conio.h>
+#endif
+
+
 #if (defined(VMS) && __VMS_VER < 70000000)
 /* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #undef FIONBIO
@@ -138,6 +145,7 @@ static void sc_usage(void)
 #ifdef FIONBIO
        BIO_printf(bio_err," -nbio         - Run with non-blocking IO\n");
 #endif
+       BIO_printf(bio_err," -crlf         - convert LF from terminal into CRLF\n");
        BIO_printf(bio_err," -quiet        - no s_client output\n");
        BIO_printf(bio_err," -ssl2         - just use SSLv2\n");
        BIO_printf(bio_err," -ssl3         - just use SSLv3\n");
@@ -164,12 +172,15 @@ int MAIN(int argc, char **argv)
        char *cert_file=NULL,*key_file=NULL;
        char *CApath=NULL,*CAfile=NULL,*cipher=NULL;
        int reconnect=0,badop=0,verify=SSL_VERIFY_NONE,bugs=0;
+       int crlf=0;
        int write_tty,read_tty,write_ssl,read_ssl,tty_on,ssl_pending;
        SSL_CTX *ctx=NULL;
        int ret=1,in_init=1,i,nbio_test=0;
        SSL_METHOD *meth=NULL;
        BIO *sbio;
-       /*static struct timeval timeout={10,0};*/
+#ifdef WINDOWS
+       struct timeval tv;
+#endif
 
 #if !defined(NO_SSL2) && !defined(NO_SSL3)
        meth=SSLv23_client_method();
@@ -234,6 +245,8 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        cert_file= *(++argv);
                        }
+               else if (strcmp(*argv,"-crlf") == 0)
+                       crlf=1;
                else if (strcmp(*argv,"-quiet") == 0)
                        c_quiet=1;
                else if (strcmp(*argv,"-pause") == 0)
@@ -310,6 +323,8 @@ bad:
                goto end;
                }
 
+       app_RAND_load_file(NULL, bio_err, 0);
+
        if (bio_c_out == NULL)
                {
                if (c_quiet)
@@ -459,12 +474,18 @@ re_start:
                                if (read_tty)  FD_SET(fileno(stdin),&readfds);
                                if (write_tty) FD_SET(fileno(stdout),&writefds);
                                }
-#endif
                        if (read_ssl)
                                FD_SET(SSL_get_fd(con),&readfds);
                        if (write_ssl)
                                FD_SET(SSL_get_fd(con),&writefds);
-
+#else
+                       if(!tty_on || !write_tty) {
+                               if (read_ssl)
+                                       FD_SET(SSL_get_fd(con),&readfds);
+                               if (write_ssl)
+                                       FD_SET(SSL_get_fd(con),&writefds);
+                       }
+#endif
 /*                     printf("mode tty(%d %d%d) ssl(%d%d)\n",
                                tty_on,read_tty,write_tty,read_ssl,write_ssl);*/
 
@@ -474,8 +495,28 @@ re_start:
                         * will choke the compiler: if you do have a cast then
                         * you can either go for (int *) or (void *).
                         */
+#ifdef WINDOWS
+                       /* Under Windows we make the assumption that we can
+                        * always write to the tty: therefore if we need to
+                        * write to the tty we just fall through. Otherwise
+                        * we timeout the select every second and see if there
+                        * are any keypresses. Note: this is a hack, in a proper
+                        * Windows application we wouldn't do this.
+                        */
+                       if(!write_tty) {
+                               if(read_tty) {
+                                       tv.tv_sec = 1;
+                                       tv.tv_usec = 0;
+                                       i=select(width,(void *)&readfds,(void *)&writefds,
+                                                NULL,&tv);
+                                       if(!i && (!_kbhit() || !read_tty) ) continue;
+                               } else  i=select(width,(void *)&readfds,(void *)&writefds,
+                                        NULL,NULL);
+                       }
+#else
                        i=select(width,(void *)&readfds,(void *)&writefds,
                                 NULL,NULL);
+#endif
                        if ( i < 0)
                                {
                                BIO_printf(bio_err,"bad select %d\n",
@@ -552,9 +593,16 @@ re_start:
                                goto shut;
                                }
                        }
-#ifndef WINDOWS
+#ifdef WINDOWS
+               /* Assume Windows can always write */
+               else if (!ssl_pending && write_tty)
+#else
                else if (!ssl_pending && FD_ISSET(fileno(stdout),&writefds))
+#endif
                        {
+#ifdef CHARSET_EBCDIC
+                       ascii2ebcdic(&(sbuf[sbuf_off]),&(sbuf[sbuf_off]),sbuf_len);
+#endif
                        i=write(fileno(stdout),&(sbuf[sbuf_off]),sbuf_len);
 
                        if (i <= 0)
@@ -572,7 +620,6 @@ re_start:
                                write_tty=0;
                                }
                        }
-#endif
                else if (ssl_pending || FD_ISSET(SSL_get_fd(con),&readfds))
                        {
 #ifdef RENEG
@@ -627,10 +674,36 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
                                }
                        }
 
-#ifndef WINDOWS
+#ifdef WINDOWS
+               else if (_kbhit())
+#else
                else if (FD_ISSET(fileno(stdin),&readfds))
+#endif
                        {
-                       i=read(fileno(stdin),cbuf,BUFSIZZ);
+                       if (crlf)
+                               {
+                               int j, lf_num;
+
+                               i=read(fileno(stdin),cbuf,BUFSIZZ/2);
+                               lf_num = 0;
+                               /* both loops are skipped when i <= 0 */
+                               for (j = 0; j < i; j++)
+                                       if (cbuf[j] == '\n')
+                                               lf_num++;
+                               for (j = i-1; j >= 0; j--)
+                                       {
+                                       cbuf[j+lf_num] = cbuf[j];
+                                       if (cbuf[j] == '\n')
+                                               {
+                                               lf_num--;
+                                               i++;
+                                               cbuf[j+lf_num] = '\r';
+                                               }
+                                       }
+                               assert(lf_num == 0);
+                               }
+                       else
+                               i=read(fileno(stdin),cbuf,BUFSIZZ);
 
                        if ((!c_quiet) && ((i <= 0) || (cbuf[0] == 'Q')))
                                {
@@ -648,12 +721,14 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
                                {
                                cbuf_len=i;
                                cbuf_off=0;
+#ifdef CHARSET_EBCDIC
+                               ebcdic2ascii(cbuf, cbuf, i);
+#endif
                                }
 
                        write_ssl=1;
                        read_tty=0;
                        }
-#endif
                }
 shut:
        SSL_shutdown(con);