projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix source where indent will not be able to cope
[openssl.git]
/
apps
/
s_time.c
diff --git
a/apps/s_time.c
b/apps/s_time.c
index b823c33c58a02656c3f33c5e1654f990b97b1efb..df7dfdc9f3be0815e85d1c3d48ec758ee54e086c 100644
(file)
--- a/
apps/s_time.c
+++ b/
apps/s_time.c
@@
-69,9
+69,6
@@
#define USE_SOCKETS
#include "apps.h"
#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>
#include <openssl/x509.h>
#include <openssl/ssl.h>
#include <openssl/pem.h>
@@
-93,7
+90,8
@@
#define SSL_CONNECT_NAME "localhost:4433"
#define SSL_CONNECT_NAME "localhost:4433"
-/*#define TEST_CERT "client.pem" */ /* no default cert. */
+/* no default cert. */
+/*#define TEST_CERT "client.pem" */
#undef BUFSIZZ
#define BUFSIZZ 1024*10
#undef BUFSIZZ
#define BUFSIZZ 1024*10
@@
-186,7
+184,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("-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");
printf("-ssl3 - Just use SSLv3\n");
printf("-bugs - Turn on SSL bug compatibility\n");
printf("-new - Just time new connections\n");
@@
-282,10
+279,6
@@
static int parseArgs(int argc, char **argv)
}
else if(strcmp(*argv,"-bugs") == 0)
st_bugs=1;
}
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();
#ifndef OPENSSL_NO_SSL3
else if(strcmp(*argv,"-ssl3") == 0)
s_time_meth=SSLv3_client_method();
@@
-349,13
+342,7
@@
int MAIN(int argc, char **argv)
if (bio_err == NULL)
bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
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();
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 )
/* parse the command line arguments */
if( parseArgs( argc, argv ) < 0 )
@@
-436,8
+423,6
@@
int MAIN(int argc, char **argv)
ver='t';
else if (ver == SSL3_VERSION)
ver='3';
ver='t';
else if (ver == SSL3_VERSION)
ver='3';
- else if (ver == SSL2_VERSION)
- ver='2';
else
ver='*';
}
else
ver='*';
}
@@
-529,8
+514,6
@@
next:
ver='t';
else if (ver == SSL3_VERSION)
ver='3';
ver='t';
else if (ver == SSL3_VERSION)
ver='3';
- else if (ver == SSL2_VERSION)
- ver='2';
else
ver='*';
}
else
ver='*';
}
@@
-556,7
+539,7
@@
end:
OPENSSL_EXIT(ret);
}
OPENSSL_EXIT(ret);
}
-/*
**********************************************************************
+/*
-
* doConnection - make a connection
* Args:
* scon = earlier ssl connection for session id, or NULL
* doConnection - make a connection
* Args:
* scon = earlier ssl connection for session id, or NULL