diff options
Diffstat (limited to 'lib/libssl/src/ssl/ssltest.c')
| -rw-r--r-- | lib/libssl/src/ssl/ssltest.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/lib/libssl/src/ssl/ssltest.c b/lib/libssl/src/ssl/ssltest.c index ea236df44d0..771c50a3e1e 100644 --- a/lib/libssl/src/ssl/ssltest.c +++ b/lib/libssl/src/ssl/ssltest.c @@ -324,15 +324,8 @@ sv_usage(void) fprintf(stderr, " -srpuser user - SRP username to use\n"); fprintf(stderr, " -srppass arg - password for 'user'\n"); #endif -#ifndef OPENSSL_NO_SSL2 - fprintf(stderr, " -ssl2 - use SSLv2\n"); -#endif -#ifndef OPENSSL_NO_SSL3 fprintf(stderr, " -ssl3 - use SSLv3\n"); -#endif -#ifndef OPENSSL_NO_TLS1 fprintf(stderr, " -tls1 - use TLSv1\n"); -#endif fprintf(stderr, " -CApath arg - PEM format directory of CA's\n"); fprintf(stderr, " -CAfile arg - PEM format file of CA's\n"); fprintf(stderr, " -cert arg - Server certificate file\n"); @@ -778,27 +771,12 @@ bad: } #endif -#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3) - if (ssl2) - meth = SSLv2_method(); - else if (tls1) - meth = TLSv1_method(); - else if (ssl3) - meth = SSLv3_method(); - else - meth = SSLv23_method(); -#else -#ifdef OPENSSL_NO_SSL2 if (tls1) meth = TLSv1_method(); else if (ssl3) meth = SSLv3_method(); else meth = SSLv23_method(); -#else - meth = SSLv2_method(); -#endif -#endif c_ctx = SSL_CTX_new(meth); s_ctx = SSL_CTX_new(meth); @@ -2325,20 +2303,6 @@ do_test_cipherlist(void) const SSL_METHOD *meth; const SSL_CIPHER *ci, *tci = NULL; -#ifndef OPENSSL_NO_SSL2 - fprintf(stderr, "testing SSLv2 cipher list order: "); - meth = SSLv2_method(); - while ((ci = meth->get_cipher(i++)) != NULL) { - if (tci != NULL) - if (ci->id >= tci->id) { - fprintf(stderr, "failed %lx vs. %lx\n", ci->id, tci->id); - return 0; - } - tci = ci; - } - fprintf(stderr, "ok\n"); -#endif -#ifndef OPENSSL_NO_SSL3 fprintf(stderr, "testing SSLv3 cipher list order: "); meth = SSLv3_method(); tci = NULL; @@ -2351,8 +2315,6 @@ do_test_cipherlist(void) tci = ci; } fprintf(stderr, "ok\n"); -#endif -#ifndef OPENSSL_NO_TLS1 fprintf(stderr, "testing TLSv1 cipher list order: "); meth = TLSv1_method(); tci = NULL; @@ -2365,7 +2327,6 @@ do_test_cipherlist(void) tci = ci; } fprintf(stderr, "ok\n"); -#endif return 1; } |