Further comment changes for reformat (master)

[oweals/openssl.git] / apps / s_time.c

diff --git a/apps/s_time.c b/apps/s_time.c
index b823c33c58a02656c3f33c5e1654f990b97b1efb..8752649fc44a1da5b577d0053e7f2f025a1dc0b1 100644 (file)
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -69,9 +69,6 @@
 
 #define USE_SOCKETS
 #include "apps.h"
-#ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
-#endif
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
 #include <openssl/pem.h>
@@ -186,7 +183,6 @@ static void s_time_usage(void)
        printf("-connect host:port - host:port to connect to (default is %s)\n",SSL_CONNECT_NAME);
 #ifdef FIONBIO
        printf("-nbio         - Run with non-blocking IO\n");
-       printf("-ssl2         - Just use SSLv2\n");
        printf("-ssl3         - Just use SSLv3\n");
        printf("-bugs         - Turn on SSL bug compatibility\n");
        printf("-new          - Just time new connections\n");
@@ -282,10 +278,6 @@ static int parseArgs(int argc, char **argv)
                }
        else if(strcmp(*argv,"-bugs") == 0)
            st_bugs=1;
-#ifndef OPENSSL_NO_SSL2
-       else if(strcmp(*argv,"-ssl2") == 0)
-           s_time_meth=SSLv2_client_method();
-#endif
 #ifndef OPENSSL_NO_SSL3
        else if(strcmp(*argv,"-ssl3") == 0)
            s_time_meth=SSLv3_client_method();
@@ -349,13 +341,7 @@ int MAIN(int argc, char **argv)
        if (bio_err == NULL)
                bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
        s_time_meth=SSLv23_client_method();
-#elif !defined(OPENSSL_NO_SSL3)
-       s_time_meth=SSLv3_client_method();
-#elif !defined(OPENSSL_NO_SSL2)
-       s_time_meth=SSLv2_client_method();
-#endif
 
        /* parse the command line arguments */
        if( parseArgs( argc, argv ) < 0 )
@@ -436,8 +422,6 @@ int MAIN(int argc, char **argv)
                                ver='t';
                        else if (ver == SSL3_VERSION)
                                ver='3';
-                       else if (ver == SSL2_VERSION)
-                               ver='2';
                        else
                                ver='*';
                        }
@@ -529,8 +513,6 @@ next:
                                ver='t';
                        else if (ver == SSL3_VERSION)
                                ver='3';
-                       else if (ver == SSL2_VERSION)
-                               ver='2';
                        else
                                ver='*';
                        }
@@ -556,7 +538,7 @@ end:
        OPENSSL_EXIT(ret);
        }
 
-/***********************************************************************
+/*-
  * doConnection - make a connection
  * Args:
  *             scon    = earlier ssl connection for session id, or NULL