projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing semicolon.
[openssl.git]
/
ssl
/
ssltest.c
diff --git
a/ssl/ssltest.c
b/ssl/ssltest.c
index faffbca42cd07d5049eac22be6d8196da2362550..db87b1a35ea1af9f76ae6f6d4cea17c293ac113b 100644
(file)
--- a/
ssl/ssltest.c
+++ b/
ssl/ssltest.c
@@
-620,8
+620,8
@@
int main(int argc, char *argv[])
int no_psk = 0;
int print_time = 0;
clock_t s_time = 0, c_time = 0;
int no_psk = 0;
int print_time = 0;
clock_t s_time = 0, c_time = 0;
- int comp = 0;
#ifndef OPENSSL_NO_COMP
#ifndef OPENSSL_NO_COMP
+ int comp = 0;
COMP_METHOD *cm = NULL;
STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
#endif
COMP_METHOD *cm = NULL;
STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
#endif
@@
-815,6
+815,7
@@
int main(int argc, char *argv[])
{
print_time = 1;
}
{
print_time = 1;
}
+#ifndef OPENSSL_NO_COMP
else if (strcmp(*argv,"-zlib") == 0)
{
comp = COMP_ZLIB;
else if (strcmp(*argv,"-zlib") == 0)
{
comp = COMP_ZLIB;
@@
-823,6
+824,7
@@
int main(int argc, char *argv[])
{
comp = COMP_RLE;
}
{
comp = COMP_RLE;
}
+#endif
else if (strcmp(*argv,"-named_curve") == 0)
{
if (--argc < 1) goto bad;
else if (strcmp(*argv,"-named_curve") == 0)
{
if (--argc < 1) goto bad;
@@
-975,7
+977,13
@@
bad:
meth=SSLv23_method();
#else
#ifdef OPENSSL_NO_SSL2
meth=SSLv23_method();
#else
#ifdef OPENSSL_NO_SSL2
- meth=SSLv3_method();
+ if (tls1)
+ meth=TLSv1_method();
+ else
+ if (ssl3)
+ meth=SSLv3_method();
+ else
+ meth=SSLv23_method();
#else
meth=SSLv2_method();
#endif
#else
meth=SSLv2_method();
#endif