Remove NOPROTO definitions and error code comments.
[openssl.git] / apps / s_client.c
index b5dc238..ae3ce3e 100644 (file)
@@ -1,5 +1,5 @@
 /* apps/s_client.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
 #include <stdlib.h>
 #include <string.h>
 #define USE_SOCKETS
-#ifdef WIN16
+#ifdef NO_STDIO
 #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
@@ -90,21 +90,16 @@ static int c_nbio=0;
 #endif
 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: client args\n");
+       BIO_printf(bio_err,"usage: s_client args\n");
        BIO_printf(bio_err,"\n");
        BIO_printf(bio_err," -host host     - use -connect instead\n");
        BIO_printf(bio_err," -port port     - use -connect instead\n");
@@ -118,6 +113,7 @@ static void sc_usage()
        BIO_printf(bio_err," -CAfile arg   - PEM format file of CA's\n");
        BIO_printf(bio_err," -reconnect    - Drop and re-make the connection with the same Session-ID\n");
        BIO_printf(bio_err," -pause        - sleep(1) after each read(2) and write(2) system call\n");
+       BIO_printf(bio_err," -showcerts    - show all certificates in the chain\n");
        BIO_printf(bio_err," -debug        - extra output\n");
        BIO_printf(bio_err," -nbio_test    - more ssl protocol testing\n");
        BIO_printf(bio_err," -state        - print the 'ssl' states\n");
@@ -127,16 +123,17 @@ static void sc_usage()
        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");
+       BIO_printf(bio_err," -tls1         - just use TLSv1\n");
+       BIO_printf(bio_err," -no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n");
        BIO_printf(bio_err," -bugs         - Switch on all SSL implementation bug workarounds\n");
-       BIO_printf(bio_err," -cipher       - prefered cipher to use, use the 'ssleay ciphers'\n");
-       BIO_printf(bio_err,"                 command to se what is available\n");
+       BIO_printf(bio_err," -cipher       - prefered cipher to use, use the 'openssl ciphers'\n");
+       BIO_printf(bio_err,"                 command to see what is available\n");
 
        }
 
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
        {
+       int off=0;
        SSL *con=NULL,*con2=NULL;
        int s,k,width,state=0;
        char *cbuf=NULL,*sbuf=NULL;
@@ -149,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;
@@ -165,8 +162,10 @@ char **argv;
 #endif
 
        apps_startup();
+       c_Pause=0;
        c_quiet=0;
        c_debug=0;
+       c_showcerts=0;
 
        if (bio_err == NULL)
                bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
@@ -223,6 +222,8 @@ char **argv;
                        c_Pause=1;
                else if (strcmp(*argv,"-debug") == 0)
                        c_debug=1;
+               else if (strcmp(*argv,"-showcerts") == 0)
+                       c_showcerts=1;
                else if (strcmp(*argv,"-nbio_test") == 0)
                        nbio_test=1;
                else if (strcmp(*argv,"-state") == 0)
@@ -234,6 +235,10 @@ char **argv;
 #ifndef NO_SSL3
                else if (strcmp(*argv,"-ssl3") == 0)
                        meth=SSLv3_client_method();
+#endif
+#ifndef NO_TLS1
+               else if (strcmp(*argv,"-tls1") == 0)
+                       meth=TLSv1_client_method();
 #endif
                else if (strcmp(*argv,"-bugs") == 0)
                        bugs=1;
@@ -256,6 +261,12 @@ char **argv;
                        if (--argc < 1) goto bad;
                        CAfile= *(++argv);
                        }
+               else if (strcmp(*argv,"-no_tls1") == 0)
+                       off|=SSL_OP_NO_TLSv1;
+               else if (strcmp(*argv,"-no_ssl3") == 0)
+                       off|=SSL_OP_NO_SSLv3;
+               else if (strcmp(*argv,"-no_ssl2") == 0)
+                       off|=SSL_OP_NO_SSLv2;
                else if (strcmp(*argv,"-cipher") == 0)
                        {
                        if (--argc < 1) goto bad;
@@ -302,7 +313,10 @@ bad:
                goto end;
                }
 
-       if (bugs) SSL_CTX_set_options(ctx,SSL_OP_ALL);
+       if (bugs)
+               SSL_CTX_set_options(ctx,SSL_OP_ALL|off);
+       else
+               SSL_CTX_set_options(ctx,off);
 
        if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback);
        if (cipher != NULL)
@@ -319,20 +333,21 @@ bad:
        if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
                (!SSL_CTX_set_default_verify_paths(ctx)))
                {
-               BIO_printf(bio_err,"error seting default verify locations\n");
+               /* BIO_printf(bio_err,"error seting default verify locations\n"); */
                ERR_print_errors(bio_err);
-               goto end;
+               /* goto end; */
                }
 
        SSL_load_error_strings();
 
        con=(SSL *)SSL_new(ctx);
+/*     SSL_set_cipher_list(con,"RC4-MD5"); */
 
 re_start:
 
        if (init_client(&s,host,port) == 0)
                {
-               BIO_printf(bio_err,"connect:errno=%d\n",errno);
+               BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
                SHUTDOWN(s);
                goto end;
                }
@@ -343,7 +358,11 @@ re_start:
                {
                unsigned long l=1;
                BIO_printf(bio_c_out,"turning on non blocking io\n");
-               socket_ioctl(s,FIONBIO,&l);
+               if (BIO_socket_ioctl(s,FIONBIO,&l) < 0)
+                       {
+                       ERR_print_errors(bio_err);
+                       goto end;
+                       }
                }
 #endif                                              
        if (c_Pause & 0x01) con->debug=1;
@@ -386,7 +405,7 @@ re_start:
                FD_ZERO(&readfds);
                FD_ZERO(&writefds);
 
-               if (SSL_in_init(con))
+               if (SSL_in_init(con) && !SSL_total_renegotiations(con))
                        {
                        in_init=1;
                        tty_on=0;
@@ -412,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);*/
 
-/*             printf("pending=%d\n",SSL_pending(con)); */
-               i=select(width,&readfds,&writefds,NULL,NULL);
-               if ( i < 0)
-                       {
-                       BIO_printf(bio_err,"bad select %d\n",sock_err());
-                       goto shut;
-                       /* goto end; */
+                       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; */
+                               }
                        }
 
-               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);
@@ -489,7 +513,7 @@ re_start:
                                if ((k != 0) || (cbuf_len != 0))
                                        {
                                        BIO_printf(bio_err,"write:errno=%d\n",
-                                               errno);
+                                               get_last_socket_error());
                                        goto shut;
                                        }
                                else
@@ -504,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);
 
@@ -524,9 +548,20 @@ re_start:
                                }
                        }
 #endif
-               else if (FD_ISSET(SSL_get_fd(con),&readfds))
+               else if (ssl_pending || FD_ISSET(SSL_get_fd(con),&readfds))
                        {
-                       k=SSL_read(con,sbuf,BUFSIZZ);
+#ifdef RENEG
+{ static int iiii; if (++iiii == 52) { SSL_renegotiate(con); iiii=0; } }
+#endif
+#if 1
+                       k=SSL_read(con,sbuf,1024 /* BUFSIZZ */ );
+#else
+/* Demo for pending and peek :-) */
+                       k=SSL_read(con,sbuf,16);
+{ char zbuf[10240]; 
+printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240));
+}
+#endif
 
                        switch (SSL_get_error(con,k))
                                {
@@ -555,7 +590,7 @@ re_start:
                                BIO_printf(bio_c_out,"read X BLOCK\n");
                                break;
                        case SSL_ERROR_SYSCALL:
-                               BIO_printf(bio_err,"read:errno=%d\n",errno);
+                               BIO_printf(bio_err,"read:errno=%d\n",get_last_socket_error());
                                goto shut;
                        case SSL_ERROR_ZERO_RETURN:
                                BIO_printf(bio_c_out,"closed\n");
@@ -563,7 +598,7 @@ re_start:
                        case SSL_ERROR_SSL:
                                ERR_print_errors(bio_err);
                                goto shut;
-                               break;
+                               /* break; */
                                }
                        }
 
@@ -580,9 +615,9 @@ re_start:
 
                        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
                                {
@@ -590,8 +625,8 @@ re_start:
                                cbuf_off=0;
                                }
 
-                       read_tty=0;
                        write_ssl=1;
+                       read_tty=0;
                        }
 #endif
                }
@@ -614,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;
+       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;
@@ -633,15 +666,17 @@ int full;
                sk=SSL_get_peer_cert_chain(s);
                if (sk != NULL)
                        {
-                       BIO_printf(bio,"---\nCertficate chain\n");
-                       for (i=0; i<sk_num(sk); i++)
+                       BIO_printf(bio,"---\nCertificate chain\n");
+                       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,sk_X509_value(sk,i));
                                }
                        }
 
@@ -650,25 +685,25 @@ int full;
                if (peer != NULL)
                        {
                        BIO_printf(bio,"Server certificate\n");
-                       PEM_write_bio_X509(bio,peer);
+                       if (!c_showcerts) /* Redundant if we showed the whole chain */
+                               PEM_write_bio_X509(bio,peer);
                        X509_NAME_oneline(X509_get_subject_name(peer),
                                buf,BUFSIZ);
                        BIO_printf(bio,"subject=%s\n",buf);
                        X509_NAME_oneline(X509_get_issuer_name(peer),
                                buf,BUFSIZ);
                        BIO_printf(bio,"issuer=%s\n",buf);
-                       X509_free(peer);
                        }
                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);
@@ -687,7 +722,7 @@ int full;
                                {
                                if (*p == ':')
                                        {
-                                       BIO_write(bio,space,15-j);
+                                       BIO_write(bio,space,15-j%25);
                                        i++;
                                        j=0;
                                        BIO_write(bio,((i%3)?" ":"\n"),1);
@@ -711,7 +746,16 @@ int full;
        BIO_printf(bio,"%s, Cipher is %s\n",
                SSL_CIPHER_get_version(c),
                SSL_CIPHER_get_name(c));
+       if (peer != NULL) {
+               EVP_PKEY *pktmp;
+               pktmp = X509_get_pubkey(peer);
+               BIO_printf(bio,"Server public key is %d bit\n",
+                                                        EVP_PKEY_bits(pktmp));
+               EVP_PKEY_free(pktmp);
+       }
        SSL_SESSION_print(bio,SSL_get_session(s));
        BIO_printf(bio,"---\n");
+       if (peer != NULL)
+               X509_free(peer);
        }