A new comment.

[openssl.git] / apps / s_client.c

diff --git a/apps/s_client.c b/apps/s_client.c
index 7140f8ba2b8494810ffe225e90994f982f7adedf..f0c2280d2ec326e94fd980a0a677a7248e19eb20 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -64,12 +64,16 @@
 #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"
 
+#if defined(NO_RSA) && !defined(NO_SSL2)
+#define NO_SSL2
+#endif
+
 #undef PROG
 #define PROG   s_client_main
 
@@ -92,18 +96,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 +135,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;
@@ -442,8 +438,8 @@ re_start:
                ssl_pending = read_ssl && SSL_pending(con);
 
                if (!ssl_pending)
-#ifndef WINDOWS
                        {
+#ifndef WINDOWS
                        if (tty_on)
                                {
                                if (read_tty)  FD_SET(fileno(stdin),&readfds);
@@ -657,10 +653,7 @@ 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;
@@ -709,7 +702,7 @@ int full;
                        BIO_printf(bio,"no peer certificate available\n");
 
                sk2=SSL_get_client_CA_list(s);
-               if ((sk != NULL) && (sk_X509_NAME_num(sk2) > 0))
+               if ((sk2 != NULL) && (sk_X509_NAME_num(sk2) > 0))
                        {
                        BIO_printf(bio,"---\nAcceptable client certificate CA names\n");
                        for (i=0; i<sk_X509_NAME_num(sk2); i++)
@@ -727,6 +720,11 @@ int full;
                p=SSL_get_shared_ciphers(s,buf,BUFSIZ);
                if (p != NULL)
                        {
+                       /* This works only for SSL 2.  In later protocol
+                        * versions, the client does not know what other
+                        * ciphers (in addition to the one to be used
+                        * in the current connection) the server supports. */
+
                        BIO_printf(bio,"---\nCiphers common between both SSL endpoints:\n");
                        j=i=0;
                        while (*p)