Remove NOPROTO definitions and error code comments.
[openssl.git] / apps / s_client.c
index 07938ab..ae3ce3e 100644 (file)
 #define APPS_WIN16
 #endif
 #include "apps.h"
-#include "x509.h"
-#include "ssl.h"
-#include "err.h"
-#include "pem.h"
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
 #include "s_apps.h"
 
 #undef PROG
@@ -92,18 +92,12 @@ static int c_Pause=0;
 static int c_debug=0;
 static int c_showcerts=0;
 
-#ifndef NOPROTO
 static void sc_usage(void);
 static void print_stuff(BIO *berr,SSL *con,int full);
-#else
-static void sc_usage();
-static void print_stuff();
-#endif
-
 static BIO *bio_c_out=NULL;
 static int c_quiet=0;
 
-static void sc_usage()
+static void sc_usage(void)
        {
        BIO_printf(bio_err,"usage: s_client args\n");
        BIO_printf(bio_err,"\n");
@@ -137,9 +131,7 @@ static void sc_usage()
 
        }
 
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
        {
        int off=0;
        SSL *con=NULL,*con2=NULL;
@@ -154,7 +146,7 @@ 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 write_tty,read_tty,write_ssl,read_ssl,tty_on;
+       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;
@@ -439,31 +431,36 @@ re_start:
                                }
                        }
 
-#ifndef WINDOWS
-               if (tty_on)
+               ssl_pending = read_ssl && SSL_pending(con);
+
+               if (!ssl_pending)
                        {
-                       if (read_tty)  FD_SET(fileno(stdin),&readfds);
-                       if (write_tty) FD_SET(fileno(stdout),&writefds);
-                       }
+#ifndef WINDOWS
+                       if (tty_on)
+                               {
+                               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);
+                       if (read_ssl)
+                               FD_SET(SSL_get_fd(con),&readfds);
+                       if (write_ssl)
+                               FD_SET(SSL_get_fd(con),&writefds);
 
-/*             printf("mode tty(%d %d%d) ssl(%d%d)\n",
-                       tty_on,read_tty,write_tty,read_ssl,write_ssl);*/
+/*                     printf("mode tty(%d %d%d) ssl(%d%d)\n",
+                               tty_on,read_tty,write_tty,read_ssl,write_ssl);*/
 
-               i=select(width,&readfds,&writefds,NULL,NULL);
-               if ( i < 0)
-                       {
-                       BIO_printf(bio_err,"bad select %d\n",
+                       i=select(width,&readfds,&writefds,NULL,NULL);
+                       if ( i < 0)
+                               {
+                               BIO_printf(bio_err,"bad select %d\n",
                                get_last_socket_error());
-                       goto shut;
-                       /* goto end; */
+                               goto shut;
+                               /* goto end; */
+                               }
                        }
 
-               if (FD_ISSET(SSL_get_fd(con),&writefds))
+               if (!ssl_pending && FD_ISSET(SSL_get_fd(con),&writefds))
                        {
                        k=SSL_write(con,&(cbuf[cbuf_off]),
                                (unsigned int)cbuf_len);
@@ -531,7 +528,7 @@ re_start:
                                }
                        }
 #ifndef WINDOWS
-               else if (FD_ISSET(fileno(stdout),&writefds))
+               else if (!ssl_pending && FD_ISSET(fileno(stdout),&writefds))
                        {
                        i=write(fileno(stdout),&(sbuf[sbuf_off]),sbuf_len);
 
@@ -551,7 +548,7 @@ re_start:
                                }
                        }
 #endif
-               else if (FD_ISSET(SSL_get_fd(con),&readfds))
+               else if (ssl_pending || FD_ISSET(SSL_get_fd(con),&readfds))
                        {
 #ifdef RENEG
 { static int iiii; if (++iiii == 52) { SSL_renegotiate(con); iiii=0; } }
@@ -618,9 +615,9 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
 
                        if ((!c_quiet) && (cbuf[0] == 'R'))
                                {
+                               BIO_printf(bio_err,"RENEGOTIATING\n");
                                SSL_renegotiate(con);
-                               read_tty=0;
-                               write_ssl=1;
+                               cbuf_len=0;
                                }
                        else
                                {
@@ -628,8 +625,8 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
                                cbuf_off=0;
                                }
 
-                       read_tty=0;
                        write_ssl=1;
+                       read_tty=0;
                        }
 #endif
                }
@@ -652,16 +649,14 @@ end:
        }
 
 
-static void print_stuff(bio,s,full)
-BIO *bio;
-SSL *s;
-int full;
+static void print_stuff(BIO *bio, SSL *s, int full)
        {
        X509 *peer=NULL;
        char *p;
        static char *space="                ";
        char buf[BUFSIZ];
-       STACK *sk;
+       STACK_OF(X509) *sk;
+       STACK_OF(X509_NAME) *sk2;
        SSL_CIPHER *c;
        X509_NAME *xn;
        int j,i;
@@ -672,16 +667,16 @@ int full;
                if (sk != NULL)
                        {
                        BIO_printf(bio,"---\nCertificate chain\n");
-                       for (i=0; i<sk_num(sk); i++)
+                       for (i=0; i<sk_X509_num(sk); i++)
                                {
-                               X509_NAME_oneline(X509_get_subject_name((X509 *)
-                                       sk_value(sk,i)),buf,BUFSIZ);
+                               X509_NAME_oneline(X509_get_subject_name(
+                                       sk_X509_value(sk,i)),buf,BUFSIZ);
                                BIO_printf(bio,"%2d s:%s\n",i,buf);
-                               X509_NAME_oneline(X509_get_issuer_name((X509 *)
-                                       sk_value(sk,i)),buf,BUFSIZ);
+                               X509_NAME_oneline(X509_get_issuer_name(
+                                       sk_X509_value(sk,i)),buf,BUFSIZ);
                                BIO_printf(bio,"   i:%s\n",buf);
                                if (c_showcerts)
-                                       PEM_write_bio_X509(bio,(X509 *) sk_value(sk,i));
+                                       PEM_write_bio_X509(bio,sk_X509_value(sk,i));
                                }
                        }
 
@@ -702,13 +697,13 @@ int full;
                else
                        BIO_printf(bio,"no peer certificate available\n");
 
-               sk=SSL_get_client_CA_list(s);
-               if ((sk != NULL) && (sk_num(sk) > 0))
+               sk2=SSL_get_client_CA_list(s);
+               if ((sk2 != NULL) && (sk_X509_NAME_num(sk2) > 0))
                        {
                        BIO_printf(bio,"---\nAcceptable client certificate CA names\n");
-                       for (i=0; i<sk_num(sk); i++)
+                       for (i=0; i<sk_X509_NAME_num(sk2); i++)
                                {
-                               xn=(X509_NAME *)sk_value(sk,i);
+                               xn=sk_X509_NAME_value(sk2,i);
                                X509_NAME_oneline(xn,buf,sizeof(buf));
                                BIO_write(bio,buf,strlen(buf));
                                BIO_write(bio,"\n",1);