diff options
Diffstat (limited to 'src/lib/libssl/src/ssl/ssltest.c')
-rw-r--r-- | src/lib/libssl/src/ssl/ssltest.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/libssl/src/ssl/ssltest.c b/src/lib/libssl/src/ssl/ssltest.c index 4f80be8ee4..a0e2af6647 100644 --- a/src/lib/libssl/src/ssl/ssltest.c +++ b/src/lib/libssl/src/ssl/ssltest.c | |||
@@ -150,6 +150,8 @@ | |||
150 | #include <stdlib.h> | 150 | #include <stdlib.h> |
151 | #include <string.h> | 151 | #include <string.h> |
152 | #include <time.h> | 152 | #include <time.h> |
153 | #include <inttypes.h> | ||
154 | #include <ctype.h> | ||
153 | 155 | ||
154 | #define USE_SOCKETS | 156 | #define USE_SOCKETS |
155 | #include "e_os.h" | 157 | #include "e_os.h" |
@@ -543,8 +545,8 @@ int main(int argc, char *argv[]) | |||
543 | int comp = 0; | 545 | int comp = 0; |
544 | #ifndef OPENSSL_NO_COMP | 546 | #ifndef OPENSSL_NO_COMP |
545 | COMP_METHOD *cm = NULL; | 547 | COMP_METHOD *cm = NULL; |
546 | STACK_OF(SSL_COMP) *ssl_comp_methods = NULL; | ||
547 | #endif | 548 | #endif |
549 | STACK_OF(SSL_COMP) *ssl_comp_methods = NULL; | ||
548 | int test_cipherlist = 0; | 550 | int test_cipherlist = 0; |
549 | #ifdef OPENSSL_FIPS | 551 | #ifdef OPENSSL_FIPS |
550 | int fips_mode=0; | 552 | int fips_mode=0; |
@@ -881,13 +883,7 @@ bad: | |||
881 | meth=SSLv23_method(); | 883 | meth=SSLv23_method(); |
882 | #else | 884 | #else |
883 | #ifdef OPENSSL_NO_SSL2 | 885 | #ifdef OPENSSL_NO_SSL2 |
884 | if (tls1) | 886 | meth=SSLv3_method(); |
885 | meth=TLSv1_method(); | ||
886 | else | ||
887 | if (ssl3) | ||
888 | meth=SSLv3_method(); | ||
889 | else | ||
890 | meth=SSLv23_method(); | ||
891 | #else | 887 | #else |
892 | meth=SSLv2_method(); | 888 | meth=SSLv2_method(); |
893 | #endif | 889 | #endif |